Changeset 1601 for code/branches/hud/src/orxonox/overlays/hud/HUDNavigation.cc

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/hud/HUDNavigation.cc (moved) (moved from code/branches/hud/src/orxonox/overlays/hud/Navigation.cc) (19 diffs)

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;