Changeset 1615 for code/branches/hud/src/orxonox/overlays/hud/HUDBar.h

Timestamp:

Jun 22, 2008, 12:06:55 AM (16 years ago)

Author:

rgrieder

Message:

• added blankString to String so you can return ""; even if it's a const std::string&
• fixed several bugs with aspect correct and margin alignment
• added console commands for OrxonoxOverlays and OverlayGroups for rotate, scale and scroll (you can access the by name (from name=.. in xml file), e.g. "OrxonoxOverlay rotateOverlay SpeedBar 90)
• converted everything in overlays/ to 4 spaces/tab
• removed all using namespace Ogre;
• added background_ Panel to OrxonoxOverlay, since most of the derived classes can use that
• should work now, but I'll have to test on a tardis box first

File:

• code/branches/hud/src/orxonox/overlays/hud/HUDBar.h (modified) (1 diff)

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

@@ -41 +41 @@
 namespace orxonox
 {
-  class _OrxonoxExport HUDBar : public OrxonoxOverlay
-  {
+    class _OrxonoxExport HUDBar : public OrxonoxOverlay
+    {
     public:
-      HUDBar();
-      virtual ~HUDBar();
+        HUDBar();
+        virtual ~HUDBar();
 
-      virtual void XMLPort(Element& xmlElement, XMLPort::Mode mode);
+        virtual void XMLPort(Element& xmlElement, XMLPort::Mode mode);
 
-      void setValue(float value);
-      void addColour(float value, const ColourValue& colour);
-      void clearColours();
+        virtual void setValue(float value);
+        void addColour(float value, const ColourValue& colour);
+        void clearColours();
 
-      inline void setRightToLeft(bool r2l)
+        inline void setRightToLeft(bool r2l)
         { this->right2Left_ = r2l; }
-      inline bool getRightToLeft() const
+        inline bool getRightToLeft() const
         { return this->right2Left_; }
-      inline float getValue() const
+        inline float getValue() const
         { return this->value_; }
 
     private:
-      static unsigned int materialcount_s;
-      bool right2Left_;
-      bool autoColour_;                   // whether bar changes colour automatically
-      float value_;                       // progress of bar
-      Ogre::PanelOverlayElement* bar_;
-      Ogre::TextureUnitState* textureUnitState_;
-      std::map<float, ColourValue> colours_;
+        bool right2Left_;
+        bool autoColour_;                   //!< whether bar changes colour automatically
+        float value_;                       //!< progress of bar
 
-      float barWidth_s;
-      float barHeight_s;
-      float barOffsetLeft_s;
-      float barOffsetTop_s;
+        Ogre::PanelOverlayElement* bar_;
+        Ogre::TextureUnitState* textureUnitState_;
+        std::map<float, ColourValue> colours_;
+
+        float barWidth_s;
+        float barHeight_s;
+        float barOffsetLeft_s;
+        float barOffsetTop_s;
+
+        static unsigned int materialcount_s;
     };
 }