Changeset 7920 for code/branches/hudimprovements/src

Timestamp:

Feb 20, 2011, 12:33:06 AM (14 years ago)

Author:

bknecht

Message:

added HUDBoostBar, an additional bar in the HUD to determine available boost. The bar is invisible when we have permanent boost.

Location:

code/branches/hudimprovements/src

Files:

• modules/overlays/OverlaysPrereqs.h (modified) (1 diff)
• modules/overlays/hud/CMakeLists.txt (modified) (1 diff)
• modules/overlays/hud/HUDBoostBar.cc (added)
• modules/overlays/hud/HUDBoostBar.h (added)
• orxonox/worldentities/pawns/SpaceShip.h (modified) (2 diffs)

code/branches/hudimprovements/src/modules/overlays/OverlaysPrereqs.h

@@ -86 +86 @@
     class HUDRadar;
     class HUDSpeedBar;
+    class HUDBoostBar;
     class HUDTimer;
     class KillMessage;

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

@@ -4 +4 @@
   HUDRadar.cc
   HUDSpeedBar.cc
+  HUDBoostBar.cc
   HUDHealthBar.cc
   HUDTimer.cc

code/branches/hudimprovements/src/orxonox/worldentities/pawns/SpaceShip.h

@@ -74 +74 @@
                 { return this->bBoost_; }
 
+            inline float getBoostPower()
+                { return this->boostPower_; }
+            inline float getInitialBoostPower()
+                { return this->initialBoostPower_; }
+
             inline void setEngineTemplate(const std::string& temp)
                 { this->enginetemplate_ = temp; this->loadEngineTemplate(); }
@@ -108 +113 @@
 
             void loadEngineTemplate();
-            
+
             void boostCooledDown(void);