Changeset 1002 for code/branches/hud2/src/orxonox/hud/Bar.h

Timestamp:

Apr 8, 2008, 11:12:22 AM (17 years ago)

Author:

chaiy

Message:

BarFactory created, but doesn't work yet

File:

• code/branches/hud2/src/orxonox/hud/Bar.h (modified) (2 diffs)

code/branches/hud2/src/orxonox/hud/Bar.h

@@ -30 +30 @@
 #define _BAR_H__
 
+#include <string>
+#include <OgreColourValue.h>
+#include <OgreOverlayElement.h>
+#include <OgrePrerequisites.h>
 #include <string.h>
-#include <OgreOverlayElement.h>
-#include <OgreTextAreaOverlayElement.h>
-#include <OgrePrerequisites.h>
 #include "../OrxonoxPrereqs.h"
 
@@ -40 +41 @@
 namespace orxonox
 {
-  class _OrxonoxExport Bar
+  class Bar : public Ogre::OverlayElement
   {
   private:
-    int percentage_;
-    int dir_;   
-    int left_;
-    int top_;
-    int width_;
-    int height_;
+    float percentage_;
+    bool dir_;
+    Ogre::ColourValue color_;
+        
         
   public:
-    static const int LEFT = 0;
-    static const int UP = 1;
-    static const int RIGHT = 2;
-    static const int DOWN = 3;
 
-    static const int RED = 0;
-    static const int YELLOW = 1;
-    static const int GREEN = 2;
-
-    Ogre::OverlayElement* element;
-
-    Bar(Ogre::Real left, Ogre::Real top, Ogre::Real width, Ogre::Real height,
-        int dir, int colour, std::string name);
-    ~Bar(void);
-    void reset(int percentage);
-    void setColour(int colour);
-    void show();
-    void hide();
-    
-  };
+    Bar(const Ogre::String& name);
+//    virtual ~Bar();
 
 
-  class _OrxonoxExport SmartBar : public Bar
-  {
-  private:
 
-  public:
-    SmartBar(Ogre::Real left, Ogre::Real top, Ogre::Real width, Ogre::Real height,
-        int dir, std::string name);
-    ~SmartBar(void);
-    void reset(int percentage);
-  };
+
+/*    Bar(const Ogre::String& s);
+    ~Bar(void);
+    void setPercentage(float percentage);
+    void setColor(Ogre::ColourValue color);
+*/  };
 }