Changeset 7932 for code/branches/hudimprovements/src/modules

Timestamp:

Feb 20, 2011, 4:53:43 PM (14 years ago)

Author:

bknecht

Message:

The boost bar is now flashing red when the boost is cooling down. However the solution in OrxonoxOverlay is a bit questionable and could probably be solved less hacky…

Location:

code/branches/hudimprovements/src/modules/overlays/hud

Files:

• HUDBar.cc (modified) (1 diff)
• HUDBar.h (modified) (1 diff)
• HUDBoostBar.cc (modified) (2 diffs)
• HUDBoostBar.h (modified) (1 diff)

code/branches/hudimprovements/src/modules/overlays/hud/HUDBar.cc

@@ -26 +26 @@
  *      Fabian 'x3n' Landau
  *      Reto Grieder
+ *      Benjamin Knecht
  *
  */

code/branches/hudimprovements/src/modules/overlays/hud/HUDBar.h

@@ -26 +26 @@
  *      Fabian 'x3n' Landau
  *      Reto Grieder
+ *      Benjamin Knecht
  *
  */

code/branches/hudimprovements/src/modules/overlays/hud/HUDBoostBar.cc

@@ -43 +43 @@
 
         this->owner_ = 0;
+        this->flashInterval_ = 0.25f;
+        this->flashDt_ = 0.0f;
     }
 
@@ -55 +57 @@
         if (this->owner_)
         {
-            this->show();
+            if (this->owner_->isBoostCoolingDown())
+            {
+                this->setBackgroundColour(ColourValue(0.7f, 0.2f, 0.2f));
+                if (this->flashDt_ <= 0.0f)
+                {
+                    this->flashDt_ = this->flashInterval_;
+                    this->setVisible(!this->isVisible());
+                }
+                else
+                    this->flashDt_ -= dt;
+            }
+            else
+            {
+                this->flashDt_ = 0.0f;
+                this->show();
+                this->setBackgroundColour(ColourValue(0.2f, 0.7f, 0.2f));
+            }
+
             float value = this->owner_->getBoostPower() / this->owner_->getInitialBoostPower();
             this->setValue(value);

code/branches/hudimprovements/src/modules/overlays/hud/HUDBoostBar.h

@@ -47 +47 @@
 
     private:
-        SpaceShip* owner_;
+        SpaceShip*  owner_;
+        float       flashInterval_;
+        float       flashDt_;
     };
 }