Commit Graph

1524 Commits

Author SHA1 Message Date
Campbell Barton
ef18ec335f svn merge -r39145:39286 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-08-11 05:04:01 +00:00
Joerg Mueller
a672ab5e73 3D Audio GSoC:
Improved waveform drawing in the sequencer.

* Drawing the waveform of a sequencer strip is now independent from whether the sound is cached or not.
* Improved drawing of the waveform in the sequencer (especially speed!).
* Making it possible to vertically zoom more in the sequencer to better see the waveform for lipsync.
* Fixed a bug which crashed blender on loading a sound file via ffmpeg.
2011-08-09 14:10:32 +00:00
Joerg Mueller
13249b925e 3D Audio GSoC:
Speaker objects fully functional!

Minor changes:
* Fixed three memory bugs found via valgrind.
* Fixed bug with jack transport crashing after file loading.
* Sound NLA Strips now start at CFRA instead of 0.
2011-08-09 08:38:14 +00:00
Campbell Barton
ffd5fa3eea off by 1 error with number keys in ghost/sdl 2011-08-09 07:09:49 +00:00
Campbell Barton
8eec116d0e add missing keys for ghost/sdl 2011-08-08 06:54:07 +00:00
Campbell Barton
0160901c90 - update X3D and FBX testing checksums
- building with GHOST/SDL now adds the PREFIX
- image.external_edit operator errors out if the filepath isnt set (was annoying and loaded gimp while running tests)
2011-08-08 03:31:25 +00:00
Campbell Barton
5681380db0 simplify x11 path code, had unneeded NULL checks and std namespace 2011-08-07 17:38:36 +00:00
Mike Erwin
479c203dad stricter WITH_INPUT_NDOF guards, general cleanup 2011-08-07 16:44:10 +00:00
Joerg Mueller
daab78bc61 Merging trunk up to r39145. 2011-08-07 15:25:06 +00:00
Joerg Mueller
2d884fc035 3D Audio GSoC:
* Pepper depends on ffmpeg 0.7.1 or higher now, windows and mac build systems set to ffmpeg-0.8
* Fixed orientation retrieval in OpenAL device code.
* Added stopAll() method to AUD_IDevice (also for Python) and call it on BGE exit
* Changed BGE to use audaspace via native C++ instead over the C API.
* Made AUD_SequencerFactory and AUD_SequencerEntry thread safe.
* Changed sound caching into a flag which fixes problems on file loading, especially with undo.
* Removed unused parameter from sound_mute_scene_sound
* Fixed bug: changing FPS didn't update the sequencer sound positions.
* Fixed bug: Properties of sequencer strips weren't set correctly.
* Minor warning fixes.
2011-08-07 11:54:58 +00:00
Joerg Mueller
4370099fb0 3D Audio GSoC:
Added a NULLHandle to prevent a crash in Python API when the device is the NULLDevice.
2011-08-07 06:22:50 +00:00
Mike Erwin
6c821f4078 stricter NDOF guards for Windows (forgot in earlier commit) 2011-08-06 23:13:36 +00:00
Joerg Mueller
c334bf69a7 3D Audio GSoC:
Mixdown functionality.

* Mixdown possible via libsndfile and ffmpeg!
* Fixed some ffmpeg deprecation warnings
* Mixdown UI only shows working Container, Codec and Format combinations!
* Minor bugs and warnings fixed
2011-08-06 17:57:20 +00:00
Campbell Barton
4d319f8059 fix for GHOST/SDL key input with uppercase keys. 2011-08-05 17:39:44 +00:00
Joerg Mueller
507dbeab45 3D Audio GSoC:
JOS Resampler: Fix for windows...
2011-08-05 07:01:54 +00:00
Joerg Mueller
bc1650a226 3D Audio GSoC:
Implementation of Julius O. Smith's resampling algorithm for high quality audio resampling.

The filter currently is a sinc filter with a 0.9 cutt-off and windowed by a kaiser window (beta = 10).
Also includes minor changes in the linear resampler.
2011-08-04 13:47:15 +00:00
Mike Erwin
a6fed14da4 stricter guards for disabling NDOF code (will test in 3.. 2.. 1..) 2011-08-04 03:14:00 +00:00
Joerg Mueller
eb9d591898 * Merging trunk up to r38981.
* Fixing a minor issue in a previous commit.
2011-08-03 12:44:52 +00:00
Joerg Mueller
6d7490632f 3D Audio GSoC:
* Minor audaspace library improvements.
* Considering location, velocity and orientation in AUD_SequencerReader and AUD_SequencerHandle.
* Bugfix: Maximum and Minimum volume weren't used before in the software device.
* Bugfix: Adding speaker objects via info space crashed.
* Listener settings now get updated in the audio system.
2011-08-03 09:25:40 +00:00
Sergey Sharybin
d4909c5628 - Do not add GHOST_NDOFManager.cpp to list of sources if
NDOF is disabled in CMake.
- Added "default" section to switch in sendMotionEvent.
  It's what strict gcc rules don't like much and it's
  And it's good practice in general, imo.
2011-08-03 07:30:24 +00:00
Nathan Letwory
02ab2b473c Debug print removed. 2011-08-03 07:08:28 +00:00
Mike Erwin
3b541b259f removed attempted WITH_BF_3DMOUSE detection, fixed just one indention (left the others in their ugly new state) 2011-08-03 06:42:55 +00:00
Campbell Barton
6c9d0f2b7a whitespace edits. 2011-08-03 06:27:44 +00:00
Mike Erwin
6233430c23 compensate for lack of 3D mouse calibration on Windows 2011-08-03 05:01:55 +00:00
Sergey Sharybin
13eefec9dd More flexible configuration for 3dmouse library for scons.
Needed for release environment and buildbot.

Buildbot rules would be updated with next commit after
environment will be tested.
2011-08-02 17:59:43 +00:00
Nathan Letwory
222190c618 typo fix 2011-08-02 14:45:35 +00:00
Joerg Mueller
4e8e502c02 Merging trunk up to r38932. 2011-08-02 12:16:06 +00:00
Nathan Letwory
7561d10c2e Don't include NDOF files when disabled. 2011-08-02 10:50:22 +00:00
Nathan Letwory
467475590e Some more silencing. Enable with BF_GHOST_DEBUG 2011-08-02 10:39:46 +00:00
Nathan Letwory
6bc101fa7e Indentation changes 2011-08-02 10:26:20 +00:00
Nathan Letwory
69b4962fc0 Properly disable NDOF code when WITH_INPUT_NDOF is not define. 2011-08-02 10:20:47 +00:00
Nathan Letwory
c1cf646bb7 whitespace 2011-08-02 09:36:44 +00:00
Nathan Letwory
1828e37794 Turn off ndof button debug 2011-08-02 09:09:07 +00:00
Nathan Letwory
28ed1b6745 tabs -> spaces 2011-08-02 09:07:24 +00:00
Jiri Hnidek
2e860a3e85 - Blender could be build with scons again. 2011-08-02 07:02:40 +00:00
Campbell Barton
baa37b1b46 more cmake/x11 edits
- added includes for spnav
- added FindSpacenav.cmake which allows using spacenav from a nonstandard path.
- remove NDOF_LIBPATH, use a full library path instead.
2011-08-02 06:32:53 +00:00
Campbell Barton
fcd7d2b486 NDOF related edits
- fix for building without NDOF on X11
- quiet some warnings
2011-08-02 05:52:27 +00:00
Guillermo S. Romero
8f3016098d SVN maintenance. 2011-08-02 05:31:32 +00:00
Mike Erwin
56918978b7 3D mouse support from merwin-spacenav branch 2011-08-02 04:28:05 +00:00
Mike Erwin
dc2609da3d svn merge -r38814:38905 https://svn.blender.org/svnroot/bf-blender/trunk/blender . 2011-08-02 01:01:56 +00:00
Mike Erwin
19b38034f9 support for older SpacePilot (sans Pro), minor tidying 2011-07-31 22:59:36 +00:00
Alexander Kuznetsov
6e788c37df Hides console on win32 even if python path is 2 or more lines
Adding tlhelp32.h header
2011-07-30 19:09:34 +00:00
Joerg Mueller
4b5a371b65 3D Audio GSoC:
* Fix for sequencer strip IDs, only one strip played.
* Fix for PyAPI sample rate.
* Enhanced Double Reader to return more data if possible.
2011-07-30 16:24:11 +00:00
Ton Roosendaal
681b26a48e Bugfix #28109
Old issue with OSX Cocoa code: shift+scrollwheel should send
a 'horizontal wheel' event to Blender. Blender only recognizes
scroll events in general though. The old code then just didn't
send an event at all, not passing on shift+scrolls.

Now the scroll event is sent anyway, relying on Blender's
keymapping to define what to do with shift+scroll.

This fixes things like shift+scroll to scale ListBox widgets.
2011-07-30 10:14:50 +00:00
Joerg Mueller
29f214f7f3 Merging up to trunk r38834. 2011-07-29 21:28:18 +00:00
Alexander Kuznetsov
6b987910e4 Patch [#27925] by Andrew Cox and me
Modifier key sticks after Alt-tab on Win32
2011-07-29 20:21:37 +00:00
Joerg Mueller
bd6ca0570e 3D Audio GSoC:
Implemented basic audio animation.

* AnimatableProperty: Propper cache writing and spline interpolation for reading (the solution for stair steps in audio animation)
* Animatable properties so far are: volume, pitch, panning
* Users note: Changing the pitch of a sound results in wrong seeking, due to the resulting playback length difference.
* Users note: Panning only works for mono sources, values are in the range [-2..2], this basically controls the angle of the sound, 0 is front, -1 left, 1 right and 2 and -2 are back. Typical stereo panning only supports [-1..1].
* Disabled animation of audio related ffmpeg output parameters.
* Scene Audio Panel: 3D Listener settings also for Renderer, new Volume property (animatable!), Update/Bake buttons for animation problems, moved sampling rate and channel count here
2011-07-28 13:58:59 +00:00
Nathan Letwory
73a9ce7ec0 svn merge -r38558:38752 https://svn.blender.org/svnroot/bf-blender/trunk/blender . 2011-07-27 07:42:53 +00:00
Joerg Mueller
9077b8bffc 3D Audio GSoC:
Main: Complete rewrite of the sequencer related audio code to support 3D Audio objects later and especially adressing the animation system problems (see mailing list if interested).
Note: Animation is not working yet, so with this commit volume animation doesn't work anymore, that's the next step.

Minor things:
* Changed AUD_Reference behaviour a little to be more usage safe.
* Fixed bug in AUD_I3DHandle: Missing virtual destructor
* Fixed enmus in AUD_Space.h
* Fixed a warning in rna_scene.c
* Removed an unneeded call in rna_sound.c
2011-07-26 13:56:31 +00:00
Mike Erwin
c2c62134cc minor cleanup of Mac ndof manager 2011-07-24 00:52:18 +00:00