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

Timestamp:

Oct 6, 2009, 11:12:01 PM (16 years ago)

Author:

rgrieder

Message:

Added some basic sound classes: WorldSound (to be used for 3D sound, is a WorldEntity) and AmbientSound (BaseObject, just add it somewhere and it will play with playOnLoad=true).
Also moved the sound listener device updating to the HumanController. We might want to modify this again so that the listener is at the camera position again, not at the space ship.

Location:

code/branches/core5/src/orxonox/controllers

Files:

• HumanController.cc (modified) (2 diffs)
• HumanController.h (modified) (1 diff)

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

@@ -36 +36 @@
 #include "infos/PlayerInfo.h"
 #include "overlays/Map.h"
+#include "sound/SoundManager.h"
 #include "Radar.h"
 #include "Scene.h"
@@ -77 +78 @@
     }
 
+    void HumanController::tick(float dt)
+    {
+        if (HumanController::localController_s && HumanController::localController_s->controllableEntity_)
+        {
+            if (GameMode::playsSound())
+            {
+                // Update sound listener
+                SoundManager::getInstance().setListenerPosition(HumanController::localController_s->controllableEntity_->getPosition());
+                SoundManager::getInstance().setListenerOrientation(HumanController::localController_s->controllableEntity_->getOrientation());
+            }
+        }
+    }
+
     void HumanController::moveFrontBack(const Vector2& value)
     {

code/branches/core5/src/orxonox/controllers/HumanController.h

@@ -31 +31 @@
 
 #include "OrxonoxPrereqs.h"
+
+#include "tools/interfaces/Tickable.h"
 #include "Controller.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport HumanController : public Controller
+    class _OrxonoxExport HumanController : public Controller, public Tickable
     {
         public:
             HumanController(BaseObject* creator);
             virtual ~HumanController();
+
+            virtual void tick(float dt);
 
             static void moveFrontBack(const Vector2& value);