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

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

Files:

• overlays/hud/CMakeLists.txt (modified) (1 diff)
• overlays/hud/HUDWeapon.cc (added)
• overlays/hud/HUDWeapon.h (added)
• overlays/hud/HUDWeaponMode.cc (added)
• overlays/hud/HUDWeaponMode.h (added)
• overlays/hud/HUDWeaponSystem.cc (added)
• overlays/hud/HUDWeaponSystem.h (added)
• weapons/munitions/CMakeLists.txt (modified) (1 diff)
• weapons/munitions/FusionMunition.cc (modified) (2 diffs)
• weapons/munitions/GravityBombMunition.cc (modified) (1 diff)
• weapons/munitions/IceMunition.cc (modified) (2 diffs)
• weapons/munitions/LaserMunition.cc (modified) (3 diffs)
• weapons/munitions/LaserMunition.h (modified) (1 diff)
• weapons/munitions/LightningMunition.cc (added)
• weapons/munitions/LightningMunition.h (added)
• weapons/munitions/ReplenishingMunition.cc (deleted)
• weapons/munitions/ReplenishingMunition.h (deleted)
• weapons/munitions/RocketMunition.cc (modified) (2 diffs)
• weapons/munitions/SplitMunition.cc (modified) (2 diffs)
• weapons/projectiles/GravityBombField.cc (modified) (1 diff)
• weapons/weaponmodes/EnergyDrink.cc (modified) (1 diff)
• weapons/weaponmodes/FusionFire.cc (modified) (1 diff)
• weapons/weaponmodes/GravityBombFire.cc (modified) (1 diff)
• weapons/weaponmodes/HsW01.cc (modified) (1 diff)
• weapons/weaponmodes/IceGun.cc (modified) (1 diff)
• weapons/weaponmodes/LaserFire.cc (modified) (1 diff)
• weapons/weaponmodes/LightningGun.cc (modified) (1 diff)
• weapons/weaponmodes/RocketFire.cc (modified) (1 diff)
• weapons/weaponmodes/RocketFireOld.cc (modified) (1 diff)
• weapons/weaponmodes/SimpleRocketFire.cc (modified) (2 diffs)
• weapons/weaponmodes/SplitGun.cc (modified) (1 diff)

code/branches/fabienHS15/src/modules/overlays/hud/CMakeLists.txt

@@ -8 +8 @@
   HUDTimer.cc
   HUDEnemyHealthBar.cc
+  HUDWeaponMode.cc
+  HUDWeapon.cc
+  HUDWeaponSystem.cc
   ChatOverlay.cc
   AnnounceMessage.cc

code/branches/fabienHS15/src/modules/weapons/munitions/CMakeLists.txt

@@ -1 +1 @@
 ADD_SOURCE_FILES(WEAPONS_SRC_FILES
-  ReplenishingMunition.cc
   LaserMunition.cc
+  LightningMunition.cc
   FusionMunition.cc
   RocketMunition.cc

code/branches/fabienHS15/src/modules/weapons/munitions/FusionMunition.cc

@@ -28 +28 @@
 
 /**
-    @file FusionMunition.h
+    @file FusionMunition.cc
     @brief Implementation of the FusionMunition class.
 */
@@ -47 +47 @@
         this->magazines_ = 10;
 
-        this->bUseSeparateMagazines_ = true;
-        this->bStackMunition_ = false;
+        this->deployment_ = DEPLOYMENT_SEPARATE;
+
         this->reloadTime_ = 1.0f;
 
         this->bAllowMunitionRefilling_ = true;
         this->bAllowMultiMunitionRemovementUnderflow_ = true;
+
+        this->reloadTime_ = 0.5f;
     }
 }

code/branches/fabienHS15/src/modules/weapons/munitions/GravityBombMunition.cc

@@ -19 +19 @@
         this->magazines_ = 15;
 
-        this->bUseSeparateMagazines_ = false;
-        this->bStackMunition_ = true;
+        this->deployment_ = DEPLOYMENT_STACK;
 
         this->bAllowMunitionRefilling_ = true;
         this->bAllowMultiMunitionRemovementUnderflow_ = false;
+
+        this->reloadTime_ = 0.0f;
     }
 

code/branches/fabienHS15/src/modules/weapons/munitions/IceMunition.cc

@@ -28 +28 @@
 
 /**
-    @file IceMunition.h
+    @file IceMunition.cc
     @brief Implementation of the IceMunition class.
 */
@@ -47 +47 @@
         this->magazines_ = 25;
 
-        this->bUseSeparateMagazines_ = false;
-        this->bStackMunition_ = true;
+        this->deployment_ = DEPLOYMENT_STACK;
 
         this->bAllowMunitionRefilling_ = false;
         this->bAllowMultiMunitionRemovementUnderflow_ = false;
+
+        this->reloadTime_ = 0.5f;
     }
 }

code/branches/fabienHS15/src/modules/weapons/munitions/LaserMunition.cc

@@ -28 +28 @@
 
 /**
-    @file LaserMunition.h
+    @file LaserMunition.cc
     @brief Implementation of the LaserMunition class.
 */
@@ -43 +43 @@
         RegisterObject(LaserMunition);
 
-        this->maxMunitionPerMagazine_ = 20;
-        this->maxMagazines_ = 1;
-        this->magazines_ = 1;
+        this->maxMunitionPerMagazine_ = 10;
+        this->maxMagazines_ = 10;
+        this->magazines_ = 10;
 
-        this->bUseSeparateMagazines_ = false;
-        this->bStackMunition_ = true;
+        this->deployment_ = DEPLOYMENT_SEPARATE;
 
         this->bAllowMunitionRefilling_ = true;
@@ -55 +54 @@
         this->replenishInterval_ = 0.5f;
         this->replenishMunitionAmount_ = 1;
+
+        this->reloadTime_ = 0.8f;
     }
 }

code/branches/fabienHS15/src/modules/weapons/munitions/LaserMunition.h

@@ -36 +36 @@
 
 #include "weapons/WeaponsPrereqs.h"
-#include "ReplenishingMunition.h"
+#include "weaponsystem/ReplenishingMunition.h"
 
 namespace orxonox

code/branches/fabienHS15/src/modules/weapons/munitions/RocketMunition.cc

@@ -28 +28 @@
 
 /**
-    @file RocketMunition.h
+    @file RocketMunition.cc
     @brief Implementation of the RocketMunition class.
 */
@@ -47 +47 @@
         this->magazines_ = 10;
 
-        this->bUseSeparateMagazines_ = false;
-        this->bStackMunition_ = true;
+        this->deployment_ = DEPLOYMENT_STACK;
 
         this->bAllowMunitionRefilling_ = false;
         this->bAllowMultiMunitionRemovementUnderflow_ = false;
+
+        this->reloadTime_ = 0.5f;
     }
 }

code/branches/fabienHS15/src/modules/weapons/munitions/SplitMunition.cc

@@ -28 +28 @@
 
 /**
-    @file SplitMunition.h
+    @file SplitMunition.cc
     @brief Implementation of the SplitMunition class.
 */
@@ -47 +47 @@
         this->magazines_ = 25;
 
-        this->bUseSeparateMagazines_ = false;
-        this->bStackMunition_ = true;
+        this->deployment_ = DEPLOYMENT_STACK;
 
         this->bAllowMunitionRefilling_ = true;
         this->bAllowMultiMunitionRemovementUnderflow_ = false;
+
+        this->reloadTime_ = 0.5f;
     }
 }

code/branches/fabienHS15/src/modules/weapons/projectiles/GravityBombField.cc

@@ -164 +164 @@
         if (lifetime_ <= -4)
         {
-            orxout(debug_output) << "Timeout. Destroying field." << endl;
             this->destroy();
         }

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