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

Timestamp:

Jun 8, 2008, 5:46:52 AM (17 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/HUD.h (modified) (2 diffs)

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

@@ -35 +35 @@
 #include <OgrePrerequisites.h>
 #include <OgreTextAreaOverlayElement.h>
-#include <OgreSceneNode.h>
 #include "objects/Tickable.h"
 #include "util/Math.h"
@@ -43 +42 @@
     class _OrxonoxExport HUD : public TickableReal
     {
-      private:
-        HUD();
-        HUD(HUD& instance);
-        ~HUD();
-        Ogre::OverlayManager* om;
-        Ogre::SceneManager* sm;
-        Ogre::Overlay* orxonoxHUD;
-        Ogre::OverlayContainer* container;
-        Ogre::TextAreaOverlayElement* fpsText;
-        Ogre::TextAreaOverlayElement* rTRText;
-        BarOverlayElement* energyBar;
-        BarOverlayElement* speedoBar;
-        RadarOverlayElement* radar;
-        Navigation* nav;
+      public:
+        static HUD& getSingleton();
+        virtual void tick(float);
 
-        bool showFPS;
-        bool showRenderTime;
-
-      public:
-        virtual void tick(float);
-        void addRadarObject(Ogre::SceneNode* node, const ColourValue& colour = ColourValue(0.5, 0.5, 0.5, 1));
-        void removeRadarObject(Ogre::SceneNode* node);
+        void resize();
+        void addRadarObject(WorldEntity* object, const ColourValue& colour = ColourValue(0.5, 0.5, 0.5, 1));
+        void removeRadarObject(WorldEntity* object);
         void setRenderTimeRatio(float ratio);
         void setFPS();
 
-        std::set<RadarObject*> roSet;
+        inline std::list<RadarObject*>& getRadarObjects()
+            { return this->roSet_; }
+
+        static void setEnergy(float value);
+        static void cycleNavigationFocus();
+        static void releaseNavigationFocus();
+        static void toggleFPS();
+        static void toggleRenderTime();
+
+      private:
+        HUD();
+        HUD(const HUD& instance);
+        ~HUD();
 
         static HUD* instance_s;
-        static HUD& getSingleton();
-        static void setEnergy(float value);
-        static void cycleNavigationFocus();
-        static void toggleFPS();
-        static void toggleRenderTime();
+
+        std::list<RadarObject*> roSet_;
+        Ogre::Overlay* orxonoxHUD_;
+        Ogre::OverlayContainer* container_;
+        BarOverlayElementFactory* barOverlayElementFactory_;
+        RadarOverlayElementFactory* radarOverlayElementFactory_;
+        Ogre::TextAreaOverlayElement* fpsText_;
+        Ogre::TextAreaOverlayElement* rTRText_;
+        BarOverlayElement* energyBar_;
+        BarOverlayElement* speedoBar_;
+        RadarOverlayElement* radar_;
+        Navigation* nav_;
+
+        bool showFPS_;
+        bool showRenderTime_;
     };
 }