Changeset 10688 for code/branches/fabienHS15/src/modules/weapons/weaponmodes

Timestamp:

Oct 24, 2015, 10:51:18 PM (9 years ago)

Author:

fvultier

Message:

There is now a HUD that shows the status of the weapon system: all weapons, weapon modes and their munition. Progress bars show the progress of replenishing munition.

Location:

code/branches/fabienHS15/src/modules/weapons/weaponmodes

Files:

• EnergyDrink.cc (modified) (1 diff)
• FusionFire.cc (modified) (1 diff)
• GravityBombFire.cc (modified) (1 diff)
• HsW01.cc (modified) (1 diff)
• IceGun.cc (modified) (1 diff)
• LaserFire.cc (modified) (1 diff)
• LightningGun.cc (modified) (1 diff)
• RocketFire.cc (modified) (1 diff)
• RocketFireOld.cc (modified) (1 diff)
• SimpleRocketFire.cc (modified) (2 diffs)
• SplitGun.cc (modified) (1 diff)

code/branches/fabienHS15/src/modules/weapons/weaponmodes/EnergyDrink.cc

@@ -63 +63 @@
         this->delayTimer_.setTimer(1.0f, false, createExecutor(createFunctor(&EnergyDrink::shot, this)));
         this->delayTimer_.stopTimer();
+
+        hudImageString_ = "Orxonox/WSHUD_WM_EnergyDrink";
     }
 

code/branches/fabienHS15/src/modules/weapons/weaponmodes/FusionFire.cc

@@ -58 +58 @@
 
         this->setMunitionName("FusionMunition");
+
+        hudImageString_ = "Orxonox/WSHUD_WM_FusionFire";
     }
 

code/branches/fabienHS15/src/modules/weapons/weaponmodes/GravityBombFire.cc

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

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

@@ -69 +69 @@
 
         this->setDefaultSound(this->sound_);
+
+        hudImageString_ = "Orxonox/WSHUD_WM_HsW01";
     }
 

code/branches/fabienHS15/src/modules/weapons/weaponmodes/IceGun.cc

@@ -59 +59 @@
         this->setFreezeFactor(0.5);
 
-        this->setMunitionName("LaserMunition");
+        this->setMunitionName("IceMunition");
         this->setDefaultSound("sounds/Weapon_LightningGun.ogg");
+
+        hudImageString_ = "Orxonox/WSHUD_WM_IceGun";
     }
 

code/branches/fabienHS15/src/modules/weapons/weaponmodes/LaserFire.cc

@@ -56 +56 @@
 
         this->setMunitionName("LaserMunition");
+
+        hudImageString_ = "Orxonox/WSHUD_WM_LaserFire";
     }
 

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

@@ -54 +54 @@
         this->speed_ = 750.0f;
 
-        this->setMunitionName("LaserMunition");
+        this->setMunitionName("LightningMunition");
         this->setDefaultSound("sounds/Weapon_LightningGun.ogg");
+
+        hudImageString_ = "Orxonox/WSHUD_WM_LightningGun";
     }
 

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

@@ -59 +59 @@
         this->setMunitionName("RocketMunition");
         // The firing sound of the Rocket is played in Rocket.cc (because of OpenAl sound positioning)
+
+        hudImageString_ = "Orxonox/WSHUD_WM_RocketFire";
     }
 

code/branches/fabienHS15/src/modules/weapons/weaponmodes/RocketFireOld.cc

@@ -59 +59 @@
         this->setMunitionName("RocketMunition");
         // The firing sound of the Rocket is played in Rocket.cc (because of OpenAl sound positioning)
+
+        hudImageString_ = "Orxonox/WSHUD_WM_SimpleRocketFire";
     }
 

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

@@ -64 +64 @@
         this->setDefaultSoundWithVolume("sounds/Rocket_launch.ogg",0.4f);
         // The firing sound of the Rocket is played in Rocket.cc (because of OpenAl sound positioning)
+
+        hudImageString_ = "Orxonox/WSHUD_WM_SimpleRocketFire";
     }
 
@@ -89 +91 @@
 
         WorldEntity* pawn = static_cast<ControllableEntity*>(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn())->getTarget();
-        if (pawn) controller->setTarget(pawn);
+        if (pawn)
+            controller->setTarget(pawn);
     }
 }

code/branches/fabienHS15/src/modules/weapons/weaponmodes/SplitGun.cc

@@ -62 +62 @@
         this->setMunitionName("SplitMunition");
         this->setDefaultSound("sounds/Weapon_LightningGun.ogg");
+
+        hudImageString_ = "Orxonox/WSHUD_WM_SplitGun";
     }