Changeset 1601 for code/branches/hud/src/orxonox

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..)

Location:

code/branches/hud/src/orxonox

Files:

• CMakeLists.txt (modified) (1 diff)
• GraphicsEngine.cc (modified) (1 diff)
• Orxonox.cc (modified) (3 diffs)
• Orxonox.h (modified) (1 diff)
• OrxonoxPrereqs.h (modified) (1 diff)
• objects/SpaceShip.cc (modified) (3 diffs)
• overlays/OrxonoxOverlay.cc (moved) (moved from code/branches/hud/src/orxonox/overlays/HUDOverlay.cc) (11 diffs)
• overlays/OrxonoxOverlay.h (moved) (moved from code/branches/hud/src/orxonox/overlays/HUDOverlay.h) (3 diffs)
• overlays/OverlayGroup.cc (moved) (moved from code/branches/hud/src/orxonox/overlays/HUD.cc) (10 diffs)
• overlays/OverlayGroup.h (moved) (moved from code/branches/hud/src/orxonox/overlays/HUD.h) (6 diffs)
• overlays/console/InGameConsole.cc (modified) (1 diff)
• overlays/hud/HUDBar.cc (modified) (1 diff)
• overlays/hud/HUDBar.h (modified) (1 diff)
• overlays/hud/HUDNavigation.cc (moved) (moved from code/branches/hud/src/orxonox/overlays/hud/Navigation.cc) (19 diffs)
• overlays/hud/HUDNavigation.h (moved) (moved from code/branches/hud/src/orxonox/overlays/hud/Navigation.h) (3 diffs)
• overlays/hud/HUDText.cc (modified) (1 diff)
• overlays/hud/HUDText.h (modified) (1 diff)
• overlays/hud/RadarOverlayElement.cc (modified) (3 diffs)

code/branches/hud/src/orxonox/CMakeLists.txt

@@ -5 +5 @@
   Settings.cc
 
-  console/InGameConsole.cc
-  hud/HUD.cc
-  hud/BarOverlayElement.cc
-  hud/RadarOverlayElement.cc
-  hud/RadarObject.cc
-  hud/Navigation.cc
+  overlays/OrxonoxOverlay.cc
+  overlays/OverlayGroup.cc
+
+  overlays/console/InGameConsole.cc
+
+  overlays/hud/HUDBar.cc
+  overlays/hud/HUDFPSText.cc
+  overlays/hud/HUDNavigation.cc
+  overlays/hud/HUDRTRText.cc
+  overlays/hud/HUDSpeedBar.cc
+  overlays/hud/HUDText.cc
+  overlays/hud/RadarObject.cc
+  overlays/hud/RadarOverlayElement.cc
+
   tolua/tolua_bind.cc
 

code/branches/hud/src/orxonox/GraphicsEngine.cc

@@ -51 +51 @@
 #include "core/ConsoleCommand.h"
 
-#include "console/InGameConsole.h"
-#include "hud/HUD.h"
+#include "overlays/console/InGameConsole.h"
+#include "overlays/OverlayGroup.h"
 #include "tools/ParticleInterface.h"
 #include "Settings.h"

code/branches/hud/src/orxonox/Orxonox.cc

@@ -69 +69 @@
 
 // objects and tools
-#include "hud/HUD.h"
-#include "console/InGameConsole.h"
+#include "overlays/OverlayGroup.h"
+#include "overlays/console/InGameConsole.h"
 #include "objects/Tickable.h"
 #include "tools/ParticleInterface.h"
@@ -335 +335 @@
     COUT(3) << "Orxonox: Loading HUD" << std::endl;
 
-    Level* hud = new Level("hud/hud.oxh");
+    Level* hud = new Level(Settings::getDataPath() + "overlay/hud.oxo");
     Loader::load(hud);
 
@@ -451 +451 @@
       frameTime += evt.timeSinceLastFrame;
 
-      // show the current time in the HUD
-      // HUD::getSingleton().setTime(now);
+      // OverlayGroup::getHUD().setTime(now);
       if (mode_ != DEDICATED && frameTime > 0.4f)
       {

code/branches/hud/src/orxonox/Orxonox.h

@@ -97 +97 @@
       // TODO: make this a config-value by creating a config class for orxonox
       float                 frameSmoothingTime_;
-      //HUD*                  orxonoxHUD_;
       bool                  bAbort_;        //!< aborts the render loop if true
       float                 timefactor_;    //!< A factor to change the gamespeed

code/branches/hud/src/orxonox/OrxonoxPrereqs.h

@@ -115 +115 @@
   class BarOverlayElement;
   class BarOverlayElementFactory;
-  class HUD;
-  class Navigation;
+  class OverlayGroup;
+  class OrxonoxOverlay;
+  class HUDNavigation;
   class RadarObject;
   class RadarOverlayElement;

code/branches/hud/src/orxonox/objects/SpaceShip.cc

@@ -49 +49 @@
 #include "core/ConsoleCommand.h"
 #include "network/Client.h"
-#include "hud/HUD.h"
+#include "overlays/OverlayGroup.h"
 
 namespace orxonox
@@ -152 +152 @@
 
             if (!this->myShip_)
-                HUD::getSingleton().removeRadarObject(this);
+                OverlayGroup::getHUD().removeRadarObject(this);
         }
     }
@@ -161 +161 @@
           myShip_=true;
         else
-          HUD::getSingleton().addRadarObject(this, this->getProjectileColour());
+          OverlayGroup::getHUD().addRadarObject(this, this->getProjectileColour());
       }
       if(Model::create())

code/branches/hud/src/orxonox/overlays/OrxonoxOverlay.cc

@@ -28 +28 @@
 
 #include "OrxonoxStableHeaders.h"
-#include "HUDOverlay.h"
+#include "OrxonoxOverlay.h"
 
 #include <OgreOverlayManager.h>
@@ -37 +37 @@
 namespace orxonox
 {
-  unsigned int HUDOverlay::hudOverlayCounter_s = 0;
+  unsigned int OrxonoxOverlay::hudOverlayCounter_s = 0;
 
-  HUDOverlay::HUDOverlay()
+  OrxonoxOverlay::OrxonoxOverlay()
     : overlay_(0)
     , windowAspectRatio_(1.0f)
@@ -47 +47 @@
     , angle_(0.0f)
     , position_(0.0f, 0.0f)
-    , origin_(0.5f, 0.5f)
+    , origin_(0.0f, 0.0f)
   {
-    RegisterObject(HUDOverlay);
+    RegisterObject(OrxonoxOverlay);
   }
 
-  void HUDOverlay::XMLPort(Element& xmlElement, XMLPort::Mode mode)
+  void OrxonoxOverlay::XMLPort(Element& xmlElement, XMLPort::Mode mode)
   {
     BaseObject::XMLPort(xmlElement, mode);
@@ -58 +58 @@
     if (mode == XMLPort::LoadObject)
     {
-      overlay_ = Ogre::OverlayManager::getSingleton().create("HUDOverlay"
+      overlay_ = Ogre::OverlayManager::getSingleton().create("OrxonoxOverlay"
             + convertToString(hudOverlayCounter_s++) + "_" + this->getName());
 
@@ -65 +65 @@
     }
 
-    XMLPortParam(HUDOverlay, "correctAspect", setAspectCorrection, getAspectCorrection, xmlElement, mode);
-    XMLPortParam(HUDOverlay, "size", setSize, getSize, xmlElement, mode);
-    XMLPortParam(HUDOverlay, "rotation", setRotation, getRotation, xmlElement, mode);
-    XMLPortParam(HUDOverlay, "origin", setOrigin, getOrigin, xmlElement, mode);
-    XMLPortParam(HUDOverlay, "position", setPosition, getPosition, xmlElement, mode);
+    XMLPortParam(OrxonoxOverlay, "correctAspect", setAspectCorrection, getAspectCorrection, xmlElement, mode);
+    XMLPortParam(OrxonoxOverlay, "size", setSize, getSize, xmlElement, mode);
+    XMLPortParam(OrxonoxOverlay, "rotation", setRotation, getRotation, xmlElement, mode);
+    XMLPortParam(OrxonoxOverlay, "origin", setOrigin, getOrigin, xmlElement, mode);
+    XMLPortParam(OrxonoxOverlay, "position", setPosition, getPosition, xmlElement, mode);
 
     if (mode == XMLPort::LoadObject)
@@ -81 +81 @@
   }
 
-  HUDOverlay::~HUDOverlay()
+  OrxonoxOverlay::~OrxonoxOverlay()
   {
   }
 
-  void HUDOverlay::changedVisibility()
+  void OrxonoxOverlay::changedVisibility()
   {
     if (this->overlay_)
@@ -96 +96 @@
   }
 
-  void HUDOverlay::windowResized(int newWidth, int newHeight)
+  void OrxonoxOverlay::windowResized(int newWidth, int newHeight)
   {
     this->windowAspectRatio_ = newWidth/(float)newHeight;
@@ -103 +103 @@
   }
 
-  void HUDOverlay::setAspectCorrection(bool val)
+  void OrxonoxOverlay::setAspectCorrection(bool val)
   {
     if (val)
@@ -126 +126 @@
       This function can be overriden by any derivative.
   */
-  void HUDOverlay::sizeChanged()
+  void OrxonoxOverlay::sizeChanged()
   {
     this->overlay_->setScale(size_.x * sizeCorrection_.x, size_.y * sizeCorrection_.y);
@@ -135 +135 @@
       This function can be overriden by any derivative.
   */
-  void HUDOverlay::angleChanged()
+  void OrxonoxOverlay::angleChanged()
   {
     this->overlay_->setRotate(this->angle_);
@@ -144 +144 @@
       This function can be overriden by any derivative.
   */
-  void HUDOverlay::positionChanged()
+  void OrxonoxOverlay::positionChanged()
   {
     Vector2 scroll = (position_ - 0.5 - size_ * (origin_ - 0.5)) * 2.0;

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

@@ -27 +27 @@
  */
 
-#ifndef _HUDOverlay_H__
-#define _HUDOverlay_H__
+#ifndef _OrxonoxOverlay_H__
+#define _OrxonoxOverlay_H__
 
 #include "OrxonoxPrereqs.h"
@@ -39 +39 @@
 namespace orxonox
 {
-  class _OrxonoxExport HUDOverlay : public BaseObject, public WindowEventListener
+  class _OrxonoxExport OrxonoxOverlay : public BaseObject, public WindowEventListener
   {
     public:
-      HUDOverlay();
-      virtual ~HUDOverlay();
+      OrxonoxOverlay();
+      virtual ~OrxonoxOverlay();
 
       virtual void XMLPort(Element& xmlElement, XMLPort::Mode mode);
@@ -113 +113 @@
 }
 
-#endif /* _HUDOverlay_H__ */
+#endif /* _OrxonoxOverlay_H__ */

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

@@ -28 +28 @@
 
 #include "OrxonoxStableHeaders.h"
-#include "HUD.h"
+#include "OverlayGroup.h"
 
 #include <string>
@@ -44 +44 @@
 #include "objects/WorldEntity.h"
 #include "GraphicsEngine.h"
-#include "HUDBar.h"
-#include "RadarObject.h"
-#include "RadarOverlayElement.h"
-#include "Navigation.h"
+#include "hud/HUDBar.h"
+#include "hud/RadarObject.h"
+#include "hud/RadarOverlayElement.h"
+#include "hud/HUDNavigation.h"
 
 namespace orxonox
 {
-    CreateFactory(HUD);
-
-    SetConsoleCommandShortcut(HUD, cycleNavigationFocus).setAccessLevel(AccessLevel::User);
-    SetConsoleCommandShortcut(HUD, releaseNavigationFocus).setAccessLevel(AccessLevel::User);
-    SetConsoleCommand(HUD, toggleVisibility, false).setAccessLevel(AccessLevel::User);
-
-    HUD* HUD::instance_s = 0;
+    CreateFactory(OverlayGroup);
+
+    SetConsoleCommandShortcut(OverlayGroup, cycleNavigationFocus).setAccessLevel(AccessLevel::User);
+    SetConsoleCommandShortcut(OverlayGroup, releaseNavigationFocus).setAccessLevel(AccessLevel::User);
+    SetConsoleCommand(OverlayGroup, toggleVisibility, false).setAccessLevel(AccessLevel::User);
+
+    OverlayGroup* OverlayGroup::hudInstance_s = 0;
 
     using namespace Ogre;
 
-    HUD::HUD()
-    {
-        assert(instance_s == 0);
-        instance_s = this;
-        RegisterObject(HUD);
+    OverlayGroup::OverlayGroup()
+    {
+        assert(hudInstance_s == 0);
+        hudInstance_s = this;
+        RegisterObject(OverlayGroup);
 
         // Singleton like in Ogre. Constructor and destructor are public,
@@ -82 +82 @@
     }
 
-    HUD::~HUD()
+    OverlayGroup::~OverlayGroup()
     {
         if (this->isInitialized())
@@ -109 +109 @@
         }
 
-        instance_s = 0;
-    }
-
-    void HUD::XMLPort(Element& xmlElement, XMLPort::Mode mode)
+        hudInstance_s = 0;
+    }
+
+    void OverlayGroup::XMLPort(Element& xmlElement, XMLPort::Mode mode)
     {
         BaseObject::XMLPort(xmlElement, mode);
@@ -119 +119 @@
         showRenderTime_ = true;
 
-        XMLPortObject(HUD, HUDOverlay, "", addHUDElement, getHUDElement, xmlElement, mode, false, true);
+        XMLPortObject(OverlayGroup, OrxonoxOverlay, "", addElement, getElement, xmlElement, mode, false, true);
 
         // create Factories
@@ -156 +156 @@
     }
 
-    void HUD::addHUDElement(HUDOverlay* element)
+    void OverlayGroup::addElement(OrxonoxOverlay* element)
     {
         if (hudElements_.find(element->getName()) != hudElements_.end())
@@ -166 +166 @@
     }
 
-    HUDOverlay* HUD::getHUDElement(unsigned int index)
+    OrxonoxOverlay* OverlayGroup::getElement(unsigned int index)
     {
         if (index < this->hudElements_.size())
         {
-          std::map<std::string, HUDOverlay*>::const_iterator it = hudElements_.begin();
+          std::map<std::string, OrxonoxOverlay*>::const_iterator it = hudElements_.begin();
           for (unsigned int i = 0; i != index; ++it, ++i)
             ;
@@ -179 +179 @@
     }
 
-    void HUD::tick(float dt)
+    void OverlayGroup::tick(float dt)
     {
         radar_->update();
     }
 
-    void HUD::windowResized(int newWidth, int newHeight)
+    void OverlayGroup::windowResized(int newWidth, int newHeight)
     {
         this->radar_->resize();
     }
 
-    void HUD::addRadarObject(WorldEntity* object, const ColourValue& colour){
+    void OverlayGroup::addRadarObject(WorldEntity* object, const ColourValue& colour){
         RadarObject* obj = new RadarObject(container_, object, colour);
         roSet_.insert(roSet_.end(), obj);
@@ -203 +203 @@
     }
 
-    void HUD::removeRadarObject(WorldEntity* object){
+    void OverlayGroup::removeRadarObject(WorldEntity* object){
         for(std::list<RadarObject*>::iterator it=roSet_.begin(); it!=roSet_.end(); ++it){
             if ((*it)->getObject() == object)
@@ -217 +217 @@
     }
 
-    /*static*/ HUD& HUD::getSingleton()
-    {
-        assert(instance_s);
-        return *instance_s;
-    }
-
-    /*static*/ void HUD::toggleVisibility(const std::string& name)
-    {
-        if (HUD::getSingleton().hudElements_.find(name) != HUD::getSingleton().hudElements_.end())
-        {
-            HUD::getSingleton().hudElements_[name]->setVisibility(!HUD::getSingleton().hudElements_[name]->isVisible());
-        }
-    }
-
-    /*static*/ void HUD::setEnergy(float value){
-        HUD::getSingleton().energyBar_->setValue(value);
-    }
-
-    /*static*/ void HUD::cycleNavigationFocus()
-    {
-        if (HUD::getSingleton().hudElements_.find("Navigation") != HUD::getSingleton().hudElements_.end())
-        {
-            Navigation* navi = dynamic_cast<Navigation*>(HUD::getSingleton().hudElements_["Navigation"]);
+    /*static*/ OverlayGroup& OverlayGroup::getHUD()
+    {
+        assert(hudInstance_s);
+        return *hudInstance_s;
+    }
+
+    /*static*/ void OverlayGroup::toggleVisibility(const std::string& name)
+    {
+        if (OverlayGroup::getHUD().hudElements_.find(name) != OverlayGroup::getHUD().hudElements_.end())
+        {
+            OverlayGroup::getHUD().hudElements_[name]->setVisibility(!OverlayGroup::getHUD().hudElements_[name]->isVisible());
+        }
+    }
+
+    /*static*/ void OverlayGroup::setEnergy(float value){
+        OverlayGroup::getHUD().energyBar_->setValue(value);
+    }
+
+    /*static*/ void OverlayGroup::cycleNavigationFocus()
+    {
+        if (OverlayGroup::getHUD().hudElements_.find("Navigation") != OverlayGroup::getHUD().hudElements_.end())
+        {
+            HUDNavigation* navi = dynamic_cast<HUDNavigation*>(OverlayGroup::getHUD().hudElements_["Navigation"]);
             navi->cycleFocus();
         }
     }
 
-    /*static*/ void HUD::releaseNavigationFocus(){
-        //HUD::getSingleton().nav_->releaseFocus();
+    /*static*/ void OverlayGroup::releaseNavigationFocus(){
+        //OverlayGroup::getHUD().nav_->releaseFocus();
     }
 }

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__ */

code/branches/hud/src/orxonox/overlays/console/InGameConsole.cc

@@ -378 +378 @@
         this->consoleOverlayNoise_->setWidth((int) this->windowW_ * this->relativeWidth - 10);
         this->consoleOverlayNoise_->setHeight((int) this->windowH_ * this->relativeHeight - 5);
-        this->consoleOverlayNoise_->setTiling(consoleOverlayNoise_->getWidth() / 80.0f * this->noiseSize_, consoleOverlayNoise_->getHeight() / 80.0f * this->noiseSize_);
+        this->consoleOverlayNoise_->setTiling(consoleOverlayNoise_->getWidth() / (50.0f * this->noiseSize_), consoleOverlayNoise_->getHeight() / (50.0f * this->noiseSize_));
 
         // now adjust the text lines...

code/branches/hud/src/orxonox/overlays/hud/HUDBar.cc

@@ -73 +73 @@
     void HUDBar::XMLPort(Element& xmlElement, XMLPort::Mode mode)
     {
-        HUDOverlay::XMLPort(xmlElement, mode);
+        OrxonoxOverlay::XMLPort(xmlElement, mode);
 
         if (mode == XMLPort::LoadObject)

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

@@ -38 +38 @@
 
 #include "util/Math.h"
-#include "HUDOverlay.h"
+#include "overlays/OrxonoxOverlay.h"
 
 namespace orxonox
 {
-  class _OrxonoxExport HUDBar : public HUDOverlay
+  class _OrxonoxExport HUDBar : public OrxonoxOverlay
   {
     public:

code/branches/hud/src/orxonox/overlays/hud/HUDNavigation.cc

@@ -28 +28 @@
 
 #include "OrxonoxStableHeaders.h"
-#include "Navigation.h"
+#include "HUDNavigation.h"
 
 #include <OgreOverlayManager.h>
@@ -38 +38 @@
 #include "objects/Projectile.h"
 #include "objects/CameraHandler.h"
-#include "HUD.h"
+#include "overlays/OverlayGroup.h"
 #include "RadarObject.h"
 #include "RadarOverlayElement.h"
@@ -46 +46 @@
 namespace orxonox
 {
-    CreateFactory(Navigation);
+    CreateFactory(HUDNavigation);
 
     using namespace Ogre;
 
-    Navigation::Navigation()
+    HUDNavigation::HUDNavigation()
       : container_(0)
       , navMarker_(0)
@@ -57 +57 @@
       , focus_(0)
     {
-        RegisterObject(Navigation);
-    }
-
-    Navigation::~Navigation()
+        RegisterObject(HUDNavigation);
+    }
+
+    HUDNavigation::~HUDNavigation()
     {
         if (this->isInitialized())
@@ -75 +75 @@
     }
 
-    void Navigation::XMLPort(Element& xmlElement, XMLPort::Mode mode)
-    {
-        HUDOverlay::XMLPort(xmlElement, mode);
+    void HUDNavigation::XMLPort(Element& xmlElement, XMLPort::Mode mode)
+    {
+        OrxonoxOverlay::XMLPort(xmlElement, mode);
 
         if (mode == XMLPort::LoadObject)
@@ -118 +118 @@
         }
 
-        XMLPortParam(Navigation, "font", setFont, getFont, xmlElement, mode);
-        XMLPortParam(Navigation, "textsize", setTextSize, getTextSize, xmlElement, mode);
-        XMLPortParam(Navigation, "navmarkersize", setNavMarkerSize, getNavMarkerSize, xmlElement, mode);
-        XMLPortParam(Navigation, "aimmarkersize", setAimMarkerSize, getAimMarkerSize, xmlElement, mode);
+        XMLPortParam(HUDNavigation, "font", setFont, getFont, xmlElement, mode);
+        XMLPortParam(HUDNavigation, "textsize", setTextSize, getTextSize, xmlElement, mode);
+        XMLPortParam(HUDNavigation, "navmarkersize", setNavMarkerSize, getNavMarkerSize, xmlElement, mode);
+        XMLPortParam(HUDNavigation, "aimmarkersize", setAimMarkerSize, getAimMarkerSize, xmlElement, mode);
 
         if (mode == XMLPort::LoadObject)
@@ -129 +129 @@
     }
 
-    void Navigation::setNavMarkerSize(float size)
+    void HUDNavigation::setNavMarkerSize(float size)
     {
         this->navMarkerSize_ = size;
     }
 
-    float Navigation::getNavMarkerSize() const
+    float HUDNavigation::getNavMarkerSize() const
     {
         return this->navMarkerSize_;
     }
 
-    void Navigation::setAimMarkerSize(float size)
+    void HUDNavigation::setAimMarkerSize(float size)
     {
         this->aimMarkerSize_ = size;
     }
 
-    float Navigation::getAimMarkerSize() const
+    float HUDNavigation::getAimMarkerSize() const
     {
         return this->aimMarkerSize_;
     }
 
-    void Navigation::setFont(const std::string& font)
+    void HUDNavigation::setFont(const std::string& font)
     {
         if (this->navText_ && font != "")
@@ -155 +155 @@
     }
 
-    std::string Navigation::getFont() const
+    std::string HUDNavigation::getFont() const
     {
         if (this->navText_)
@@ -163 +163 @@
     }
 
-    void Navigation::setTextSize(float size)
+    void HUDNavigation::setTextSize(float size)
     {
         if (this->navText_ && size >= 0.0f)
@@ -169 +169 @@
     }
 
-    float Navigation::getTextSize() const
+    float HUDNavigation::getTextSize() const
     {
         if (this->navText_)
@@ -177 +177 @@
     }
 
-    void Navigation::tick(float dt)
+    void HUDNavigation::tick(float dt)
     {
         if (!focus_)
@@ -185 +185 @@
     }
 
-    void Navigation::updateMarker()
+    void HUDNavigation::updateMarker()
     {
         // set text
@@ -291 +291 @@
     }
 
-    void Navigation::cycleFocus()
+    void HUDNavigation::cycleFocus()
     {
         if (!focus_)
@@ -298 +298 @@
             float distance = (unsigned int) -1;
             Vector3 shipPos = SpaceShip::getLocalShip()->getPosition();
-            it_ = HUD::getSingleton().getRadarObjects().begin();
-
-            for (std::list<RadarObject*>::iterator it = HUD::getSingleton().getRadarObjects().begin(); it != HUD::getSingleton().getRadarObjects().end(); ++it)
+            it_ = OverlayGroup::getHUD().getRadarObjects().begin();
+
+            for (std::list<RadarObject*>::iterator it = OverlayGroup::getHUD().getRadarObjects().begin(); it != OverlayGroup::getHUD().getRadarObjects().end(); ++it)
             {
                 float newdist = (*it)->getPosition().squaredDistance(shipPos);
@@ -310 +310 @@
             }
 
-            if (it_ != HUD::getSingleton().getRadarObjects().end())
+            if (it_ != OverlayGroup::getHUD().getRadarObjects().end())
             {
                 focus_ = *it_;
 
                 // move the focused object to the begin of the list, so we will iterate through all other objects when cycling
-                HUD::getSingleton().getRadarObjects().erase(it_);
-                HUD::getSingleton().getRadarObjects().insert(HUD::getSingleton().getRadarObjects().begin(), focus_);
-                it_ = HUD::getSingleton().getRadarObjects().begin();
-            }
-        }
-        else if (it_ != HUD::getSingleton().getRadarObjects().end())
+                OverlayGroup::getHUD().getRadarObjects().erase(it_);
+                OverlayGroup::getHUD().getRadarObjects().insert(OverlayGroup::getHUD().getRadarObjects().begin(), focus_);
+                it_ = OverlayGroup::getHUD().getRadarObjects().begin();
+            }
+        }
+        else if (it_ != OverlayGroup::getHUD().getRadarObjects().end())
         {
             focus_->resetMaterial();
             ++it_;
-            if (it_ != HUD::getSingleton().getRadarObjects().end())
+            if (it_ != OverlayGroup::getHUD().getRadarObjects().end())
                 focus_ = *it_;
             else
@@ -336 +336 @@
     }
 
-    void Navigation::updateFocus()
+    void HUDNavigation::updateFocus()
     {
         if (focus_)
@@ -349 +349 @@
     }
 
-    void Navigation::releaseFocus()
+    void HUDNavigation::releaseFocus()
     {
         this->focus_ = 0;
@@ -355 +355 @@
     }
 
-    float Navigation::getDist2Focus() const
+    float HUDNavigation::getDist2Focus() const
     {
         if (focus_)
@@ -363 +363 @@
     }
 
-    void Navigation::sizeChanged()
+    void HUDNavigation::sizeChanged()
     {
         float xScale = this->getActualSize().x;

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

@@ -27 +27 @@
  */
 
-#ifndef _Navigation_H__
-#define _Navigation_H__
+#ifndef _HUDNavigation_H__
+#define _HUDNavigation_H__
 
 #include "OrxonoxPrereqs.h"
@@ -35 +35 @@
 #include <OgreTextAreaOverlayElement.h>
 #include <OgrePanelOverlayElement.h>
-#include "HUDOverlay.h"
+#include "overlays/OrxonoxOverlay.h"
 #include "util/Math.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport Navigation : public HUDOverlay, public Tickable
+    class _OrxonoxExport HUDNavigation : public OrxonoxOverlay, public Tickable
     {
       public:
-        Navigation();
-        virtual ~Navigation();
+        HUDNavigation();
+        virtual ~HUDNavigation();
 
         virtual void XMLPort(Element& xmlElement, XMLPort::Mode mode);
@@ -88 +88 @@
 }
 
-#endif /* _Navigation_H__ */
+#endif /* _HUDNavigation_H__ */

code/branches/hud/src/orxonox/overlays/hud/HUDText.cc

@@ -60 +60 @@
   void HUDText::XMLPort(Element& xmlElement, XMLPort::Mode mode)
   {
-    HUDOverlay::XMLPort(xmlElement, mode);
+    OrxonoxOverlay::XMLPort(xmlElement, mode);
 
     if (mode == XMLPort::LoadObject)

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

@@ -37 +37 @@
 
 #include "util/Math.h"
-#include "HUDOverlay.h"
+#include "overlays/OrxonoxOverlay.h"
 
 namespace orxonox
 {
-  class _OrxonoxExport HUDText : public HUDOverlay
+  class _OrxonoxExport HUDText : public OrxonoxOverlay
   {
   public:

code/branches/hud/src/orxonox/overlays/hud/RadarOverlayElement.cc

@@ -41 +41 @@
 #include "GraphicsEngine.h"
 #include "RadarObject.h"
-#include "HUD.h"
+#include "overlays/OverlayGroup.h"
 
 namespace orxonox
@@ -77 +77 @@
     void RadarOverlayElement::update() {
         // iterate through all RadarObjects
-        for(std::list<RadarObject*>::iterator it=HUD::getSingleton().getRadarObjects().begin(); it!=HUD::getSingleton().getRadarObjects().end(); it++)
+        for(std::list<RadarObject*>::iterator it=OverlayGroup::getHUD().getRadarObjects().begin(); it!=OverlayGroup::getHUD().getRadarObjects().end(); it++)
         {
             // calc position on radar...
@@ -101 +101 @@
         COUT(3) << "List of RadarObjects:\n";
         // iterate through all Radar Objects
-        for(std::list<RadarObject*>::const_iterator it=HUD::getSingleton().getRadarObjects().begin(); it!=HUD::getSingleton().getRadarObjects().end(); ++it){
+        for(std::list<RadarObject*>::const_iterator it=OverlayGroup::getHUD().getRadarObjects().begin(); it!=OverlayGroup::getHUD().getRadarObjects().end(); ++it){
             COUT(3) << i++ << ": " << (*it)->getPosition() << std::endl;
         }