Revision: 39148
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39148
Author: nexyon
Date: 2011-08-07 15:40:15 +0000 (Sun, 07 Aug 2011)
Log Message:
-----------
Merging from pepper up to r39147.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39147
Modified Paths:
--------------
branches/soc-2011-salad/CMakeLists.txt
branches/soc-2011-salad/build_files/scons/config/darwin-config.py
branches/soc-2011-salad/build_files/scons/config/win32-mingw-config.py
branches/soc-2011-salad/build_files/scons/config/win32-vc-config.py
branches/soc-2011-salad/build_files/scons/config/win64-vc-config.py
branches/soc-2011-salad/intern/audaspace/CMakeLists.txt
branches/soc-2011-salad/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
branches/soc-2011-salad/intern/audaspace/OpenAL/AUD_OpenALDevice.h
branches/soc-2011-salad/intern/audaspace/Python/AUD_PyAPI.cpp
branches/soc-2011-salad/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
branches/soc-2011-salad/intern/audaspace/ffmpeg/AUD_FFMPEGReader.h
branches/soc-2011-salad/intern/audaspace/intern/AUD_3DMath.h
branches/soc-2011-salad/intern/audaspace/intern/AUD_C-API.cpp
branches/soc-2011-salad/intern/audaspace/intern/AUD_C-API.h
branches/soc-2011-salad/intern/audaspace/intern/AUD_ConverterFunctions.cpp
branches/soc-2011-salad/intern/audaspace/intern/AUD_IDevice.h
branches/soc-2011-salad/intern/audaspace/intern/AUD_IFactory.h
branches/soc-2011-salad/intern/audaspace/intern/AUD_IReader.h
branches/soc-2011-salad/intern/audaspace/intern/AUD_LinearResampleReader.cpp
branches/soc-2011-salad/intern/audaspace/intern/AUD_LinearResampleReader.h
branches/soc-2011-salad/intern/audaspace/intern/AUD_NULLDevice.cpp
branches/soc-2011-salad/intern/audaspace/intern/AUD_NULLDevice.h
branches/soc-2011-salad/intern/audaspace/intern/AUD_SequencerEntry.cpp
branches/soc-2011-salad/intern/audaspace/intern/AUD_SequencerEntry.h
branches/soc-2011-salad/intern/audaspace/intern/AUD_SequencerFactory.cpp
branches/soc-2011-salad/intern/audaspace/intern/AUD_SequencerFactory.h
branches/soc-2011-salad/intern/audaspace/intern/AUD_SequencerHandle.cpp
branches/soc-2011-salad/intern/audaspace/intern/AUD_SequencerReader.cpp
branches/soc-2011-salad/intern/audaspace/intern/AUD_SoftwareDevice.cpp
branches/soc-2011-salad/intern/audaspace/intern/AUD_SoftwareDevice.h
branches/soc-2011-salad/intern/audaspace/intern/AUD_Space.h
branches/soc-2011-salad/release/datafiles/blenderbuttons
branches/soc-2011-salad/release/scripts/modules/mocap_constraints.py
branches/soc-2011-salad/release/scripts/modules/mocap_tools.py
branches/soc-2011-salad/release/scripts/modules/retarget.py
branches/soc-2011-salad/release/scripts/startup/bl_ui/properties_scene.py
branches/soc-2011-salad/release/scripts/startup/bl_ui/space_info.py
branches/soc-2011-salad/release/scripts/startup/bl_ui/space_nla.py
branches/soc-2011-salad/release/scripts/startup/ui_mocap.py
branches/soc-2011-salad/source/blender/blenkernel/BKE_nla.h
branches/soc-2011-salad/source/blender/blenkernel/BKE_object.h
branches/soc-2011-salad/source/blender/blenkernel/BKE_sequencer.h
branches/soc-2011-salad/source/blender/blenkernel/BKE_sound.h
branches/soc-2011-salad/source/blender/blenkernel/CMakeLists.txt
branches/soc-2011-salad/source/blender/blenkernel/intern/anim_sys.c
branches/soc-2011-salad/source/blender/blenkernel/intern/curve.c
branches/soc-2011-salad/source/blender/blenkernel/intern/fcurve.c
branches/soc-2011-salad/source/blender/blenkernel/intern/ipo.c
branches/soc-2011-salad/source/blender/blenkernel/intern/library.c
branches/soc-2011-salad/source/blender/blenkernel/intern/nla.c
branches/soc-2011-salad/source/blender/blenkernel/intern/object.c
branches/soc-2011-salad/source/blender/blenkernel/intern/sequencer.c
branches/soc-2011-salad/source/blender/blenkernel/intern/sound.c
branches/soc-2011-salad/source/blender/blenloader/intern/readfile.c
branches/soc-2011-salad/source/blender/collada/AnimationExporter.cpp
branches/soc-2011-salad/source/blender/collada/AnimationExporter.h
branches/soc-2011-salad/source/blender/editors/animation/anim_channels_defines.c
branches/soc-2011-salad/source/blender/editors/animation/anim_channels_edit.c
branches/soc-2011-salad/source/blender/editors/animation/anim_filter.c
branches/soc-2011-salad/source/blender/editors/animation/drivers.c
branches/soc-2011-salad/source/blender/editors/animation/keyframes_edit.c
branches/soc-2011-salad/source/blender/editors/animation/keyframing.c
branches/soc-2011-salad/source/blender/editors/datafiles/blenderbuttons.c
branches/soc-2011-salad/source/blender/editors/include/ED_anim_api.h
branches/soc-2011-salad/source/blender/editors/include/UI_icons.h
branches/soc-2011-salad/source/blender/editors/include/UI_resources.h
branches/soc-2011-salad/source/blender/editors/interface/interface.c
branches/soc-2011-salad/source/blender/editors/interface/resources.c
branches/soc-2011-salad/source/blender/editors/object/object_add.c
branches/soc-2011-salad/source/blender/editors/object/object_constraint.c
branches/soc-2011-salad/source/blender/editors/object/object_relations.c
branches/soc-2011-salad/source/blender/editors/sound/CMakeLists.txt
branches/soc-2011-salad/source/blender/editors/sound/sound_ops.c
branches/soc-2011-salad/source/blender/editors/space_action/action_draw.c
branches/soc-2011-salad/source/blender/editors/space_action/action_edit.c
branches/soc-2011-salad/source/blender/editors/space_graph/graph_buttons.c
branches/soc-2011-salad/source/blender/editors/space_graph/graph_draw.c
branches/soc-2011-salad/source/blender/editors/space_graph/graph_edit.c
branches/soc-2011-salad/source/blender/editors/space_graph/space_graph.c
branches/soc-2011-salad/source/blender/editors/space_nla/nla_buttons.c
branches/soc-2011-salad/source/blender/editors/space_nla/nla_draw.c
branches/soc-2011-salad/source/blender/editors/space_nla/nla_edit.c
branches/soc-2011-salad/source/blender/editors/space_nla/nla_intern.h
branches/soc-2011-salad/source/blender/editors/space_nla/nla_ops.c
branches/soc-2011-salad/source/blender/editors/space_outliner/outliner_draw.c
branches/soc-2011-salad/source/blender/editors/space_outliner/outliner_tree.c
branches/soc-2011-salad/source/blender/editors/space_sequencer/sequencer_add.c
branches/soc-2011-salad/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2011-salad/source/blender/editors/transform/transform_conversions.c
branches/soc-2011-salad/source/blender/makesdna/DNA_action_types.h
branches/soc-2011-salad/source/blender/makesdna/DNA_anim_types.h
branches/soc-2011-salad/source/blender/makesdna/DNA_curve_types.h
branches/soc-2011-salad/source/blender/makesdna/DNA_scene_types.h
branches/soc-2011-salad/source/blender/makesdna/DNA_sound_types.h
branches/soc-2011-salad/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2011-salad/source/blender/makesrna/RNA_enum_types.h
branches/soc-2011-salad/source/blender/makesrna/intern/rna_curve.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_fcurve.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_main_api.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_nla.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_scene.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_sequencer.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_sound.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_space.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2011-salad/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/soc-2011-salad/source/gameengine/Converter/BL_ActionActuator.cpp
branches/soc-2011-salad/source/gameengine/Converter/BL_ActionActuator.h
branches/soc-2011-salad/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/soc-2011-salad/source/gameengine/Converter/KX_BlenderSceneConverter.h
branches/soc-2011-salad/source/gameengine/Converter/KX_ConvertActuators.cpp
branches/soc-2011-salad/source/gameengine/Converter/KX_IpoConvert.cpp
branches/soc-2011-salad/source/gameengine/Ketsji/CMakeLists.txt
branches/soc-2011-salad/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/soc-2011-salad/source/gameengine/Ketsji/KX_SoundActuator.cpp
branches/soc-2011-salad/source/gameengine/Ketsji/KX_SoundActuator.h
branches/soc-2011-salad/source/gameengine/Ketsji/SConscript
Added Paths:
-----------
branches/soc-2011-salad/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp
branches/soc-2011-salad/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.h
branches/soc-2011-salad/intern/audaspace/intern/AUD_FileWriter.cpp
branches/soc-2011-salad/intern/audaspace/intern/AUD_FileWriter.h
branches/soc-2011-salad/intern/audaspace/intern/AUD_IWriter.h
branches/soc-2011-salad/intern/audaspace/intern/AUD_JOSResampleFactory.cpp
branches/soc-2011-salad/intern/audaspace/intern/AUD_JOSResampleFactory.h
branches/soc-2011-salad/intern/audaspace/intern/AUD_JOSResampleReader.cpp
branches/soc-2011-salad/intern/audaspace/intern/AUD_JOSResampleReader.h
branches/soc-2011-salad/intern/audaspace/sndfile/AUD_SndFileWriter.cpp
branches/soc-2011-salad/intern/audaspace/sndfile/AUD_SndFileWriter.h
branches/soc-2011-salad/source/blender/blenkernel/BKE_speaker.h
branches/soc-2011-salad/source/blender/blenkernel/intern/speaker.c
Property Changed:
----------------
branches/soc-2011-salad/
Property changes on: branches/soc-2011-salad
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-30783,30792-30793,30797-30798,30815
/branches/soc-2011-carrot:36828-39099
/branches/soc-2011-cucumber:36829-36994
/branches/soc-2011-onion:36833-38309
/branches/soc-2011-pepper:36830-38934
/branches/soc-2011-tomato:36831-39069
/trunk/blender:36834-39145
+ /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-30783,30792-30793,30797-30798,30815
/branches/soc-2011-carrot:36828-39099
/branches/soc-2011-cucumber:36829-36994
/branches/soc-2011-onion:36833-38309
/branches/soc-2011-pepper:36830-39147
/branches/soc-2011-tomato:36831-39069
/trunk/blender:36834-39145
Modified: branches/soc-2011-salad/CMakeLists.txt
===================================================================
--- branches/soc-2011-salad/CMakeLists.txt 2011-08-07 15:25:06 UTC (rev
39147)
+++ branches/soc-2011-salad/CMakeLists.txt 2011-08-07 15:40:15 UTC (rev
39148)
@@ -691,15 +691,15 @@
if(WITH_CODEC_FFMPEG)
set(FFMPEG_INCLUDE_DIRS
- ${LIBDIR}/ffmpeg/include
- ${LIBDIR}/ffmpeg/include/msvc
+ ${LIBDIR}/ffmpeg-0.8/include
+ ${LIBDIR}/ffmpeg-0.8/include/msvc
)
set(FFMPEG_LIBRARIES
- ${LIBDIR}/ffmpeg/lib/avcodec-52.lib
- ${LIBDIR}/ffmpeg/lib/avformat-52.lib
- ${LIBDIR}/ffmpeg/lib/avdevice-52.lib
- ${LIBDIR}/ffmpeg/lib/avutil-50.lib
- ${LIBDIR}/ffmpeg/lib/swscale-0.lib
+ ${LIBDIR}/ffmpeg-0.8/lib/avcodec-53.lib
+ ${LIBDIR}/ffmpeg-0.8/lib/avformat-53.lib
+ ${LIBDIR}/ffmpeg-0.8/lib/avdevice-53.lib
+ ${LIBDIR}/ffmpeg-0.8/lib/avutil-51.lib
+ ${LIBDIR}/ffmpeg-0.8/lib/swscale-2.lib
)
endif()
@@ -824,9 +824,9 @@
endif()
if(WITH_CODEC_FFMPEG)
- set(FFMPEG ${LIBDIR}/ffmpeg)
+ set(FFMPEG ${LIBDIR}/ffmpeg-0.8)
set(FFMPEG_INCLUDE_DIRS ${FFMPEG}/include
${FFMPEG}/include)
- set(FFMPEG_LIBRARIES avcodec-52 avformat-52 avdevice-52
avutil-50 swscale-0)
+ set(FFMPEG_LIBRARIES avcodec-53 avformat-53 avdevice-53
avutil-51 swscale-2)
set(FFMPEG_LIBPATH ${FFMPEG}/lib)
endif()
@@ -963,7 +963,7 @@
endif()
if(WITH_CODEC_FFMPEG)
- set(FFMPEG ${LIBDIR}/ffmpeg)
+ set(FFMPEG ${LIBDIR}/ffmpeg-0.8)
set(FFMPEG_INCLUDE_DIRS ${FFMPEG}/include)
set(FFMPEG_LIBRARIES avcodec avdevice avformat avutil mp3lame
swscale x264 xvidcore theora theoradec theoraenc vorbis vorbisenc vorbisfile
ogg)
set(FFMPEG_LIBPATH ${FFMPEG}/lib)
Modified: branches/soc-2011-salad/build_files/scons/config/darwin-config.py
===================================================================
--- branches/soc-2011-salad/build_files/scons/config/darwin-config.py
2011-08-07 15:25:06 UTC (rev 39147)
+++ branches/soc-2011-salad/build_files/scons/config/darwin-config.py
2011-08-07 15:40:15 UTC (rev 39148)
@@ -90,7 +90,7 @@
# enable ffmpeg support
WITH_BF_FFMPEG = True # -DWITH_FFMPEG
-BF_FFMPEG = LIBDIR + '/ffmpeg'
+BF_FFMPEG = LIBDIR + '/ffmpeg-0.8'
BF_FFMPEG_INC = "${BF_FFMPEG}/include"
BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
BF_FFMPEG_LIB = 'avcodec avdevice avformat avutil mp3lame swscale x264
xvidcore theora theoradec theoraenc vorbis vorbisenc vorbisfile ogg bz2'
Modified: branches/soc-2011-salad/build_files/scons/config/win32-mingw-config.py
===================================================================
--- branches/soc-2011-salad/build_files/scons/config/win32-mingw-config.py
2011-08-07 15:25:06 UTC (rev 39147)
+++ branches/soc-2011-salad/build_files/scons/config/win32-mingw-config.py
2011-08-07 15:40:15 UTC (rev 39148)
@@ -18,9 +18,9 @@
BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
WITH_BF_FFMPEG = False
-BF_FFMPEG_LIB = 'avformat-52 avcodec-52 avdevice-52 avutil-50 swscale-0'
-BF_FFMPEG_LIBPATH = LIBDIR + '/ffmpeg/lib'
-BF_FFMPEG_INC = LIBDIR + '/ffmpeg/include'
+BF_FFMPEG_LIB = 'avformat-53 avcodec-53 avdevice-53 avutil-51 swscale-2'
+BF_FFMPEG_LIBPATH = LIBDIR + '/ffmpeg-0.8/lib'
+BF_FFMPEG_INC = LIBDIR + '/ffmpeg-0.8/include'
BF_LIBSAMPLERATE = LIBDIR + '/samplerate'
BF_LIBSAMPLERATE_INC = '${BF_LIBSAMPLERATE}/include'
Modified: branches/soc-2011-salad/build_files/scons/config/win32-vc-config.py
===================================================================
--- branches/soc-2011-salad/build_files/scons/config/win32-vc-config.py
2011-08-07 15:25:06 UTC (rev 39147)
+++ branches/soc-2011-salad/build_files/scons/config/win32-vc-config.py
2011-08-07 15:40:15 UTC (rev 39148)
@@ -3,10 +3,11 @@
# enable ffmpeg support
WITH_BF_FFMPEG = True # -DWITH_FFMPEG
-BF_FFMPEG = LIBDIR +'/ffmpeg'
+BF_FFMPEG = LIBDIR +'/ffmpeg-0.8'
BF_FFMPEG_INC = '${BF_FFMPEG}/include ${BF_FFMPEG}/include/msvc'
BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
-BF_FFMPEG_LIB = 'avformat-52.lib avcodec-52.lib avdevice-52.lib avutil-50.lib
swscale-0.lib'
+BF_FFMPEG_LIB = 'avformat-53.lib avcodec-53.lib avdevice-53.lib avutil-51.lib
swscale-2.lib'
+BF_FFMPEG_DLL = '${BF_FFMPEG_LIBPATH}/avformat-53.dll
${BF_FFMPEG_LIBPATH}/avcodec-53.dll ${BF_FFMPEG_LIBPATH}/avdevice-53.dll
${BF_FFMPEG_LIBPATH}/avutil-51.dll ${BF_FFMPEG_LIBPATH}/swscale-2.dll'
BF_FFMPEG_DLL = '${BF_FFMPEG_LIBPATH}/avformat-52.dll
${BF_FFMPEG_LIBPATH}/avcodec-52.dll ${BF_FFMPEG_LIBPATH}/avdevice-52.dll
${BF_FFMPEG_LIBPATH}/avutil-50.dll ${BF_FFMPEG_LIBPATH}/swscale-0.dll'
BF_PYTHON = LIBDIR + '/python'
Modified: branches/soc-2011-salad/build_files/scons/config/win64-vc-config.py
===================================================================
--- branches/soc-2011-salad/build_files/scons/config/win64-vc-config.py
2011-08-07 15:25:06 UTC (rev 39147)
+++ branches/soc-2011-salad/build_files/scons/config/win64-vc-config.py
2011-08-07 15:40:15 UTC (rev 39148)
@@ -3,10 +3,11 @@
# enable ffmpeg support
WITH_BF_FFMPEG = True # -DWITH_FFMPEG
-BF_FFMPEG = LIBDIR +'/ffmpeg'
+BF_FFMPEG = LIBDIR +'/ffmpeg-0.8'
BF_FFMPEG_INC = '${BF_FFMPEG}/include ${BF_FFMPEG}/include/msvc '
BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
-BF_FFMPEG_LIB = 'avformat-52.lib avcodec-52.lib avdevice-52.lib avutil-50.lib
swscale-0.lib'
+BF_FFMPEG_LIB = 'avformat-53.lib avcodec-53.lib avdevice-53.lib avutil-51.lib
swscale-2.lib'
+BF_FFMPEG_DLL = '${BF_FFMPEG_LIBPATH}/avformat-53.dll
${BF_FFMPEG_LIBPATH}/avcodec-53.dll ${BF_FFMPEG_LIBPATH}/avdevice-53.dll
${BF_FFMPEG_LIBPATH}/avutil-51.dll ${BF_FFMPEG_LIBPATH}/swscale-2.dll'
BF_FFMPEG_DLL = '${BF_FFMPEG_LIBPATH}/avformat-52.dll
${BF_FFMPEG_LIBPATH}/avcodec-52.dll ${BF_FFMPEG_LIBPATH}/avdevice-52.dll
${BF_FFMPEG_LIBPATH}/avutil-50.dll ${BF_FFMPEG_LIBPATH}/swscale-0.dll'
BF_PYTHON = LIBDIR + '/python'
Modified: branches/soc-2011-salad/intern/audaspace/CMakeLists.txt
===================================================================
--- branches/soc-2011-salad/intern/audaspace/CMakeLists.txt 2011-08-07
15:25:06 UTC (rev 39147)
+++ branches/soc-2011-salad/intern/audaspace/CMakeLists.txt 2011-08-07
15:40:15 UTC (rev 39148)
@@ -88,12 +88,19 @@
intern/AUD_ConverterReader.h
intern/AUD_FileFactory.cpp
intern/AUD_FileFactory.h
+ intern/AUD_FileWriter.cpp
+ intern/AUD_FileWriter.h
intern/AUD_I3DDevice.h
intern/AUD_I3DHandle.h
intern/AUD_IDevice.h
intern/AUD_IFactory.h
intern/AUD_IHandle.h
intern/AUD_IReader.h
+ intern/AUD_IWriter.h
+ intern/AUD_JOSResampleFactory.cpp
+ intern/AUD_JOSResampleFactory.h
+ intern/AUD_JOSResampleReader.cpp
+ intern/AUD_JOSResampleReader.h
intern/AUD_LinearResampleFactory.cpp
intern/AUD_LinearResampleFactory.h
intern/AUD_LinearResampleReader.cpp
@@ -180,9 +187,11 @@
list(APPEND SRC
ffmpeg/AUD_FFMPEGFactory.cpp
ffmpeg/AUD_FFMPEGReader.cpp
+ ffmpeg/AUD_FFMPEGWriter.cpp
ffmpeg/AUD_FFMPEGFactory.h
ffmpeg/AUD_FFMPEGReader.h
+ ffmpeg/AUD_FFMPEGWriter.h
)
endif()
@@ -242,9 +251,11 @@
list(APPEND SRC
sndfile/AUD_SndFileFactory.cpp
sndfile/AUD_SndFileReader.cpp
+ sndfile/AUD_SndFileWriter.cpp
sndfile/AUD_SndFileFactory.h
sndfile/AUD_SndFileReader.h
+ sndfile/AUD_SndFileWriter.h
)
endif()
Modified: branches/soc-2011-salad/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
===================================================================
--- branches/soc-2011-salad/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
2011-08-07 15:25:06 UTC (rev 39147)
+++ branches/soc-2011-salad/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
2011-08-07 15:40:15 UTC (rev 39148)
@@ -469,8 +469,7 @@
AUD_Quaternion AUD_OpenALDevice::AUD_OpenALHandle::getSourceOrientation()
{
- // AUD_XXX not implemented yet
- return AUD_Quaternion(0, 0, 0, 0);
+ return m_orientation;
}
bool AUD_OpenALDevice::AUD_OpenALHandle::setSourceOrientation(const
AUD_Quaternion& orientation)
@@ -491,6 +490,8 @@
m_device->unlock();
+ m_orientation = orientation;
+
return true;
}
@@ -1284,6 +1285,21 @@
return play(factory->createReader(), keep);
}
+void AUD_OpenALDevice::stopAll()
+{
+ lock();
+ alcSuspendContext(m_context);
+
+ while(!m_playingSounds.empty())
+ m_playingSounds.front()->stop();
+
+ while(!m_pausedSounds.empty())
+ m_pausedSounds.front()->stop();
+
+ alcProcessContext(m_context);
+ unlock();
+}
+
void AUD_OpenALDevice::lock()
{
pthread_mutex_lock(&m_mutex);
@@ -1454,8 +1470,7 @@
AUD_Quaternion AUD_OpenALDevice::getListenerOrientation() const
{
- // AUD_XXX not implemented yet
- return AUD_Quaternion(0, 0, 0, 0);
+ return m_orientation;
}
void AUD_OpenALDevice::setListenerOrientation(const AUD_Quaternion&
orientation)
@@ -1474,6 +1489,7 @@
direction[5] = 2 * (orientation.w() * orientation.x() +
orientation.y() *
orientation.z());
alListenerfv(AL_ORIENTATION, direction);
+ m_orientation = orientation;
}
float AUD_OpenALDevice::getSpeedOfSound() const
Modified: branches/soc-2011-salad/intern/audaspace/OpenAL/AUD_OpenALDevice.h
===================================================================
--- branches/soc-2011-salad/intern/audaspace/OpenAL/AUD_OpenALDevice.h
2011-08-07 15:25:06 UTC (rev 39147)
+++ branches/soc-2011-salad/intern/audaspace/OpenAL/AUD_OpenALDevice.h
2011-08-07 15:40:15 UTC (rev 39148)
@@ -89,6 +89,9 @@
/// Stop callback data.
void* m_stop_data;
+ /// Orientation.
+ AUD_Quaternion m_orientation;
+
/// Current status of the handle
AUD_Status m_status;
@@ -205,6 +208,11 @@
AUD_Buffer m_buffer;
/**
+ * Orientation.
+ */
+ AUD_Quaternion m_orientation;
+
+ /**
* Starts the streaming thread.
*/
void start(bool join = true);
@@ -243,6 +251,7 @@
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
