Changeset 1568 for code/trunk/src/orxonox/hud/BarOverlayElement.h

Timestamp:

Jun 8, 2008, 11:34:55 PM (16 years ago)

Author:

landauf

Message:

• BarOverlayElement interpolates between given colours
• Tried to fix a bug when releasing navigation focus

File:

• code/trunk/src/orxonox/hud/BarOverlayElement.h (modified) (5 diffs)

code/trunk/src/orxonox/hud/BarOverlayElement.h

@@ -24 +24 @@
  *   Co-authors:
  *      Felix Schulthess
+ *      Fabian 'x3n' Landau
  *
  */
@@ -32 +33 @@
 #include "OrxonoxPrereqs.h"
 
+#include <map>
+
 #include <OgrePrerequisites.h>
 #include <OgrePanelOverlayElement.h>
+
+#include "util/Math.h"
 
 namespace orxonox
@@ -46 +51 @@
       void resize();
       void setValue(float value);
-      void setColour(int colour);
+      void addColour(float value, const ColourValue& colour);
+      void clearColours();
 
       inline void setRightToLeft(bool r2l)
@@ -54 +60 @@
       inline float getValue() const
         { return this->value_; }
-      inline int getBarColour() const
-        { return this->colour_; }
 
     private:
-      static const int RED = 0;           // predefined colours
-      static const int YELLOW = 1;
-      static const int GREEN = 2;
-
+      static unsigned int materialcount_s;
       bool right2Left_;
       bool autoColour_;                   // whether bar changes colour automatically
       float value_;                       // progress of bar
-      int colour_;
       int left_;
       int top_;
@@ -78 +78 @@
       Ogre::OverlayContainer* background_;
       Ogre::String name_;
+      Ogre::TextureUnitState* textureUnitState_;
+      std::map<float, ColourValue> colours_;
     };
 }