Changeset 5982

Timestamp:

Oct 21, 2009, 5:28:13 PM (15 years ago)

Author:

youngk

Message:

Ambient Sounds are now locationally triggerable, i.e if the player comes close to an object, it's own ambient sound starts playing, while the sound of the outer object is paused. Upon leaving proximity of that object, the old sound is resumed. —> Triggerable by changing active state.

Location:

code/branches/sound3

Files:

• data/levels/sound.oxw (added)
• src/orxonox/sound/AmbientSound.cc (modified) (2 diffs)
• src/orxonox/sound/AmbientSound.h (modified) (1 diff)
• src/orxonox/sound/BaseSound.cc (modified) (2 diffs)
• src/orxonox/sound/BaseSound.h (modified) (1 diff)
• src/orxonox/sound/SoundManager.cc (modified) (2 diffs)
• src/orxonox/sound/SoundManager.h (modified) (1 diff)

code/branches/sound3/src/orxonox/sound/AmbientSound.cc

@@ -32 +32 @@
 #include "core/EventIncludes.h"
 #include "core/XMLPort.h"
+#include "SoundManager.h"
 
 namespace orxonox
@@ -60 +61 @@
         XMLPortEventState(AmbientSound, BaseObject, "play", play, xmlelement, mode);
     }
+
+    void AmbientSound::play()
+    {
+        COUT(3) << this->getSource() << ": Playing" << std::endl;
+        SoundManager::getInstance().registerAmbientSound(this);
+        SUPER(AmbientSound, play);
+    }
+
+    void AmbientSound::replay()
+    {
+        SUPER(AmbientSound, play);
+    }
+
+    void AmbientSound::stop()
+    {
+        SUPER(AmbientSound, stop);
+        SoundManager::getInstance().unregisterAmbientSound(this);
+    }
+
+    void AmbientSound::pause()
+    {
+        SUPER(AmbientSound, pause);
+    }
+
+    void AmbientSound::changedActivity() 
+    {
+        COUT(3) << this->getSource() << ": ChangedActivity: " << this->isActive() << std::endl;
+        SUPER(AmbientSound, changedActivity);
+        if(this->isActive())
+        {
+            this->play();
+        }
+        else 
+        {
+            this->stop();
+        }
+    }
+
 }

code/branches/sound3/src/orxonox/sound/AmbientSound.h

@@ -47 +47 @@
         virtual ~AmbientSound();
 
+        virtual void play();
+        virtual void replay();      // is only needed for the AmbientSound list in SoundManager
+        virtual void stop();
+        virtual void pause();
+
         virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
         virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode);
+        virtual void changedActivity();
+
 
     private:

code/branches/sound3/src/orxonox/sound/BaseSound.cc

@@ -70 +70 @@
     }
 
+    void BaseSound::replay()
+    {
+        BaseSound::play();
+    }
+
     void BaseSound::stop()
     {
@@ -105 +110 @@
     void BaseSound::setPlayOnLoad(bool val)
     {
-        this->bPlayOnLoad_ = true;
-        this->play();
+        this->bPlayOnLoad_ = val;
+        if(val)
+        {
+            this->play();
+        }
     }
 

code/branches/sound3/src/orxonox/sound/BaseSound.h

@@ -49 +49 @@
         virtual ~BaseSound();
 
-        void play();
-        void stop();
-        void pause();
+        virtual void play();
+        virtual void replay();      // is only needed for the AmbientSound list in SoundManager
+        virtual void stop();
+        virtual void pause();
 
         bool isPlaying();

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

@@ -36 +36 @@
 #include "core/GameMode.h"
 #include "core/ScopedSingletonManager.h"
+#include "BaseSound.h"
 
 namespace orxonox
@@ -114 +115 @@
             COUT(2) << "Sound: OpenAL: Invalid listener orientation" << std::endl;
     }
+
+    void SoundManager::registerAmbientSound(BaseSound* newAmbient)
+    {
+        if (!(this->ambientSounds_.empty())) 
+        {
+            this->ambientSounds_.front()->pause();
+        }
+        this->ambientSounds_.push_front(newAmbient);
+    }
+
+    void SoundManager::unregisterAmbientSound(BaseSound* currentAmbient)
+    {
+        if(this->ambientSounds_.front() == currentAmbient) 
+        {
+            this->ambientSounds_.pop_front();
+            this->ambientSounds_.front()->replay();
+        }
+        else
+        {
+            for(std::list<BaseSound*>::iterator it= this->ambientSounds_.begin(); it != this->ambientSounds_.end(); it++)
+            {
+                if(*it == currentAmbient)
+                {
+                    this->ambientSounds_.erase(it);
+                    break;
+                }
+            }
+        }
+    }
 }

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

@@ -51 +51 @@
         void setListenerPosition(const Vector3& position);
         void setListenerOrientation(const Quaternion& orientation);
+        void registerAmbientSound(BaseSound* newAmbient);
+        void unregisterAmbientSound(BaseSound* currentAmbient);
 
     private:
         ALCdevice* device_;
         ALCcontext* context_;
+        std::list<BaseSound*> ambientSounds_;
 
         static SoundManager* singletonPtr_s;