[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58428] trunk/blender/source/gameengine/ GamePlayer/ghost: BGE: Partial fix for [#36151] " Distance model not carrying over to standalone" reported by Florian Schneider (drjaska).

[Mitchell Stokes]

Revision: 58428
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58428
Author:   moguri
Date:     2013-07-19 23:31:45 +0000 (Fri, 19 Jul 2013)
Log Message:
-----------
BGE: Partial fix for [#36151] "Distance model not carrying over to standalone" reported by Florian Schneider (drjaska).

The Blenderplayer wasn't initializing 3D audio settings from the scene settings like the embedded player was.

Modified Paths:
--------------
    trunk/blender/source/gameengine/GamePlayer/ghost/CMakeLists.txt
    trunk/blender/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
    trunk/blender/source/gameengine/GamePlayer/ghost/SConscript

Modified: trunk/blender/source/gameengine/GamePlayer/ghost/CMakeLists.txt
===================================================================
--- trunk/blender/source/gameengine/GamePlayer/ghost/CMakeLists.txt	2013-07-19 23:00:42 UTC (rev 58427)
+++ trunk/blender/source/gameengine/GamePlayer/ghost/CMakeLists.txt	2013-07-19 23:31:45 UTC (rev 58428)
@@ -81,4 +81,11 @@
 	add_definitions(-DWITH_INTERNATIONAL)
 endif()
 
+if(WITH_AUDASPACE)
+	list(APPEND INC
+		../../../../intern/audaspace/intern
+	)
+	add_definitions(-DWITH_AUDASPACE)
+endif()
+
 blender_add_lib_nolist(ge_player_ghost "${SRC}" "${INC}" "${INC_SYS}")

Modified: trunk/blender/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
===================================================================
--- trunk/blender/source/gameengine/GamePlayer/ghost/GPG_Application.cpp	2013-07-19 23:00:42 UTC (rev 58427)
+++ trunk/blender/source/gameengine/GamePlayer/ghost/GPG_Application.cpp	2013-07-19 23:31:45 UTC (rev 58428)
@@ -99,6 +99,12 @@
 #include "GHOST_IWindow.h"
 #include "GHOST_Rect.h"
 
+#ifdef WITH_AUDASPACE
+#  include "AUD_C-API.h"
+#  include "AUD_I3DDevice.h"
+#  include "AUD_IDevice.h"
+#endif
+
 static void frameTimerProc(GHOST_ITimerTask* task, GHOST_TUns64 time);
 
 static GHOST_ISystem* fSystem = 0;
@@ -725,6 +731,15 @@
 		if (m_startScene->gm.stereoflag == STEREO_DOME)
 			m_ketsjiengine->InitDome(m_startScene->gm.dome.res, m_startScene->gm.dome.mode, m_startScene->gm.dome.angle, m_startScene->gm.dome.resbuf, m_startScene->gm.dome.tilt, m_startScene->gm.dome.warptext);
 
+		// initialize 3D Audio Settings
+		AUD_I3DDevice* dev = AUD_get3DDevice();
+		if (dev)
+		{
+			dev->setSpeedOfSound(m_startScene->audio.speed_of_sound);
+			dev->setDopplerFactor(m_startScene->audio.doppler_factor);
+			dev->setDistanceModel(AUD_DistanceModel(m_startScene->audio.distance_model));
+		}
+
 #ifdef WITH_PYTHON
 		// Set the GameLogic.globalDict from marshal'd data, so we can
 		// load new blend files and keep data in GameLogic.globalDict

Modified: trunk/blender/source/gameengine/GamePlayer/ghost/SConscript
===================================================================
--- trunk/blender/source/gameengine/GamePlayer/ghost/SConscript	2013-07-19 23:00:42 UTC (rev 58427)
+++ trunk/blender/source/gameengine/GamePlayer/ghost/SConscript	2013-07-19 23:31:45 UTC (rev 58428)
@@ -43,6 +43,7 @@
     '#intern/guardedalloc',
     '#intern/moto/include',
     '#intern/container',
+	'#intern/audaspace/intern',
     '#source/gameengine/Rasterizer/RAS_OpenGLRasterizer',
     '#source/gameengine/BlenderRoutines',
     '#source/gameengine/Converter',