Changeset 1626 for code/trunk

Timestamp:

Jun 26, 2008, 4:05:31 PM (16 years ago)

Author:

rgrieder

Message:

fixed a bug with Bar loading. setValue wasn't called after setLeft2Right()

Location:

code/trunk/src/orxonox/overlays/hud

Files:

• HUDBar.cc (modified) (1 diff)
• HUDBar.h (modified) (1 diff)
• HUDSpeedBar.cc (modified) (1 diff)

code/trunk/src/orxonox/overlays/hud/HUDBar.cc

@@ -113 +113 @@
     void HUDBar::setValue(float value)
     {
-        if (value == this->value_)
-            return;
-
         this->value_ = clamp<float>(value, 0, 1);
         if (this->autoColour_ && this->textureUnitState_)

code/trunk/src/orxonox/overlays/hud/HUDBar.h

@@ -72 +72 @@
 
         inline void setRightToLeft(bool r2l)
-        { this->right2Left_ = r2l; }
+        { this->right2Left_ = r2l; this->setValue(this->value_); }
         inline bool getRightToLeft() const
         { return this->right2Left_; }

code/trunk/src/orxonox/overlays/hud/HUDSpeedBar.cc

@@ -53 +53 @@
         {
             float v = ship->getVelocity().length();
-            float vmax = ship->getMaxSpeed();
-            this->setValue(v/vmax);
+            float value = v / ship->getMaxSpeed();
+                        if (value != this->getValue())
+                this->setValue(value);
         }
     }