Changeset 1601 for code/branches/hud/src/orxonox/overlays/OverlayGroup.h

Timestamp:

Jun 14, 2008, 6:37:12 PM (16 years ago)

Author:

rgrieder

Message:

• new folder structure for overlays:

orxonox/

…
overlays/

console/
hud/

• Navigation —> HUDNavigation
• HUD —> OverlayGroup (not yet begun with that except renaming and getHUD() instead of getSingleton())
• moved HUD.oxo (file ending should stand for orxonox overlay) to media repository in overlay folder
• fixed a bug with console noiseSize_ config value (was inverted..)

File:

• code/branches/hud/src/orxonox/overlays/OverlayGroup.h (moved) (moved from code/branches/hud/src/orxonox/overlays/HUD.h) (6 diffs)

code/branches/hud/src/orxonox/overlays/OverlayGroup.h

@@ -28 +28 @@
 
 
-#ifndef _HUD_H__
-#define _HUD_H__
+#ifndef _OverlayGroup_H__
+#define _OverlayGroup_H__
 
 #include "OrxonoxPrereqs.h"
@@ -38 +38 @@
 #include "objects/Tickable.h"
 #include "util/Math.h"
-#include "OverlayElementFactories.h"
+#include "hud/OverlayElementFactories.h"
 #include "tools/WindowEventListener.h"
 
@@ -44 +44 @@
 {
     class HUDBar;
-    class HUDOverlay;
+    class OrxonoxOverlay;
 
-    class _OrxonoxExport HUD : public BaseObject, public TickableReal, public WindowEventListener
+    class _OrxonoxExport OverlayGroup : public BaseObject, public TickableReal, public WindowEventListener
     {
       public:
-        HUD();
-        ~HUD();
+        OverlayGroup();
+        ~OverlayGroup();
 
         virtual void XMLPort(Element& xmlElement, XMLPort::Mode mode);
@@ -64 +64 @@
             { return this->roSet_; }
 
-        static HUD& getSingleton();
+        static OverlayGroup& getHUD();
 
         static void setEnergy(float value);
@@ -72 +72 @@
 
       private:
-        HUD(const HUD& instance);
+        OverlayGroup(const OverlayGroup& instance);
 
-        void addHUDElement(HUDOverlay* element);
-        HUDOverlay* getHUDElement(unsigned int index);
+        void addElement(OrxonoxOverlay* element);
+        OrxonoxOverlay* getElement(unsigned int index);
 
         void windowResized(int newWidth, int newHeight);
 
-        std::map<std::string, HUDOverlay*> hudElements_;
+        std::map<std::string, OrxonoxOverlay*> hudElements_;
 
         std::list<RadarObject*> roSet_;
@@ -92 +92 @@
         BarOverlayElement* speedoBar_;
         RadarOverlayElement* radar_;
-        Navigation* nav_;
+        HUDNavigation* nav_;
 
         bool showFPS_;
         bool showRenderTime_;
 
-        static HUD* instance_s;
+        static OverlayGroup* hudInstance_s;
     };
 }
 
-#endif /* _HUD_H__ */
+#endif /* _OverlayGroup_H__ */