Changeset 10724 in orxonox.OLD for branches

Timestamp:

Jun 19, 2007, 8:54:28 PM (17 years ago)

Author:

snellen

Message:

explosions now have sound

Location:

branches/presentation/src/world_entities/effects

Files:

• explosion.cc (modified) (3 diffs)
• explosion.h (modified) (1 diff)

branches/presentation/src/world_entities/effects/explosion.cc

@@ -43 +43 @@
                             ->addMethod("explode", Executor3<Explosion, lua_State*, float, float, float>(&Explosion::explode))
                             ->addMethod("setExplosionSound", Executor1<Explosion, lua_State*, const std::string&>(&Explosion::setExplosionSound))
+                            ->addMethod("playSound", Executor0<Explosion, lua_State*>(&Explosion::playSound))
                        );
 
@@ -123 +124 @@
   this->toList(OM_DEAD_TICK);
   this->lifeCycle = 0.0;
-  
-  this->explosionSound.play(this->explosionSoundBuffer, OrxSound::SoundEngine::getInstance()->getEffectsVolume(), 0.01, true);
+  this->explosionSound.play(this->explosionSoundBuffer, OrxSound::SoundEngine::getInstance()->getEffectsVolume(), 0.01, false);
+
 }
 
@@ -135 +136 @@
 }
 
+void Explosion::playSound()
+{
+ if (!this->explosionSound.isPlaying())
+  this->explosionSound.play(this->explosionSoundBuffer, OrxSound::SoundEngine::getInstance()->getEffectsVolume(), 0.01, false);
+}
 
 /**

branches/presentation/src/world_entities/effects/explosion.h

@@ -23 +23 @@
     void explode (float x, float y, float z); /// Explode at the current position with size (x,y,z)
     void setExplosionSound(const std::string& newExplosionSound){  this->explosionSoundBuffer = OrxSound::ResourceSoundBuffer(newExplosionSound);  }
+    void playSound();
     
     Explosion ();