Changeset 6245 for code

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

Files:

• modules/weapons/weaponmodes/HsW01.cc (modified) (4 diffs)
• modules/weapons/weaponmodes/HsW01.h (modified) (2 diffs)
• modules/weapons/weaponmodes/LightningGun.cc (modified) (3 diffs)
• modules/weapons/weaponmodes/LightningGun.h (modified) (1 diff)
• modules/weapons/weaponmodes/RocketFire.cc (modified) (2 diffs)
• modules/weapons/weaponmodes/RocketFire.h (modified) (1 diff)
• orxonox/weaponsystem/WeaponMode.cc (modified) (5 diffs)
• orxonox/weaponsystem/WeaponMode.h (modified) (2 diffs)

code/branches/presentation2/src/modules/weapons/weaponmodes/HsW01.cc

@@ -52 +52 @@
         RegisterObject(HsW01);
 
-        this->reloadTime_ = 0.5;
+        this->reloadTime_ = 0.25;
         this->damage_ = 15;
         this->speed_ = 2500;
@@ -61 +61 @@
         this->delayTimer_.stopTimer();
 
-        this->defSndWpnFire_ = new WorldSound(this);
-        this->defSndWpnFire_->setLooping(false);
-        this->setDefaultSound("sounds/Weapon_Laser_shrt.ogg");
+        this->setDefaultSound("sounds/Weapon_HsW01.ogg");
     }
 
     HsW01::~HsW01()
     {
-        if(this->isInitialized())
-        {
-            delete this->defSndWpnFire_;
-        }
     }
 
@@ -106 +100 @@
     void HsW01::fire()
     {
-        this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->attach(this->defSndWpnFire_);
-        this->defSndWpnFire_->play();
-
         this->delayTimer_.startTimer();
-
-        //this->defSndWpnFire_->stop();
     }
 
@@ -142 +131 @@
         HsW01::muendungsfeuer();
     }
-
-    void HsW01::setDefaultSound(const std::string& soundPath)
-    {
-        this->defSndWpnFire_->setSource(soundPath);
-    }
-
-    const std::string& HsW01::getDefaultSound()
-    {
-        return this->defSndWpnFire_->getSource();
-    }
 }

code/branches/presentation2/src/modules/weapons/weaponmodes/HsW01.h

@@ -46 +46 @@
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
 
-            void setDefaultSound(const std::string& soundPath);
-            const std::string& getDefaultSound();
-
         private:
             void setMaterial(const std::string& material);
@@ -61 +58 @@
             float delay_;
             Timer delayTimer_;
-
-            WorldSound* defSndWpnFire_;
     };
 }

code/branches/presentation2/src/modules/weapons/weaponmodes/LightningGun.cc

@@ -36 +36 @@
 #include "worldentities/pawns/Pawn.h"
 
+#include "sound/WorldSound.h"
+
 namespace orxonox
 {
@@ -49 +51 @@
 
         this->setMunitionName("LaserMunition");
+        this->setDefaultSound("sounds/Weapon_LightningGun.ogg");
     }
 
@@ -56 +59 @@
 
     void LightningGun::fire()
-    {
+    {        
         LightningGunProjectile* projectile = new LightningGunProjectile(this);
         projectile->setMaterial("Flares/LightningBall_");

code/branches/presentation2/src/modules/weapons/weaponmodes/LightningGun.h

@@ -42 +42 @@
 
             virtual void fire();
+
        private:
             float speed_;

code/branches/presentation2/src/modules/weapons/weaponmodes/RocketFire.cc

@@ -38 +38 @@
 #include "worldentities/pawns/Pawn.h"
 
+#include "sound/WorldSound.h"
+
 namespace orxonox
 {
@@ -52 +54 @@
 
         this->setMunitionName("RocketMunition");
+        this->setDefaultSound("sounds/Rocket_Launch.ogg");
+    }
+
+    RocketFire::~RocketFire()
+    {
     }
 

code/branches/presentation2/src/modules/weapons/weaponmodes/RocketFire.h

@@ -39 +39 @@
         public:
             RocketFire(BaseObject* creator);
-            virtual ~RocketFire() {}
+            virtual ~RocketFire();
 
             virtual void fire();

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_;
     };
 }