Changeset 6245 for code/branches/presentation2/src/orxonox/weaponsystem

Timestamp:

Dec 4, 2009, 3:52:28 PM (15 years ago)

Author:

youngk

Message:

Implemented Firing sounds in Weapons HsW01, LightningGun and RocketFire. Engine and Explosion sounds for the Rocket are not yet implemented.
From now on, when creating a new sound for a weapon, just insert "this→setDefaultSound(PATH_TO_FILE)" into the constructor of the weapon.

Sound Files for HsW01 and LightningGun will be available in a couple of minutes

Location:

code/branches/presentation2/src/orxonox/weaponsystem

Files:

• WeaponMode.cc (modified) (5 diffs)
• WeaponMode.h (modified) (2 diffs)

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

@@ -40 +40 @@
 #include "WeaponSystem.h"
 
+#include "sound/WorldSound.h"
+
 namespace orxonox
 {
@@ -67 +69 @@
         this->muzzlePosition_ = Vector3::ZERO;
         this->muzzleOrientation_ = Quaternion::IDENTITY;
+
+        this->defSndWpnFire_ = new WorldSound(this);
+        this->defSndWpnFire_->setLooping(false);
     }
 
     WeaponMode::~WeaponMode()
     {
+        if(this->isInitialized())
+        {
+            delete this->defSndWpnFire_;
+        }
     }
 
@@ -113 +122 @@
             this->reloadTimer_.startTimer();
 
+            assert( this->getWeapon() && this->getWeapon()->getWeaponPack() && this->getWeapon()->getWeaponPack()->getWeaponSystem() && this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn() );
+            this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->attach(this->defSndWpnFire_);
+            if(!(this->defSndWpnFire_->isPlaying()))
+            {
+                this->defSndWpnFire_->play();
+            }
+            
             this->fire();
 
@@ -200 +216 @@
     void WeaponMode::reloaded()
     {
+        if(this->defSndWpnFire_->isPlaying())
+        {
+            this->defSndWpnFire_->stop();
+        }
         this->bReloading_ = false;
     }
@@ -228 +248 @@
             return WorldEntity::FRONT;
     }
+
+    void WeaponMode::setDefaultSound(const std::string& soundPath)
+    {
+        this->defSndWpnFire_->setSource(soundPath);
+    }
+
+    const std::string& WeaponMode::getDefaultSound()
+    {
+        return this->defSndWpnFire_->getSource();
+    }
 }

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

@@ -51 +51 @@
             bool fire(float* reloadTime);
             bool reload();
+
+            // Interacting with the default Firing sound
+            void setDefaultSound(const std::string& soundPath);
+            const std::string& getDefaultSound();
 
 
@@ -160 +164 @@
             Vector3 muzzlePosition_;
             Quaternion muzzleOrientation_;
+
+            WorldSound* defSndWpnFire_;
     };
 }