Changeset 1618 for code/branches/hud/src/orxonox/overlays/hud/HUDBar.cc

Timestamp:

Jun 22, 2008, 11:47:09 PM (16 years ago)

Author:

rgrieder

Message:

• moved colours of the SpeedBar to XML file
• enabled render window updating in inactive mode (under windows the render window didn't show anything if inactive)
• added row/column to ticpp error description (there are a lot more to do this, may modify the macro..)

File:

• code/branches/hud/src/orxonox/overlays/hud/HUDBar.cc (modified) (3 diffs)

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

@@ -43 +43 @@
 namespace orxonox
 {
+    CreateFactory(BarColour);
+
+    BarColour::BarColour()
+        : position_(0.0)
+    {
+        RegisterObject(BarColour);
+    }
+
+    void BarColour::XMLPort(Element& xmlElement, XMLPort::Mode mode)
+    {
+        BaseObject::XMLPort(xmlElement, mode);
+
+        XMLPortParam(BarColour, "colour", setColour, getColour, xmlElement, mode);
+        XMLPortParam(BarColour, "position", setPosition, getPosition, xmlElement, mode);
+    }
+
+
     unsigned int HUDBar::materialcount_s = 0;
 
@@ -87 +104 @@
             this->autoColour_ = true;
             this->right2Left_ = false; // default is left to right progress
-
-            this->addColour(0.7, ColourValue(0.2, 0.7, 0.2));
-            this->addColour(0.4, ColourValue(0.7, 0.5, 0.2));
-            this->addColour(0.1, ColourValue(0.7, 0.2, 0.2));
         }
 
         XMLPortParamLoadOnly(HUDBar, "value", setValue, xmlElement, mode);
+        XMLPortParam(HUDBar, "right2left", setRightToLeft, getRightToLeft, xmlElement, mode);
+        XMLPortObject(HUDBar, BarColour, "", addColour, getColour, xmlElement, mode, false, true);
     }
 
@@ -154 +169 @@
     }
 
-    void HUDBar::addColour(float value, const ColourValue& colour)
+    void HUDBar::addColour(BarColour* colour)
     {
-        value = clamp<float>(value, 0, 1);
-        this->colours_[value] = colour;
+        float value = clamp<float>(colour->getPosition(), 0.0, 1.0);
+        this->colours_[value] = colour->getColour();
+
+        this->barColours_.push_back(colour);
+    }
+
+    BarColour* HUDBar::getColour(unsigned int index)
+    {
+        if (index < this->barColours_.size())
+            return barColours_[index];
+        else
+            return 0;
     }