Changeset 11108 for code/trunk/src/modules

Timestamp:

Feb 4, 2016, 11:54:04 PM (8 years ago)

Author:

fvultier

Message:

A few modifications in the weapon system: WeaponModes may play a reload sound now. Fireing Sounds of WeaponModes may overlap now. New weapon: FlameGun, a flame thrower for close combat (e.g. for the FPS player)

Location:

code/trunk/src/modules/weapons

Files:

• munitions/CMakeLists.txt (modified) (1 diff)
• munitions/FlameMunition.cc (added)
• munitions/FlameMunition.h (added)
• munitions/LaserMunition.cc (modified) (1 diff)
• projectiles/BasicProjectile.cc (modified) (2 diffs)
• projectiles/BasicProjectile.h (modified) (2 diffs)
• projectiles/CMakeLists.txt (modified) (1 diff)
• projectiles/FlameGunProjectile.cc (added)
• projectiles/FlameGunProjectile.h (added)
• projectiles/LightningGunProjectile.cc (modified) (1 diff)
• projectiles/ParticleProjectile.cc (modified) (2 diffs)
• projectiles/ParticleProjectile.h (modified) (2 diffs)
• projectiles/Projectile.cc (modified) (1 diff)
• projectiles/SplitGunProjectile.cc (modified) (2 diffs)
• projectiles/SplitGunProjectile.h (modified) (5 diffs)
• weaponmodes/CMakeLists.txt (modified) (1 diff)
• weaponmodes/EnergyDrink.cc (modified) (3 diffs)
• weaponmodes/EnergyDrink.h (modified) (2 diffs)
• weaponmodes/FlameGun.cc (added)
• weaponmodes/FlameGun.h (added)
• weaponmodes/FusionFire.cc (modified) (1 diff)
• weaponmodes/GravityBombFire.cc (modified) (1 diff)
• weaponmodes/HsW01.cc (modified) (2 diffs)
• weaponmodes/IceGun.cc (modified) (1 diff)
• weaponmodes/LaserFire.cc (modified) (3 diffs)
• weaponmodes/LightningGun.cc (modified) (1 diff)
• weaponmodes/MineGun.cc (modified) (1 diff)
• weaponmodes/SimpleRocketFire.cc (modified) (1 diff)
• weaponmodes/SplitGun.cc (modified) (1 diff)

code/trunk/src/modules/weapons/munitions/CMakeLists.txt

@@ -6 +6 @@
   GravityBombMunition.cc
   IceMunition.cc
+  FlameMunition.cc
   SplitMunition.cc
   MineMunition.cc

code/trunk/src/modules/weapons/munitions/LaserMunition.cc

@@ -55 +55 @@
         this->replenishAmount_ = 1;
 
-        this->reloadTime_ = 0.5f;
+        this->reloadTime_ = 0.6f;
     }
 }

code/trunk/src/modules/weapons/projectiles/BasicProjectile.cc

@@ -54 +54 @@
         this->bDestroy_ = false;
 
+        // Default is destroying the projectile after collision
+        this->destroyAfterCollision_ = true;
+
         // Default damage must be zero, otherwise it would be above zero if no settings are made in the weaponsettings xml file.
         // same thing for all weaponmodes files
@@ -87 +90 @@
                 return false;
 
-            this->bDestroy_ = true; // If something is hit, the object is destroyed and can't hit something else.
-                                    // The projectile is destroyed by its tick()-function (in the following tick).
+            if (getDestroyAfterCollision())
+            {
+                this->bDestroy_ = true; // If something is hit, the object is destroyed and can't hit something else.
+                                        // The projectile is destroyed by its tick()-function (in the following tick).
+                                        // TODO: Use destroyLater() for this
+            }
 
             Pawn* victim = orxonox_cast<Pawn*>(otherObject); // If otherObject isn't a Pawn, then victim is nullptr

code/trunk/src/modules/weapons/projectiles/BasicProjectile.h

@@ -119 +119 @@
             bool processCollision(WorldEntity* otherObject, btManifoldPoint& contactPoint, const btCollisionShape* cs);
             void destroyCheck(void);
+            inline void setDestroyAfterCollision(bool destroyAfterCollision)
+                { destroyAfterCollision_ = destroyAfterCollision; }
+            inline bool getDestroyAfterCollision() const
+                { return destroyAfterCollision_; }
 
         private:
@@ -130 +134 @@
 
             bool bDestroy_; //!< Boolean, to check whether a projectile should be destroyed.
+            bool destroyAfterCollision_; //!< Boolean, defines whether the projectile gets detroyed after a collision.
     };
 }

code/trunk/src/modules/weapons/projectiles/CMakeLists.txt

@@ -7 +7 @@
   SplitGunProjectile.cc
   IceGunProjectile.cc
+  FlameGunProjectile.cc
   Rocket.cc
   RocketOld.cc

code/trunk/src/modules/weapons/projectiles/LightningGunProjectile.cc

@@ -47 +47 @@
 
         this->textureIndex_ = 1;
-        this->setMass(2);
+        this->setMass(0.1f);
         this->setCollisionType(CollisionType::Dynamic);
         this->maxTextureIndex_ = 8;

code/trunk/src/modules/weapons/projectiles/ParticleProjectile.cc

@@ -43 +43 @@
     RegisterClass(ParticleProjectile);
 
-    ParticleProjectile::ParticleProjectile(Context* context) : BillboardProjectile(context)
+    ParticleProjectile::ParticleProjectile(Context* context) : Projectile(context)
     {
         RegisterObject(ParticleProjectile);
 
-        if (GameMode::showsGraphics())
-        {
-            // Create the particles.
-            this->particles_ = new ParticleInterface(this->getScene()->getSceneManager(), "Orxonox/shot3_small", LODParticle::Normal);
-            this->attachOgreObject(this->particles_->getParticleSystem());
-            this->particles_->setKeepParticlesInLocalSpace(0);
+        this->particles_ = nullptr;
 
-            for (unsigned int i = 0; i < this->particles_->getNumEmitters(); ++i)
-                this->particles_->getEmitter(i)->setDirection(-WorldEntity::FRONT);
-        }
-        else
-            this->particles_ = nullptr;
+        //setEffect("Orxonox/sparks2");
     }
 
@@ -82 +73 @@
             this->particles_->setEnabled(this->isVisible());
     }
+
+    void ParticleProjectile::setEffect(const std::string& effect)
+    {
+        // If we already have a particle interface, delete it
+        if (this->particles_)
+        {
+            this->detachOgreObject(this->particles_->getParticleSystem());
+            delete this->particles_;
+            this->particles_ = nullptr;
+        }
+
+        if (GameMode::showsGraphics())
+        {
+            // Create the particles.
+            this->particles_ = new ParticleInterface(this->getScene()->getSceneManager(), effect, LODParticle::Normal);
+            this->attachOgreObject(this->particles_->getParticleSystem());
+            this->particles_->setKeepParticlesInLocalSpace(0);
+
+            for (unsigned int i = 0; i < this->particles_->getNumEmitters(); ++i)
+                this->particles_->getEmitter(i)->setDirection(-WorldEntity::FRONT);
+        }
+        else
+        {
+            this->particles_ = nullptr;
+        }
+    }
 }

code/trunk/src/modules/weapons/projectiles/ParticleProjectile.h

@@ -48 +48 @@
     @ingroup WeaponsProjectiles
     */
-    class _WeaponsExport ParticleProjectile : public BillboardProjectile
+    class _WeaponsExport ParticleProjectile : public Projectile
     {
         public:
@@ -54 +54 @@
             virtual ~ParticleProjectile();
             virtual void changedVisibility() override;
+            virtual void setEffect(const std::string& effect);
 
         private:

code/trunk/src/modules/weapons/projectiles/Projectile.cc

@@ -54 +54 @@
         if (GameMode::isMaster())
         {
-            this->setMass(1.0f);
+            this->setMass(0.1f);
             this->enableCollisionCallback();
             this->setCollisionResponse(false);

code/trunk/src/modules/weapons/projectiles/SplitGunProjectile.cc

@@ -52 +52 @@
         this->spread_ = 0.2f;
         this->damageReduction_ = 1.0f;
+        this->splitSound_ = nullptr;
+
+        this->setSplitSound("sounds/Weapon_SplitGun.ogg", 0.8);
+    }
+
+    SplitGunProjectile::~SplitGunProjectile()
+    {
+        if (this->isInitialized())
+        {
+            if (splitSound_)
+            {
+                splitSound_->destroy();
+            }
+        }
     }
 
@@ -158 +172 @@
 
             numberOfSplits_ = 0;
+
+            if (splitSound_)
+            {
+                splitSound_->play();
+            }
         }
     }
+
+    void SplitGunProjectile::setSplitSound(const std::string& soundPath, const float soundVolume)
+    {
+        if (!splitSound_)
+        {
+            this->splitSound_ = new WorldSound(this->getContext());
+            this->splitSound_->setLooping(false);
+            this->attach(splitSound_);
+        }
+
+        this->splitSound_->setSource(soundPath);
+        this->splitSound_->setVolume(soundVolume);
+    }
 }

code/trunk/src/modules/weapons/projectiles/SplitGunProjectile.h

@@ -28 +28 @@
 
 /**
-    @file IceGunProjectile.h
+    @file SplitGunProjectile.h
     @brief Definition of the SplitGunProjectile class.
 */
@@ -40 +40 @@
 #include "tools/Timer.h"
 #include "BillboardProjectile.h"
+#include "sound/WorldSound.h"
 
 namespace orxonox
@@ -55 +56 @@
         public:
             SplitGunProjectile(Context* context);
-            virtual ~SplitGunProjectile() {}
+            virtual ~SplitGunProjectile();
 
             virtual void setNumberOfSplits(int numberOfSplits);
@@ -62 +63 @@
             virtual void setSpread(float spread);
             virtual void setDamageReduction(float damageReduction);
+            virtual void setSplitSound(const std::string& soundPath, const float soundVolume = 1.0);
 
         private:            
@@ -70 +72 @@
             float damageReduction_; //The damage of a child projectile is reduced by this factor
             Timer splitTimer_;
+            WorldSound* splitSound_; //Sound played if the projectile splits
 
             virtual void split();            

code/trunk/src/modules/weapons/weaponmodes/CMakeLists.txt

@@ -7 +7 @@
   SplitGun.cc
   IceGun.cc
+  FlameGun.cc
   RocketFire.cc
   RocketFireOld.cc

code/trunk/src/modules/weapons/weaponmodes/EnergyDrink.cc

@@ -59 +59 @@
         this->speed_ = 750.0f;
         this->delay_ = 0.0f;
+        this->timerStarted_ = false;
         this->setMunitionName("FusionMunition");
+        this->setFireSound("sounds/Weapon_EnergyDrink.ogg");
 
         this->delayTimer_.setTimer(1.0f, false, createExecutor(createFunctor(&EnergyDrink::shot, this)));
@@ -93 +95 @@
     void EnergyDrink::fire()
     {
-        this->delayTimer_.startTimer();
+        if (!timerStarted_)
+        {
+            this->delayTimer_.startTimer();
+            this->timerStarted_ = true;
+        }
+    }
+
+    bool EnergyDrink::fire(float* reloadTime)
+    {
+        if (!timerStarted_)
+        {
+            return WeaponMode::fire(reloadTime);
+        }
+
+        return false;
     }
 
@@ -102 +118 @@
     void EnergyDrink::shot()
     {
+        this->timerStarted_ = false;
+
         // Create the projectile
         Projectile* projectile = new Projectile(this->getContext());

code/trunk/src/modules/weapons/weaponmodes/EnergyDrink.h

@@ -57 +57 @@
             virtual ~EnergyDrink() {}
 
+            virtual bool fire(float* reloadTime) override;
             virtual void fire() override;
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
@@ -89 +90 @@
             float delay_; //!< The firing delay.
             Timer delayTimer_; //!< The timer to delay the firing.
+            bool timerStarted_;
     };
 }

code/trunk/src/modules/weapons/weaponmodes/FusionFire.cc

@@ -58 +58 @@
 
         this->setMunitionName("FusionMunition");
+        this->setFireSound("sounds/Weapon_FusionFire.ogg");
 
         hudImageString_ = "Orxonox/WSHUD_WM_FusionFire";

code/trunk/src/modules/weapons/weaponmodes/GravityBombFire.cc

@@ -30 +30 @@
 
         this->setMunitionName("GravityBombMunition");
-        this->setDefaultSoundWithVolume("sounds/Rocket_launch.ogg",0.8);    ///< sets sound of the bomb as it is fired.
+        this->setFireSound("sounds/Rocket_launch.ogg",0.8);    ///< sets sound of the bomb as it is fired.
 
         hudImageString_ = "Orxonox/WSHUD_WM_GravityBombFire";

code/trunk/src/modules/weapons/weaponmodes/HsW01.cc

@@ -62 +62 @@
         this->setMunitionName("LaserMunition");
         this->mesh_ = "laserbeam.mesh";
-        this->sound_ = "sounds/Weapon_HsW01.ogg";
 
 
@@ -68 +67 @@
         this->delayTimer_.stopTimer();
 
-        this->setDefaultSound(this->sound_);
+        this->setFireSound("sounds/Weapon_HsW01.ogg");
+        this->setReloadSound("sounds/Reload_HsW01.ogg", 0.5);
 
         hudImageString_ = "Orxonox/WSHUD_WM_HsW01";

code/trunk/src/modules/weapons/weaponmodes/IceGun.cc

@@ -60 +60 @@
 
         this->setMunitionName("IceMunition");
-        this->setDefaultSound("sounds/Weapon_LightningGun.ogg");
+        this->setFireSound("sounds/Weapon_LightningGun.ogg");
+        this->setReloadSound("sounds/Reload_IceGun.ogg", 0.4);
 
         hudImageString_ = "Orxonox/WSHUD_WM_IceGun";

code/trunk/src/modules/weapons/weaponmodes/LaserFire.cc

@@ -41 +41 @@
 #include "worldentities/pawns/Pawn.h"
 
-#include "weapons/projectiles/ParticleProjectile.h"
+#include "weapons/projectiles/BillboardProjectile.h"
 
 namespace orxonox
@@ -56 +56 @@
 
         this->setMunitionName("LaserMunition");
+        this->setFireSound("sounds/Weapon_LaserFire.ogg");
+        this->setReloadSound("sounds/Reload_LaserFire.ogg", 0.8);
 
         hudImageString_ = "Orxonox/WSHUD_WM_LaserFire";
@@ -66 +68 @@
     void LaserFire::fire()
     {
-        ParticleProjectile* projectile = new ParticleProjectile(this->getContext());
+        BillboardProjectile* projectile = new BillboardProjectile(this->getContext());
 
         this->computeMuzzleParameters(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getAimPosition());

code/trunk/src/modules/weapons/weaponmodes/LightningGun.cc

@@ -55 +55 @@
 
         this->setMunitionName("LightningMunition");
-        this->setDefaultSound("sounds/Weapon_LightningGun.ogg");
+        this->setFireSound("sounds/Weapon_LightningGun.ogg");
 
         hudImageString_ = "Orxonox/WSHUD_WM_LightningGun";

code/trunk/src/modules/weapons/weaponmodes/MineGun.cc

@@ -57 +57 @@
 
         this->setMunitionName("MineMunition");
-        this->setDefaultSound("sounds/mineactivate.ogg");
+        this->setFireSound("sounds/mineactivate.ogg");
 
         hudImageString_ = "Orxonox/WSHUD_WM_MineGun";

code/trunk/src/modules/weapons/weaponmodes/SimpleRocketFire.cc

@@ -62 +62 @@
 
         this->setMunitionName("RocketMunition");
-        this->setDefaultSoundWithVolume("sounds/Rocket_launch.ogg",0.4f);
+        this->setFireSound("sounds/Rocket_launch.ogg",0.4f);
         // The firing sound of the Rocket is played in Rocket.cc (because of OpenAl sound positioning)
 

code/trunk/src/modules/weapons/weaponmodes/SplitGun.cc

@@ -61 +61 @@
 
         this->setMunitionName("SplitMunition");
-        this->setDefaultSound("sounds/Weapon_LightningGun.ogg");
+        this->setFireSound("sounds/Weapon_SplitGun.ogg", 0.5);
+        this->setReloadSound("sounds/Reload_SplitGun.ogg", 0.8);
 
         hudImageString_ = "Orxonox/WSHUD_WM_SplitGun";