Changeset 3055 for code/branches/sound2

Timestamp:

May 25, 2009, 1:53:13 PM (16 years ago)

Author:

erwin

Message:

added mainmenu ambient sound

Location:

code/branches/sound2/src/orxonox

Files:

• CameraManager.h (modified) (1 diff)
• OrxonoxPrereqs.h (modified) (1 diff)
• gamestates/GSMainMenu.cc (modified) (2 diffs)
• gamestates/GSMainMenu.h (modified) (1 diff)
• sound/CMakeLists.txt (modified) (1 diff)
• sound/SoundBase.cc (modified) (4 diffs)
• sound/SoundBase.h (modified) (1 diff)
• sound/SoundMainMenu.cc (added)
• sound/SoundMainMenu.h (added)
• sound/SoundManager.cc (modified) (3 diffs)
• sound/SoundManager.h (modified) (1 diff)

code/branches/sound2/src/orxonox/CameraManager.h

@@ -56 +56 @@
 
             static CameraManager& getInstance() { assert(singletonRef_s); return *singletonRef_s; }
+            static CameraManager* getInstancePtr() { return singletonRef_s; }
 
             void useCamera(Ogre::Camera* camera);

code/branches/sound2/src/orxonox/OrxonoxPrereqs.h

@@ -253 +253 @@
     //sound
     class SoundBase;
-    class SoundManger;
+    class SoundManager;
+    class SoundMainMenu;
 }
 

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

@@ -40 +40 @@
 #include "objects/Scene.h"
 #include "GraphicsManager.h"
+#include "sound/SoundMainMenu.h"
 
 namespace orxonox
@@ -79 +80 @@
 
         InputManager::getInstance().requestEnterState("mainMenu");
+
+        this->ambient_ = new SoundMainMenu();
+        this->ambient_->play(true);
     }
 
     void GSMainMenu::deactivate()
     {
+        delete this->ambient_;
+
         InputManager::getInstance().requestLeaveState("mainMenu");
         InputManager::getInstance().requestDestroyState("mainMenu");

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

@@ -55 +55 @@
         // console commands
         ConsoleCommand* ccStartGame_;
+
+        // ambient sound for the main menu
+        SoundMainMenu* ambient_;
     };
 }

code/branches/sound2/src/orxonox/sound/CMakeLists.txt

@@ -2 +2 @@
     SoundManager.h
     SoundBase.h
+    SoundMainMenu.h
 
     SoundManager.cc
     SoundBase.cc
+    SoundMainMenu.cc
 )
 

code/branches/sound2/src/orxonox/sound/SoundBase.cc

@@ -148 +148 @@
             if(filename.find("ogg", 0) != std::string::npos)
             {
+                COUT(2) << "Sound: Trying fallback ogg loader" << std::endl;
                 this->buffer_ = loadOggFile(filename);
             }
 
-            if(this->buffer_ == AL_NONE) 
+            if(this->buffer_ == AL_NONE)
+            {
+                COUT(2) << "Sound: fallback ogg loader failed: " << alutGetErrorString(alutGetError()) << std::endl;
                 return false;
+            }
         }
 
@@ -158 +162 @@
         alSourcei(this->source_, AL_BUFFER, this->buffer_);
         if(alGetError() != AL_NO_ERROR) {
-            COUT(2) << "Sound: OpenAL: Error loading sample file" << std::endl;
+            COUT(2) << "Sound: OpenAL: Error loading sample file: " << filename << std::endl;
             return false;
         }
@@ -172 +176 @@
     ALuint SoundBase::loadOggFile(std::string filename)
     {
-        COUT(2) << "Sound: Trying fallback ogg loader";
-
         char inbuffer[4096];
         std::vector<char> outbuffer;
@@ -207 +209 @@
             }
         }
-        
+
         ov_clear(&vf);
 

code/branches/sound2/src/orxonox/sound/SoundBase.h

@@ -32 +32 @@
 #include <string>
 
+#include "OrxonoxPrereqs.h"
+
 namespace orxonox
 {
-    class SoundManager;
-    class WorldEntity;
-
     /**
      * The SoudBase class is the base class for all sound file loader classes.

code/branches/sound2/src/orxonox/sound/SoundManager.cc

@@ -52 +52 @@
         else
         {
-            COUT(4) << "Sound: OpenAL ALUT version:" << alutGetMajorVersion() << "." << alutGetMinorVersion() << std::endl;
-            COUT(4) << "Sound: OpenAL ALUT supported MIME types:" << alutGetMIMETypes(ALUT_LOADER_BUFFER) << std::endl;
+            COUT(4) << "Sound: OpenAL ALUT version: " << alutGetMajorVersion() << "." << alutGetMinorVersion() << std::endl;
+            COUT(4) << "Sound: OpenAL ALUT supported MIME types: " << alutGetMIMETypes(ALUT_LOADER_BUFFER) << std::endl;
             if(SoundManager::device_s == NULL)
             {
@@ -77 +77 @@
                 {
                     if(alcMakeContextCurrent(this->context_) == AL_TRUE)
-                        COUT(3) << "Sound: OpenAL: Context " << this->context_ << "loaded" << std::endl;
+                        COUT(3) << "Sound: OpenAL: Context " << this->context_ << " loaded" << std::endl;
                 }
             }
@@ -124 +124 @@
     void SoundManager::tick(float dt)
     {
+        if (!CameraManager::getInstancePtr())
+            return;
+
         // update listener position
         Camera* camera = CameraManager::getInstance().getActiveCamera();

code/branches/sound2/src/orxonox/sound/SoundManager.h

@@ -31 +31 @@
 #include <AL/alc.h>
 
-#include <orxonox/objects/Tickable.h>
+#include "OrxonoxPrereqs.h"
+#include "orxonox/objects/Tickable.h"
 
 namespace orxonox
 {
-    class SoundBase;
-
     /**
      * The SoundManager class manages the OpenAL device, context and listener