Changeset 7920 for code

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

Files:

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

code/branches/hudimprovements/data/overlays/HUDTemplates3.oxo

@@ -35 +35 @@
      background        = "Orxonox/HealthBarBackground"
      size              = "0.35, 0.0875"
-     position          = "0.0 , 0.95 "
+     position          = "0.0 , 0.9 "
      pickpoint         = "0, 1"
      bartexture        = "healthbar_bar.png"
@@ -56 +56 @@
      background    = "Orxonox/BarBackground"
      size          = "0.35, 0.05"
-     position      = "0.0 , 1.0 "
+     position      = "0.0 , 0.95 "
      pickpoint     = "0, 1"
      correctaspect = false
@@ -64 +64 @@
       <BarColour position = 1.0 colour = "0.7,0.2,0.2" />
     </HUDSpeedBar>
+
+    <HUDBoostBar
+     name          = "BoostBar1"
+     background    = "Orxonox/BarBackground"
+     size          = "0.35, 0.05"
+     position      = "0.0 , 1.0 "
+     pickpoint     = "0, 1"
+     correctaspect = false
+    >
+      <BarColour position = 0.0 colour = "0.7,0.2,0.2" />
+      <BarColour position = 0.5 colour = "0.7,0.7,0.2" />
+      <BarColour position = 1.0 colour = "0.2,0.7,0.2" />
+    </HUDBoostBar>
 
     <HUDNavigation

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);