Changeset 2950 for code/branches/sound

Timestamp:

May 4, 2009, 3:40:08 PM (16 years ago)

Author:

erwin

Message:

ambient sound loading for levels

Location:

code/branches/sound

Files:

• cmake/LibraryConfig.cmake (modified) (1 diff)
• src/orxonox/CMakeLists.txt (modified) (1 diff)
• src/orxonox/objects/Level.cc (modified) (2 diffs)
• src/orxonox/objects/Level.h (modified) (3 diffs)
• src/sound/CMakeLists.txt (added)
• src/sound/SoundBase.cc (modified) (7 diffs)
• src/sound/SoundBase.h (modified) (2 diffs)
• src/sound/SoundManager.cc (modified) (3 diffs)
• src/sound/SoundManager.h (modified) (1 diff)
• src/sound/copyheader (deleted)

code/branches/sound/cmake/LibraryConfig.cmake

@@ -111 +111 @@
 FIND_PACKAGE(OGRE  1.4 EXACT REQUIRED)
 FIND_PACKAGE(ENet  1.1       REQUIRED)
-FIND_PACKAGE(Ogg             REQUIRED)
-FIND_PACKAGE(Vorbis          REQUIRED)
+#FIND_PACKAGE(Ogg             REQUIRED)
+#FIND_PACKAGE(Vorbis          REQUIRED)
 FIND_PACKAGE(ALUT            REQUIRED)
 FIND_PACKAGE(ZLIB            REQUIRED)

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

@@ -58 +58 @@
   core
   network
-  #audio
+  sound
 )
 

code/branches/sound/src/orxonox/objects/Level.cc

@@ -77 +77 @@
         XMLPortParam(Level, "description", setDescription, getDescription, xmlelement, mode);
         XMLPortParam(Level, "gametype", setGametypeString, getGametypeString, xmlelement, mode).defaultValues("Gametype");
+        
+        XMLPortParamLoadOnly(Level, "ambientsound", loadAmbientSound, xmlelement, mode);
 
         XMLPortObjectExtended(Level, BaseObject, "", addObject, getObject, xmlelement, mode, true, false);
@@ -148 +150 @@
     }
 
+    void Level::loadAmbientSound(const std::string& filename)
+    {
+        if(filename == "") return;
+        else
+        {
+            if(this->ambientsound_ == NULL)
+            {
+                this->ambientsound_ = new SoundBase();
+                this->sndmgr_.addSound(this->ambientsound_);
+            }
+
+            this->ambientsound_->loadFile(filename);
+            this->ambientsound_->play();
+        }
+    }
+
     void Level::playerEntered(PlayerInfo* player)
     {

code/branches/sound/src/orxonox/objects/Level.h

@@ -33 +33 @@
 
 #include "network/synchronisable/Synchronisable.h"
+#include "sound/SoundBase.h"
+#include "sound/SoundManager.h"
 #include "core/BaseObject.h"
 
@@ -50 +52 @@
             inline const std::string& getDescription() const
                 { return this->description_; }
+
+            void loadAmbientSound(const std::string& filename);
 
             void playerEntered(PlayerInfo* player);
@@ -69 +73 @@
             XMLFile*               xmlfile_;
             std::list<BaseObject*> objects_;
+            SoundManager           sndmgr_;
+            SoundBase*             ambientsound_;
     };
 }

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

@@ -34 +34 @@
 namespace orxonox 
 {
+    SoundBase::SoundBase()
+    {
+        this->source_ = 0;
+        this->buffer_ = 0;
+        this->entity_ = NULL;
+    }
     SoundBase::SoundBase(WorldEntity* entity)
     {
@@ -39 +45 @@
         this->buffer_ = 0;
         this->entity_ = entity;
-
-        if(SoundBase::soundmanager_s == NULL)
-            SoundBase::soundmanager_s = SoundManager::instance();
     }
 
@@ -51 +54 @@
 
     void SoundBase::update() {
-        if(alIsSource(this->source_)) {
+        if(this->entity_ != NULL && alIsSource(this->source_)) {
             Vector3 pos = this->entity_->getPosition();
             alSource3f(this->source_, AL_POSITION, pos.x, pos.y, pos.z);
@@ -99 +102 @@
             return getSourceState() == AL_PLAYING;
         }
+        return false;
     }
 
@@ -105 +109 @@
             return getSourceState() == AL_PAUSED;
         }
+        return true;
     }
 
@@ -111 +116 @@
             return getSourceState() == AL_INITIAL || getSourceState() == AL_STOPPED;
         }
+        return true;
     }
 
     bool SoundBase::loadFile(std::string filename) {
+        COUT(3) << "OpenAL ALUT: loading file " << filename << std::endl;
         this->buffer_ = alutCreateBufferFromFile(filename.c_str());
         if(this->buffer_ == AL_NONE) {
-            COUT(2) << "OpenAL ALUT: " << alutGetErrorString(alutGetError());
+            COUT(2) << "OpenAL ALUT: " << alutGetErrorString(alutGetError()) << std::endl;
             return false;
         }
@@ -123 +130 @@
         alSourcei(this->source_, AL_BUFFER, this->buffer_);
         if(alGetError() != AL_NO_ERROR) {
-            COUT(2) << "OpenAL: Error loading sample file";
+            COUT(2) << "OpenAL: Error loading sample file" << std::endl;
             return false;
         }

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

@@ -45 +45 @@
     {
     public:
+        SoundBase();
         SoundBase(WorldEntity* entity);
-        ~SoundBase();
 
         void attachToEntity(WorldEntity* entity);
@@ -65 +65 @@
         WorldEntity* entity_;
 
-        static SoundManager* soundmanager_s;
-
         ALint getSourceState();
     }; // class SoundBase

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

@@ -38 +38 @@
 {
     /**
-     * Static function to get the singleton instance of SoundManager.
-     *
-     * @return The singleton instance
-     */
-    SoundManager* SoundManager::instance()
-    {
-        if(SoundManager::singleton_ == NULL)
-        {
-            SoundManager::singleton_ = new SoundManager();
-        }
-
-        return SoundManager::singleton_;
-    }
-
-    /**
      * Default constructor
      */
@@ -58 +43 @@
     {
         if(!alutInit(NULL,NULL)) {
-            COUT(2) << "OpenAL ALUT: " << alutGetErrorString(alutGetError());
+            COUT(2) << "OpenAL ALUT: " << alutGetErrorString(alutGetError()) << std::endl;
         }
+
+        COUT(4) << "OpenAL ALUT version:" << alutGetMajorVersion() << "." << alutGetMinorVersion() << std::endl;
+        COUT(4) << "OpenAL ALUT supported MIME types:" << alutGetMIMETypes(ALUT_LOADER_BUFFER) << std::endl;
     }
 
@@ -98 +86 @@
         // update listener position
         Camera* camera = CameraManager::getInstance().getActiveCamera();
+        if(camera == NULL) return;
         Vector3 pos = camera->getPosition();
         alListener3f(AL_POSITION, pos.x, pos.y, pos.z);

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

@@ -46 +46 @@
     {
     public:
-        static SoundManager* instance();
-        
+        SoundManager();
         void addSound(SoundBase* sound);
         void removeSound(SoundBase* sound);
-        
+
         virtual void tick(float dt);
 
     private:
-        SoundManager(); // private constructor -> singleton
-        static SoundManager* singleton_;
-
         std::list<SoundBase*> soundlist_;