Changeset 6207 for code/branches

Timestamp:

Dec 2, 2009, 5:40:13 PM (15 years ago)

Author:

youngk

Message:

Speed dependent pitching of the sounds works now for engine states: normal and boost.

Location:

code/branches/presentation2

Files:

• data/levels/templates/spaceship_assff.oxt (modified) (2 diffs)
• src/orxonox/items/MultiStateEngine.cc (modified) (8 diffs)
• src/orxonox/items/MultiStateEngine.h (modified) (2 diffs)

code/branches/presentation2/data/levels/templates/spaceship_assff.oxt

@@ -65 +65 @@
 
    defEngineSndNormal = "sounds/Engine_low.ogg"
+   defEngineSndBoost = "sounds/Engine_high.ogg"
 
    accelerationfront     = 500
@@ -92 +93 @@
       <Backlight mainstate=activity active=false scale=0.4 name=bltest position=" 7.6, 0, 6" colour="0.6, 0.75, 0.8, 0.7" width=40 length=1000 lifetime=1 elements=30 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Examples/Flare" />
       <Backlight mainstate=activity active=false scale=0.4 name=bltest position="-7.6, 0, 6" colour="0.6, 0.75, 0.8, 0.7" width=40 length=1000 lifetime=1 elements=30 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Examples/Flare" />
-      <WorldSound mainstate="activity" source="sounds/Engine_high.ogg" loop=1 active=false/>
+      <!-- WorldSound mainstate="activity" source="sounds/Engine_high.ogg" loop=1 active=false -->
     </EffectContainer>
     <EffectContainer condition="brake">

code/branches/presentation2/src/orxonox/items/MultiStateEngine.cc

@@ -45 +45 @@
 namespace orxonox
 {
-    static const float FORWARD_EFFECT_VELOCITY_THRESHOLD = 20;
+    static const float FORWARD_EFFECT_VELOCITY_THRESHOLD = 0;
     static const float MAX_VELOCITY_NORMAL = 111;
     static const float MAX_VELOCITY_BOOST = 221;
@@ -56 +56 @@
 
         defEngineSndNormal_ = new WorldSound(this);
+        defEngineSndBoost_ = new WorldSound(this);
         defEngineSndNormal_->setLooping(true);
+        defEngineSndBoost_->setLooping(true);
 
         this->lua_ = new LuaState();
@@ -73 +75 @@
                     (*it2)->destroy();
             delete this->defEngineSndNormal_;
+            delete this->defEngineSndBoost_;
             delete this->lua_;
         }
@@ -82 +85 @@
         XMLPortObject(MultiStateEngine, EffectContainer, "",  addEffectContainer,  getEffectContainer,  xmlelement, mode);
         XMLPortParam(MultiStateEngine, "defEngineSndNormal",  setDefEngSndNormal,  getDefEngSndNormal,  xmlelement, mode);
+        XMLPortParam(MultiStateEngine, "defEngineSndBoost",  setDefEngSndBoost,  getDefEngSndBoost,  xmlelement, mode);
     }
 
@@ -107 +111 @@
                 {
                     newState = Boost;
-                    /*pitch = pitch/MAX_VELOCITY_BOOST + 1;
+                    pitch = pitch/MAX_VELOCITY_BOOST + 1;
                     pitch = pitch > 2 ? 2 : pitch;
                     pitch = pitch < 0.5 ? 0.5 : pitch;
-                    defEngineSndNormal_->setPitch(pitch);*/
+                    defEngineSndBoost_->setPitch(pitch);
                 }
                 else if (forward && !newState) // newState == Boost
@@ -155 +159 @@
                         lua_pushboolean(this->lua_->getInternalLuaState(), newState & Boost);
                         lua_setglobal(this->lua_->getInternalLuaState(), "boost");
+                        if(newState & Boost)
+                        {
+                            defEngineSndBoost_->play();
+                        }
+                        else
+                        {
+                            defEngineSndBoost_->stop();
+                        }
                     }
 
@@ -181 +193 @@
 
         this->getShip()->attach(defEngineSndNormal_);
+        this->getShip()->attach(defEngineSndBoost_);
 
         for (std::vector<EffectContainer*>::const_iterator it = this->effectContainers_.begin(); it != this->effectContainers_.end(); ++it)
@@ -220 +233 @@
         return defEngineSndNormal_->getSource();
     }
+
+    void MultiStateEngine::setDefEngSndBoost(const std::string &engineSound)
+    {
+        defEngineSndBoost_->setSource(engineSound);
+    }
+
+    const std::string& MultiStateEngine::getDefEngSndBoost()
+    {
+        return defEngineSndBoost_->getSource();
+    }
 }

code/branches/presentation2/src/orxonox/items/MultiStateEngine.h

@@ -64 +64 @@
             void addEffectContainer(EffectContainer* effect);
             EffectContainer* getEffectContainer(unsigned int index) const;
+            
             void setDefEngSndNormal(const std::string& engineSound);
             const std::string& getDefEngSndNormal();
+            void setDefEngSndBoost(const std::string& engineSound);
+            const std::string& getDefEngSndBoost();
 
         private:
@@ -72 +75 @@
             std::vector<EffectContainer*> effectContainers_;
             WorldSound* defEngineSndNormal_;
+            WorldSound* defEngineSndBoost_;
     };
 }