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

Timestamp:

Oct 6, 2009, 11:12:01 PM (15 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/gamestates

Files:

• GSMainMenu.cc (modified) (3 diffs)
• GSMainMenu.h (modified) (1 diff)

code/branches/core5/src/orxonox/gamestates/GSMainMenu.cc

@@ -39 +39 @@
 #include "core/GUIManager.h"
 #include "Scene.h"
-#include "sound/SoundBase.h"
+#include "sound/AmbientSound.h"
 
 namespace orxonox
@@ -62 +62 @@
         {
             // Load sound
-            this->ambient_ = new SoundBase(0);
-            this->ambient_->loadFile("ambient/mainmenu.wav");
+            this->ambient_ = new AmbientSound(0);
+            this->ambient_->setSoundFile("ambient/mainmenu.wav");
         }
     }
@@ -96 +96 @@
         if (GameMode::playsSound())
         {
-            this->ambient_->play(true);
+            this->ambient_->setLoop(true);
+            this->ambient_->play();
         }
     }

code/branches/core5/src/orxonox/gamestates/GSMainMenu.h

@@ -59 +59 @@
 
         // ambient sound for the main menu
-        SoundBase*        ambient_;
+        AmbientSound*     ambient_;
     };
 }