Changeset 7095 for code/branches

Timestamp:

Jun 2, 2010, 11:18:00 PM (14 years ago)

Author:

gnadler

Message:

added a launching sound to the rocket.
Added an additional sound-set function to WeaponMode.cc to be able to set the volume as well as the source.

Location:

code/branches/presentation3/src

Files:

• modules/weapons/projectiles/SimpleRocket.h (modified) (1 diff)
• modules/weapons/weaponmodes/SimpleRocketFire.cc (modified) (2 diffs)
• orxonox/weaponsystem/WeaponMode.cc (modified) (1 diff)
• orxonox/weaponsystem/WeaponMode.h (modified) (1 diff)

code/branches/presentation3/src/modules/weapons/projectiles/SimpleRocket.h

@@ -137 +137 @@
 
 
-
     };
 

code/branches/presentation3/src/modules/weapons/weaponmodes/SimpleRocketFire.cc

@@ -37 +37 @@
 #include "weaponsystem/WeaponSystem.h"
 #include "worldentities/pawns/Pawn.h"
+#include "sound/WorldSound.h"
 
 namespace orxonox
@@ -52 +53 @@
         this->speed_ = 500;
 
-        this->setMunitionName("LaserMunition");
+            this->setMunitionName("TargetSeeking Rockets");
+            this->setDefaultSoundWithVolume("sounds/Rocket_launch.ogg",0.4); 
         // The firing sound of the Rocket is played in Rocket.cc (because of OpenAl sound positioning)
     }

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

@@ -274 +274 @@
             return BLANKSTRING;
     }
+
+    void WeaponMode::setDefaultSoundWithVolume(const std::string& soundPath, const float soundVolume){
+        if (this->defSndWpnFire_) {
+            this->defSndWpnFire_->setSource(soundPath);
+            this->defSndWpnFire_->setVolume(soundVolume);
+        }
+    }
+
 }

code/branches/presentation3/src/orxonox/weaponsystem/WeaponMode.h

@@ -55 +55 @@
             void setDefaultSound(const std::string& soundPath);
             const std::string& getDefaultSound();
-
+            void setDefaultSoundWithVolume(const std::string& soundPath, const float soundVolume);
 
             // Munition