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

Timestamp:

May 24, 2008, 1:49:54 PM (17 years ago)

Author:

rgrieder

Message:

• reverted the HUD changes to ease up back merge from network branch

@everyone: please commit to the network branch from now on if it concerns the presentation.
Oli has also created a folder for the presentation files.
@fabian: you are excluded

File:

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

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

@@ -30 +30 @@
 #define _HUD_H__
 
+#include <string.h>
+#include <OgreOverlayElement.h>
+#include <OgreTextAreaOverlayElement.h>
 #include <OgrePrerequisites.h>
-#include <OgreTextAreaOverlayElement.h>
+
 #include "OrxonoxPrereqs.h"
 #include "core/Tickable.h"
 #include "BarOverlayElement.h"
 #include "RadarOverlayElement.h"
-#include "Navigation.h"
-#include "RadarObject.h"
 
 
@@ -45 +46 @@
     {
         private:
-            HUD();
-            HUD(HUD& instance);
-            ~HUD();
             Ogre::OverlayManager* om;
             Ogre::Overlay* orxonoxHUD;
             Ogre::OverlayContainer* container;
-            Ogre::TextAreaOverlayElement* fpsText;
+            Ogre::TextAreaOverlayElement* test;
             BarOverlayElement* energyBar;
             BarOverlayElement* speedoBar;
             RadarOverlayElement* radar;
-            RadarObject* firstRadarObject;
-            RadarObject* lastRadarObject;
-            Navigation* nav;
 
         public:
+            HUD(int zoom);
+            ~HUD();
             virtual void tick(float);
-            void addRadarObject(Vector3 pos);
-            RadarObject* getFirstRadarObject();
 
-            static HUD* instance_s;
-            static HUD& getSingleton();
-            static void setFPS(float fps);
-            static void setEnergy(float value);
-            static void cycleNavigationFocus();
     };
 }