Changeset 2980 for code/branches

Timestamp:

May 18, 2009, 2:24:34 PM (16 years ago)

Author:

erwin

Message:

added config ability to sound, few other changes

Location:

code/branches/sound/src/orxonox

Files:

• OrxonoxPrereqs.h (modified) (1 diff)
• objects/Level.cc (modified) (5 diffs)
• objects/Level.h (modified) (2 diffs)
• objects/items/Engine.cc (modified) (4 diffs)
• objects/items/Engine.h (modified) (2 diffs)
• sound/SoundBase.cc (modified) (1 diff)
• sound/SoundBase.h (modified) (3 diffs)
• sound/SoundManager.cc (modified) (3 diffs)

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

@@ -257 +257 @@
     class GSServer;
     class GSClient;
-    class GSGUI;
+    class GSGUI; 
+
+    //sound
+    class SoundBase;
+    class SoundManger;
 }
 

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

@@ -41 +41 @@
 #include "objects/gametypes/Gametype.h"
 #include "overlays/OverlayGroup.h"
+#include "sound/SoundBase.h"
 
 #include "util/Math.h"
@@ -57 +58 @@
         if (this->xmlfilename_.length() >= Core::getMediaPathString().length())
             this->xmlfilename_ = this->xmlfilename_.substr(Core::getMediaPathString().length());
-            
-        this->sndmgr_ = new SoundManager();
     }
 
@@ -70 +69 @@
             if (this->xmlfile_)
                 Loader::unload(this->xmlfile_);
-            
+
             if(this->ambientsound_ != NULL)
                 delete this->ambientsound_;
-            
-            delete this->sndmgr_;
         }
     }
@@ -84 +81 @@
         XMLPortParam(Level, "description", setDescription, getDescription, xmlelement, mode);
         XMLPortParam(Level, "gametype", setGametypeString, getGametypeString, xmlelement, mode).defaultValues("Gametype");
-        
+
         XMLPortParamLoadOnly(Level, "ambientsound", loadAmbientSound, xmlelement, mode);
 
@@ -165 +162 @@
             {
                 this->ambientsound_ = new SoundBase();
-                this->sndmgr_->addSound(this->ambientsound_);
             }
 

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"
 
@@ -73 +71 @@
             XMLFile*               xmlfile_;
             std::list<BaseObject*> objects_;
-            SoundManager*          sndmgr_;
+
             SoundBase*             ambientsound_;
     };

code/branches/sound/src/orxonox/objects/items/Engine.cc

@@ -36 +36 @@
 #include "objects/worldentities/pawns/SpaceShip.h"
 #include "tools/Shader.h"
+#include "sound/SoundBase.h"
 
 namespace orxonox
@@ -95 +96 @@
         XMLPortParam(Engine, "accelerationleftright", setAccelerationLeftRight, setAccelerationLeftRight, xmlelement, mode);
         XMLPortParam(Engine, "accelerationupdown",    setAccelerationUpDown,    setAccelerationUpDown,    xmlelement, mode);
+
+        XMLPortParamLoadOnly(Engine, "sound", loadSound, xmlelement, mode);
     }
 
@@ -219 +222 @@
     {
         this->ship_ = ship;
+        this->sound_->attachToEntity(ship);
+
         if (ship)
         {
@@ -240 +245 @@
             return Vector3::ZERO;
     }
+
+    void Engine::loadSound(const std::string filename)
+    {
+        if(filename == "") return;
+        else
+        {
+            if(this->sound_ == NULL)
+            {
+                this->sound_ = new SoundBase(this->ship_);
+            }
+
+            this->sound_->loadFile(filename);
+            this->sound_->play(true);
+        }
+    }
 }

code/branches/sound/src/orxonox/objects/items/Engine.h

@@ -107 +107 @@
             virtual const Vector3& getDirection() const;
 
+            void loadSound(const std::string filename);
+
         private:
             void networkcallback_shipID();
@@ -129 +131 @@
             Shader* boostBlur_;
             float blurStrength_;
+
+            SoundBase* sound_;
     };
 }

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

@@ -31 +31 @@
 #include "orxonox/objects/worldentities/WorldEntity.h"
 #include "util/Math.h"
+#include "SoundBase.h"
 #include "SoundManager.h"
-#include "SoundBase.h"
 
 namespace orxonox 
 {
-    SoundBase::SoundBase()
-    {
-        this->source_ = 0;
-        this->buffer_ = 0;
-        this->entity_ = NULL;
-    }
+    SoundManager* SoundBase::soundmanager_s = NULL;
 
     SoundBase::SoundBase(WorldEntity* entity)
     {
+        if(SoundBase::soundmanager_s == NULL)
+        {
+            SoundBase::soundmanager_s = new SoundManager();
+        }
+
         this->source_ = 0;
         this->buffer_ = 0;
         this->entity_ = entity;
+
+        SoundBase::soundmanager_s->addSound(this);
     }
 

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

@@ -36 +36 @@
     class SoundManager;
     class WorldEntity;
+
     /**
      * The SoudBase class is the base class for all sound file loader classes.
@@ -44 +45 @@
     {
     public:
-        SoundBase();
-        SoundBase(WorldEntity* entity);
+        SoundBase(WorldEntity* entity = NULL);
         ~SoundBase();
 
@@ -67 +67 @@
 
         ALint getSourceState();
+
+        static SoundManager* soundmanager_s;
     }; // class SoundBase
 } // namepsace orxonox

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

@@ -54 +54 @@
             if(SoundManager::device_s == NULL)
             {
-                COUT(3) << "OpenAL: open sound device..." << std::endl;
+                COUT(3) << "OpenAL: Open sound device..." << std::endl;
                 SoundManager::device_s = alcOpenDevice(NULL);
             }
@@ -64 +64 @@
             else
             {
+                COUT(3) << "OpenAL: Sound device opened";
                 this->context_ = alcCreateContext(SoundManager::device_s, NULL);
                 if(this->context_ == NULL)
@@ -71 +72 @@
                 else
                 {
+                    COUT(3) << "OpenAL: Context " << this->context_ << "loaded";
                     alcMakeContextCurrent(this->context_);
                 }