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

Timestamp:

Jun 22, 2008, 12:06:55 AM (16 years ago)

Author:

rgrieder

Message:

• added blankString to String so you can return ""; even if it's a const std::string&
• fixed several bugs with aspect correct and margin alignment
• added console commands for OrxonoxOverlays and OverlayGroups for rotate, scale and scroll (you can access the by name (from name=.. in xml file), e.g. "OrxonoxOverlay rotateOverlay SpeedBar 90)
• converted everything in overlays/ to 4 spaces/tab
• removed all using namespace Ogre;
• added background_ Panel to OrxonoxOverlay, since most of the derived classes can use that
• should work now, but I'll have to test on a tardis box first

File:

• code/branches/hud/src/orxonox/overlays/hud/HUDNavigation.cc (modified) (7 diffs)

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

@@ -35 +35 @@
 
 #include "util/Math.h"
+#include "util/String.h"
 #include "core/ConsoleCommand.h"
 #include "objects/SpaceShip.h"
@@ -45 +46 @@
     CreateFactory(HUDNavigation);
 
-    //HUDNavigation* HUDNavigation::instance_s = 0;
-
-    using namespace Ogre;
-
     HUDNavigation::HUDNavigation()
-      : container_(0)
-      , navMarker_(0)
-      , aimMarker_(0)
-      , navText_(0)
+        : navMarker_(0)
+        , aimMarker_(0)
+        , navText_(0)
     {
         RegisterObject(HUDNavigation);
-        
-        /*assert(instance_s == 0); // singleton class
-        HUDNavigation::instance_s = this;*/
     }
 
     HUDNavigation::~HUDNavigation()
     {
-        if (this->isInitialized())
-        {
-            if (this->navMarker_)
-                OverlayManager::getSingleton().destroyOverlayElement(this->navMarker_);
-            if (this->navText_)
-                OverlayManager::getSingleton().destroyOverlayElement(this->navText_);
-            if (this->aimMarker_)
-                OverlayManager::getSingleton().destroyOverlayElement(this->aimMarker_);
-            if (this->container_)
-                OverlayManager::getSingleton().destroyOverlayElement(this->container_);
-        }
-
-        //HUDNavigation::instance_s = 0;
+        if (this->navMarker_)
+            Ogre::OverlayManager::getSingleton().destroyOverlayElement(this->navMarker_);
+        if (this->navText_)
+            Ogre::OverlayManager::getSingleton().destroyOverlayElement(this->navText_);
+        if (this->aimMarker_)
+            Ogre::OverlayManager::getSingleton().destroyOverlayElement(this->aimMarker_);
     }
 
@@ -84 +70 @@
         if (mode == XMLPort::LoadObject)
         {
-            // create container because we cannot add a Text element to an Overlay
-            container_ = static_cast<OverlayContainer*>(Ogre::OverlayManager::getSingleton().createOverlayElement("Panel", getName() + "_navContainer"));
-
             // create nav text
-            navText_ = static_cast<TextAreaOverlayElement*>(Ogre::OverlayManager::getSingleton().createOverlayElement("TextArea", getName() + "_navText"));
+            navText_ = static_cast<Ogre::TextAreaOverlayElement*>(Ogre::OverlayManager::getSingleton()
+                .createOverlayElement("TextArea", "HUDNavigation_navText_" + getUniqueNumberStr()));
             navText_->setCharHeight(0.05f);
             navText_->setFontName("Monofur");
 
             // create nav marker
-            navMarker_ = static_cast<PanelOverlayElement*>(OverlayManager::getSingleton().createOverlayElement("Panel", getName() + "_navMarker"));
+            navMarker_ = static_cast<Ogre::PanelOverlayElement*>(Ogre::OverlayManager::getSingleton()
+                .createOverlayElement("Panel", "HUDNavigation_navMarker_" + getUniqueNumberStr()));
             navMarker_->setMaterialName("Orxonox/NavArrows");
             navMarkerSize_ = 0.05; //default
@@ -99 +84 @@
 
             // create aim marker
-            aimMarker_ = static_cast<PanelOverlayElement*>(OverlayManager::getSingleton().createOverlayElement("Panel", getName() + "_aimMarker"));
+            aimMarker_ = static_cast<Ogre::PanelOverlayElement*>(Ogre::OverlayManager::getSingleton()
+                .createOverlayElement("Panel", "HUDNavigation_aimMarker_" + getUniqueNumberStr()));
             aimMarker_->setMaterialName("Orxonox/NavCrosshair");
             aimMarkerSize_ = 0.04; // default
             
-            container_->addChild(navMarker_);
-            container_->addChild(aimMarker_);
-            container_->addChild(navText_);
-            container_->show();
-
-            overlay_->add2D(container_);
+            background_->addChild(navMarker_);
+            background_->addChild(aimMarker_);
+            background_->addChild(navText_);
+
+            // hide at first
+            this->setVisibility(false);
         }
 
@@ -122 +108 @@
     }
 
-    void HUDNavigation::setNavMarkerSize(float size)
-    {
-        this->navMarkerSize_ = size;
-    }
-
-    float HUDNavigation::getNavMarkerSize() const
-    {
-        return this->navMarkerSize_;
-    }
-
-    void HUDNavigation::setAimMarkerSize(float size)
-    {
-        this->aimMarkerSize_ = size;
-    }
-
-    float HUDNavigation::getAimMarkerSize() const
-    {
-        return this->aimMarkerSize_;
-    }
-
     void HUDNavigation::setFont(const std::string& font)
     {
@@ -148 +114 @@
     }
 
-    std::string HUDNavigation::getFont() const
+    const std::string& HUDNavigation::getFont() const
     {
         if (this->navText_)
             return this->navText_->getFontName();
         else
-            return "";
+            return blankString;
     }
 
@@ -310 +276 @@
             navText_->setCharHeight(navText_->getCharHeight() * yScale);
     }
-
-    /*static*/ /*HUDNavigation& HUDNavigation::getInstance()
-    {
-        assert(instance_s);
-        return *instance_s;
-    }*/
 }