Changeset 5913 for code/branches/core5/src/orxonox/controllers

Timestamp:

Oct 8, 2009, 11:23:13 PM (15 years ago)

Author:

rgrieder

Message:

Using the Camera position instead of the ControllableEntity position for the sound listener.

File:

• code/branches/core5/src/orxonox/controllers/HumanController.cc (modified) (2 diffs)

code/branches/core5/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"
@@ -80 +81 @@
     void HumanController::tick(float dt)
     {
-        if (HumanController::localController_s && HumanController::localController_s->controllableEntity_)
-        {
-            if (GameMode::playsSound())
+        if (GameMode::playsSound() && HumanController::localController_s && HumanController::localController_s->controllableEntity_)
+        {
+            // Update sound listener
+            Camera* camera = HumanController::localController_s->controllableEntity_->getCamera();
+            if (camera)
             {
-                // Update sound listener
-                SoundManager::getInstance().setListenerPosition(HumanController::localController_s->controllableEntity_->getPosition());
-                SoundManager::getInstance().setListenerOrientation(HumanController::localController_s->controllableEntity_->getOrientation());
+                SoundManager::getInstance().setListenerPosition(camera->getPosition());
+                SoundManager::getInstance().setListenerOrientation(camera->getOrientation());
             }
+            else
+                COUT(3) << "HumanController, Warning: Using a ControllableEntity without Camera" << std::endl;
         }
     }