Changeset 6307 for code/branches/presentation2

Timestamp:

Dec 9, 2009, 10:09:27 PM (15 years ago)

Author:

scheusso

Message:

Approach to make sounds synchronisable (not yet working)

Location:

code/branches/presentation2/src

Files:

• modules/weapons/weaponmodes/HsW01.cc (modified) (1 diff)
• modules/weapons/weaponmodes/LightningGun.cc (modified) (1 diff)
• modules/weapons/weaponmodes/RocketFire.cc (modified) (1 diff)
• orxonox/sound/AmbientSound.cc (modified) (2 diffs)
• orxonox/sound/AmbientSound.h (modified) (4 diffs)
• orxonox/sound/BaseSound.cc (modified) (3 diffs)
• orxonox/sound/BaseSound.h (modified) (2 diffs)
• orxonox/sound/WorldSound.cc (modified) (2 diffs)
• orxonox/sound/WorldSound.h (modified) (1 diff)
• orxonox/weaponsystem/WeaponMode.cc (modified) (6 diffs)

code/branches/presentation2/src/modules/weapons/weaponmodes/HsW01.cc

@@ -41 +41 @@
 #include "worldentities/WorldEntity.h"
 #include "worldentities/pawns/Pawn.h"
-
-#include "sound/WorldSound.h"
 
 namespace orxonox

code/branches/presentation2/src/modules/weapons/weaponmodes/LightningGun.cc

@@ -36 +36 @@
 #include "worldentities/pawns/Pawn.h"
 
-#include "sound/WorldSound.h"
-
 namespace orxonox
 {

code/branches/presentation2/src/modules/weapons/weaponmodes/RocketFire.cc

@@ -38 +38 @@
 #include "worldentities/pawns/Pawn.h"
 
-#include "sound/WorldSound.h"
-
 namespace orxonox
 {

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

@@ -42 +42 @@
 
     AmbientSound::AmbientSound(BaseObject* creator)
-        : BaseObject(creator)
+        : BaseObject(creator), Synchronisable(creator)
     {
         RegisterObject(AmbientSound);
@@ -48 +48 @@
         // Ambient sounds always fade in
         this->setVolume(0);
+        this->registerVariables();
     }
 
     AmbientSound::~AmbientSound()
     {
+    }
+    
+    void AmbientSound::registerVariables()
+    {
+        registerVariable(volume_, ObjectDirection::ToClient, new NetworkCallback<BaseSound>(static_cast<BaseSound*>(this), &BaseSound::volumeChanged));
+//         registerVariable(source_, ObjectDirection::ToClient, new NetworkCallback<BaseSound>(static_cast<BaseSound*>(this), &BaseSound::sourceChanged));
+        registerVariable(ambientSource_, ObjectDirection::ToClient, new NetworkCallback<AmbientSound>(this, &AmbientSound::ambientSourceChanged));
+        registerVariable(bLooping_, ObjectDirection::ToClient, new NetworkCallback<BaseSound>(static_cast<BaseSound*>(this), &BaseSound::loopingChanged));
+        registerVariable(pitch_, ObjectDirection::ToClient, new NetworkCallback<BaseSound>(static_cast<BaseSound*>(this), &BaseSound::pitchChanged));
+        registerVariable((int&)(BaseSound::state_), ObjectDirection::ToClient);
     }
 

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

@@ -35 +35 @@
 #include "core/BaseObject.h"
 #include "sound/BaseSound.h"
+#include "network/synchronisable/Synchronisable.h"
 
 namespace orxonox
@@ -43 +44 @@
      *
      */
-    class _OrxonoxExport AmbientSound : public BaseSound, public BaseObject
+    class _OrxonoxExport AmbientSound : public BaseSound, public BaseObject, public Synchronisable
     {
         friend class SoundManager;
@@ -63 +64 @@
         virtual void setAmbientSource(const std::string& source);
         const std::string& getAmbientSource() const { return this->ambientSource_; }
+        inline void ambientSourceChanged(){ this->setAmbientSource(this->ambientSource_); }
 
     private:
@@ -68 +70 @@
         void doStop();
         void doPause();
+        
+        void registerVariables();
 
         std::string ambientSource_; //!< Analogous to source_, but mood independent

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

@@ -46 +46 @@
         , bPooling_(false)
         , volume_(1.0)
-        , bLoop_(false)
+        , bLooping_(false)
         , state_(Stopped)
         , pitch_ (1.0)
@@ -151 +151 @@
     void BaseSound::setLooping(bool val)
     {
-        this->bLoop_ = val;
+        this->bLooping_ = val;
         if (GameMode::playsSound() && alIsSource(this->audioSource_))
             alSourcei(this->audioSource_, AL_LOOPING, (val ? AL_TRUE : AL_FALSE));
@@ -204 +204 @@
         if (ALuint error = alGetError())
         {
-            COUT(1) << "Sound Error: Could not load file \"" << source << "\": " << SoundManager::getALErrorString << std::endl;
+            COUT(1) << "Sound Error: Could not load file \"" << source << "\": " << SoundManager::getALErrorString(error) << std::endl;
             return;
         }

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

@@ -68 +68 @@
         virtual void setSource(const std::string& source);
         virtual const std::string& getSource() const { return this->source_; }
+        inline void sourceChanged(){ this->setSource(this->source_); }
 
         void setVolume(float vol);
         float getVolume() const { return this->volume_; }
+        inline void volumeChanged(){ this->setVolume(this->volume_); }
         
         virtual float getVolumeGain();
         void updateVolume(void);
 
-        bool getLooping() const   { return this->bLoop_; }
+        bool getLooping() const   { return this->bLooping_; }
         void setLooping(bool val);
+        inline void loopingChanged(){ this->setLooping(this->bLooping_); }
 
         float getPitch() const   { return this->pitch_; }
         void setPitch(float pitch);
+        inline void pitchChanged(){ this->setPitch(this->pitch_); }
 
         //ALuint getALAudioSource(void);
 
     protected:
-        ALint getSourceState() const;
-
-        ALuint          audioSource_;
-        bool            bPooling_;
-        shared_ptr<SoundBuffer> soundBuffer_;
-
-    private:
         enum State
         {
@@ -97 +94 @@
             Paused
         };
+        ALint getSourceState() const;
 
+        ALuint          audioSource_;
+        bool            bPooling_;
+        shared_ptr<SoundBuffer> soundBuffer_;
         std::string     source_;
         float           volume_;
-        bool            bLoop_;
+        bool            bLooping_;
         State           state_;
         float           pitch_;
+
+    private:
         DataStreamPtr   dataStream_;
     };

code/branches/presentation2/src/orxonox/sound/WorldSound.cc

@@ -36 +36 @@
 #include "core/XMLPort.h"
 #include "SoundManager.h"
+#include <core/ConsoleCommandCompilation.h>
 
 namespace orxonox
@@ -47 +48 @@
         // WorldSound buffers should be pooled when they're not used anymore
         this->bPooling_ = true;
+        this->registerVariables();
     }
 
     WorldSound::~WorldSound()
     {
+    }
+    
+    void WorldSound::registerVariables()
+    {
+        registerVariable(volume_, ObjectDirection::ToClient, new NetworkCallback<BaseSound>(static_cast<BaseSound*>(this), &BaseSound::volumeChanged));
+        registerVariable(source_, ObjectDirection::ToClient, new NetworkCallback<BaseSound>(static_cast<BaseSound*>(this), &BaseSound::sourceChanged));
+        registerVariable(bLooping_, ObjectDirection::ToClient, new NetworkCallback<BaseSound>(static_cast<BaseSound*>(this), &BaseSound::loopingChanged));
+        registerVariable((int&)(BaseSound::state_), ObjectDirection::ToClient);
+        registerVariable(pitch_, ObjectDirection::ToClient, new NetworkCallback<BaseSound>(static_cast<BaseSound*>(this), &BaseSound::pitchChanged));
     }
 

code/branches/presentation2/src/orxonox/sound/WorldSound.h

@@ -57 +57 @@
 
     private:
+        void registerVariables();
     };
 }

code/branches/presentation2/src/orxonox/weaponsystem/WeaponMode.cc

@@ -71 +71 @@
         this->muzzleOrientation_ = Quaternion::IDENTITY;
 
-        this->defSndWpnFire_ = new WorldSound(this);
-        this->defSndWpnFire_->setLooping(false);
-        this->bSoundAttached_ = false;
+        if( GameMode::isMaster() )
+        {
+            this->defSndWpnFire_ = new WorldSound(this);
+            this->defSndWpnFire_->setLooping(false);
+            this->bSoundAttached_ = false;
+        }
+        else
+            this->defSndWpnFire_ = 0;
     }
 
@@ -80 +85 @@
         if(this->isInitialized())
         {
-            delete this->defSndWpnFire_;
+            if( this->defSndWpnFire_ )
+                delete this->defSndWpnFire_;
         }
     }
@@ -106 +112 @@
     {
         (*reloadTime) = this->reloadTime_;
-        if( !this->bSoundAttached_ )
+        if( !this->bSoundAttached_ && GameMode::isMaster() )
         {
             assert(this->getWeapon() && this->getWeapon()->getWeaponSlot());
@@ -130 +136 @@
             this->reloadTimer_.startTimer();
 
-            if(!(this->defSndWpnFire_->isPlaying()))
+            if( this->defSndWpnFire_ && !(this->defSndWpnFire_->isPlaying()))
             {
                 this->defSndWpnFire_->play();
@@ -222 +228 @@
     void WeaponMode::reloaded()
     {
-        if(this->defSndWpnFire_->isPlaying())
+        if( this->defSndWpnFire_ && this->defSndWpnFire_->isPlaying())
         {
             this->defSndWpnFire_->stop();
@@ -257 +263 @@
     void WeaponMode::setDefaultSound(const std::string& soundPath)
     {
-        this->defSndWpnFire_->setSource(soundPath);
+        if( this->defSndWpnFire_ )
+            this->defSndWpnFire_->setSource(soundPath);
     }
 
     const std::string& WeaponMode::getDefaultSound()
     {
-        return this->defSndWpnFire_->getSource();
+        if( this->defSndWpnFire_ )
+            return this->defSndWpnFire_->getSource();
+        else
+            return std::string();
     }
 }