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

Timestamp:

Jun 8, 2008, 5:55:05 PM (17 years ago)

Author:

rgrieder

Message:

• changed a default value concerning the derived mouse input (maybe change that in orxonox.ini too
• added initialise()/destroy() to HUD in order to avoid a segfault

File:

• code/trunk/src/orxonox/hud/HUD.h (modified) (4 diffs)

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

@@ -37 +37 @@
 #include "objects/Tickable.h"
 #include "util/Math.h"
+#include "OverlayElementFactories.h"
 
 namespace orxonox
@@ -43 +44 @@
     {
       public:
-        static HUD& getSingleton();
+        void initialise();
+        void destroy();
+
         virtual void tick(float);
 
@@ -54 +57 @@
         inline std::list<RadarObject*>& getRadarObjects()
             { return this->roSet_; }
+
+        static HUD& getSingleton();
 
         static void setEnergy(float value);
@@ -66 +71 @@
         ~HUD();
 
-        static HUD* instance_s;
+        std::list<RadarObject*> roSet_;
+        BarOverlayElementFactory barOverlayElementFactory_;
+        RadarOverlayElementFactory radarOverlayElementFactory_;
 
-        std::list<RadarObject*> roSet_;
         Ogre::Overlay* orxonoxHUD_;
         Ogre::OverlayContainer* container_;
-        BarOverlayElementFactory* barOverlayElementFactory_;
-        RadarOverlayElementFactory* radarOverlayElementFactory_;
         Ogre::TextAreaOverlayElement* fpsText_;
         Ogre::TextAreaOverlayElement* rTRText_;