Changeset 6191 for code

Timestamp:

Dec 2, 2009, 9:06:19 AM (15 years ago)

Author:

rgrieder

Message:

Moved sound listener to the active camera and fixed the ambient distance trigger (now acts on cameras and we only have one in a Scene so far).

Location:

code/branches/presentation2

Files:

• data/levels/sound.oxw (modified) (1 diff)
• src/orxonox/controllers/HumanController.cc (modified) (2 diffs)
• src/orxonox/graphics/Camera.cc (modified) (2 diffs)

code/branches/presentation2/data/levels/sound.oxw

@@ -22 +22 @@
         <events>
                 <activity>
-                        <DistanceTrigger position="300,100,0" distance=200 target="ControllableEntity">
+                        <DistanceTrigger position="300,100,0" distance=200 target="Camera">
                                 <attached>
                                         <ParticleSpawner position="0,0,0" source="Orxonox/fire3" lifetime=0 loop=0 autostart=1 />

code/branches/presentation2/src/orxonox/controllers/HumanController.cc

@@ -36 +36 @@
 #include "infos/PlayerInfo.h"
 #include "overlays/Map.h"
-#include "graphics/Camera.h"
-#include "sound/SoundManager.h"
 #include "Radar.h"
 #include "Scene.h"
@@ -83 +81 @@
         if (GameMode::playsSound() && HumanController::localController_s && HumanController::localController_s->controllableEntity_)
         {
-            // Update sound listener
             Camera* camera = HumanController::localController_s->controllableEntity_->getCamera();
-            if (camera)
-            {
-                SoundManager::getInstance().setListenerPosition(camera->getWorldPosition());
-                SoundManager::getInstance().setListenerOrientation(camera->getWorldOrientation());
-            }
-            else
+            if (!camera)
                 COUT(3) << "HumanController, Warning: Using a ControllableEntity without Camera" << std::endl;
         }

code/branches/presentation2/src/orxonox/graphics/Camera.cc

@@ -42 +42 @@
 #include "Scene.h"
 #include "CameraManager.h"
+#include "sound/SoundManager.h"
 
 namespace orxonox
@@ -131 +132 @@
             this->cameraNode_->setOrientation(Quaternion::Slerp(coeff, this->cameraNode_->_getDerivedOrientation(), this->getWorldOrientation(), true));
         }
+
+        // Update sound listener transformation
+        if (GameMode::playsSound() && this->bHasFocus_)
+        {
+            SoundManager::getInstance().setListenerPosition(this->getWorldPosition());
+            SoundManager::getInstance().setListenerOrientation(this->getWorldOrientation());
+        }
     }