Commit Graph

4909 Commits

Author SHA1 Message Date
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
Campbell Barton
42b87af8a7 svn merge -r38600:38700 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-07-26 04:31:59 +00:00
Campbell Barton
fc95382a97 svn merge -r38400:38500 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-07-26 03:55:23 +00:00
Campbell Barton
ac2dd40991 svn merge -r38300:38400 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-07-26 03:14:16 +00:00
Mike Erwin
c2c62134cc minor cleanup of Mac ndof manager 2011-07-24 00:52:18 +00:00
Mike Erwin
5fae765187 more cautious device detection, minor cleanup 2011-07-23 21:29:19 +00:00
Joerg Mueller
f4a30e473b Cherry pick merge: /branches/soc-2011-pepper/intern/audaspace/OpenAL:r38630
Original log: Corrected the OpenAL device's threading code. This is a bugfix for #27913, thanks to Juha Mäki-Kanto for helping to resolve this.
2011-07-23 16:08:37 +00:00
Joerg Mueller
1193be6eaa 3D Audio GSoC:
* Reviewed and improved the linear resampler. Now it should work pretty good also for special cases that caused errors previously.
* Fixed a crash in the GE when a sound actuator doesn't have a sound assigned.
* Corrected the OpenAL device's threading code. This is a bugfix for #27913, thanks to Juha Mäki-Kanto for helping to resolve this.
2011-07-23 15:59:10 +00:00
Nathan Letwory
8c5f028f4a Fix compile error due to faulty merge. 2011-07-22 14:13:28 +00:00
Joerg Mueller
4532bd731d Merge with trunk up to r38584. 2011-07-21 21:11:58 +00:00
Nathan Letwory
b326a6841e Simple ifndef guards, so we don't get redefines. 2011-07-21 20:54:47 +00:00
Nathan Letwory
eea7c358c7 svn merge -r37276:38555 https://svn.blender.org/svnroot/bf-blender/trunk/blender . 2011-07-21 09:40:59 +00:00
Mike Erwin
5f47123fde consistent Starting/InProgress/Finishing ndof events with dead-zone filtering 2011-07-18 22:42:09 +00:00
Dalai Felinto
1f5d60ba01 patch: [#27783] "Problem with clock" at 18:39:00 by Daniel Dionne (mrzeon)
the overflow of the clock was causing crash in the game engine in Linux.
(on June 11 2011, 18:39:00 GMT)

running to the "where is waldo (wally)" bug award of 2011.
2011-07-18 22:28:42 +00:00
Jiri Hnidek
8c11a26285 Fixed compile error on Fedora 15, when FFMPEG was enabled. 2011-07-17 10:28:31 +00:00
Campbell Barton
5792bd7cc7 cmake: cleanup include paths, some duplicates and going up some unneeded dirs. 2011-07-17 09:11:13 +00:00
Campbell Barton
410c5e3cd2 cmake source definitions:
remove missing includes and use more strict formatting.
2011-07-16 23:01:14 +00:00
Campbell Barton
2d8c1e60e6 print an error message if Python.h can't be found for cmake and scons since its such a common problem. 2011-07-16 06:55:45 +00:00
Mike Erwin
b0c8abf04e removed unused ndof code 2011-07-14 22:01:09 +00:00
Mike Erwin
cc1ba4569c more consistent and modal-friendly ndof events, fly mode v1 2011-07-14 21:20:45 +00:00
Joerg Mueller
d838d82151 3D Audio GSoC:
MSVC compile fixes.
2011-07-14 05:56:47 +00:00
Campbell Barton
1fd33b6e77 cmake option to build without smoke sim: WITH_MOD_SMOKE 2011-07-13 18:40:21 +00:00
Joerg Mueller
f12614234a 3D Audio GSoC:
* Fixed a warning in AUD_DoubleReader.cpp
* Removed some unneeded includes
* Fixed a bug resulting in a crash when stopping a sound
* Fixed a bug where a NaN resulted in a horrible memory error
* Fixed a typo bug which caused crackling in audio playback and export
* Added memory debugging code (ifdefed)
2011-07-13 12:16:45 +00:00