Changeset 1406 for code/branches/network/src/orxonox/hud/HUD.h

Timestamp:

May 24, 2008, 1:39:05 PM (16 years ago)

Author:

rgrieder

Message:

• merged Felix's changes from trunk to network branch
• added "svn:eol-style native" property to keybindings.ini

File:

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

code/branches/network/src/orxonox/hud/HUD.h

@@ -30 +30 @@
 #define _HUD_H__
 
-#include <string.h>
-#include <OgreOverlayElement.h>
+#include <OgrePrerequisites.h>
 #include <OgreTextAreaOverlayElement.h>
-#include <OgrePrerequisites.h>
-
 #include "OrxonoxPrereqs.h"
 #include "core/Tickable.h"
 #include "BarOverlayElement.h"
 #include "RadarOverlayElement.h"
+#include "Navigation.h"
+#include "RadarObject.h"
 
 
@@ -46 +45 @@
     {
         private:
+            HUD();
+            HUD(HUD& instance);
+            ~HUD();
             Ogre::OverlayManager* om;
             Ogre::Overlay* orxonoxHUD;
             Ogre::OverlayContainer* container;
-            Ogre::TextAreaOverlayElement* test;
+            Ogre::TextAreaOverlayElement* fpsText;
             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();
     };
 }