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

Timestamp:

Jun 8, 2008, 5:46:52 AM (16 years ago)

Author:

landauf

Message:

• several small changes in most of the HUD classes (code cleanup): removed obsolete variables, privatized all member variables, removed resizing functioncalls from tick, destroying overlayelements, added some const qualifiers.
• moved calculation functions for RadarObject-position to Math.h and changed the phi/right/radius format to Vector2. the functions are used too by SpaceShipAI.
• cycleNavigationFocus takes the nearest object if focus was NULL
• BarOverlayElement works in both directions (left to right and right to left)
• fixed bug causing SpaceShipAI to not stop shooting when losing target - this also speeds up orxonox a lot, because there are less projectiles

####################################

!! UPDATE YOUR MEDIA REPOSITORY !!

####################################
…or the BarOverlayElement will look strange

File:

• code/trunk/src/orxonox/hud/BarOverlayElement.h (modified) (1 diff)

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

@@ -39 +39 @@
   class _OrxonoxExport BarOverlayElement : public Ogre::PanelOverlayElement
   {
+    public:
+      BarOverlayElement(const Ogre::String& name);
+      virtual ~BarOverlayElement();
+
+      void init(Real leftRel, Real topRel, Real dimRel, Ogre::OverlayContainer* container);
+      void resize();
+      void setValue(float value);
+      void setColour(int colour);
+
+      inline void setRightToLeft(bool r2l)
+        { this->right2Left_ = r2l; }
+      inline bool getRightToLeft() const
+        { return this->right2Left_; }
+      inline float getValue() const
+        { return this->value_; }
+      inline int getBarColour() const
+        { return this->colour_; }
+
     private:
-      bool autoColor_;                    // whether bar changes color automatically
+      static const int RED = 0;           // predefined colours
+      static const int YELLOW = 1;
+      static const int GREEN = 2;
+
+      bool right2Left_;
+      bool autoColour_;                   // whether bar changes colour automatically
       float value_;                       // progress of bar
-      int color_;
+      int colour_;
       int left_;
       int top_;
       int width_;
       int height_;
-      int windowW_, windowH_;
+      float widthratio_;
+      int offset_;
+      int barwidth_;
       Ogre::Real leftRel_;
       Ogre::Real topRel_;
       Ogre::Real dimRel_;
-      Ogre::OverlayManager* om;           // our overlay manager
-      Ogre::OverlayContainer* container_; // our parent container to attach to
       Ogre::OverlayContainer* background_;
       Ogre::String name_;
-
-    public:
-      bool left2Right;
-      static const int RED = 0;           // predefined colors
-      static const int YELLOW = 1;
-      static const int GREEN = 2;
-
-      BarOverlayElement(const Ogre::String& name);
-      virtual ~BarOverlayElement();
-      void init(Real leftRel, Real topRel, Real dimRel, Ogre::OverlayContainer* container);
-      void resize();
-      void setValue(float value);
-      void setColor(int color);
-      float getValue();
-      int getBarColor();
     };
 }