Changeset 1615 for code/branches/hud/src/orxonox/overlays/hud/HUDRadar.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/HUDRadar.cc (modified) (4 diffs)

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

@@ -45 +45 @@
     CreateFactory(HUDRadar);
 
-    using namespace Ogre;
-
     HUDRadar::HUDRadar()
         : marker_(0)
@@ -55 +53 @@
     HUDRadar::~HUDRadar()
     {
-        if (this->isInitialized())
+        if (this->marker_)
+            Ogre::OverlayManager::getSingleton().destroyOverlayElement(this->marker_);
+        for (std::vector<Ogre::PanelOverlayElement*>::iterator it = this->radarDots_.begin();
+            it != this->radarDots_.end(); ++it)
         {
-            if (this->marker_)
-                OverlayManager::getSingleton().destroyOverlayElement(this->marker_);
-            for (std::vector<Ogre::PanelOverlayElement*>::iterator it = this->radarDots_.begin();
-                it != this->radarDots_.end(); ++it)
-            {
-                OverlayManager::getSingleton().destroyOverlayElement(*it);
-            }
+            Ogre::OverlayManager::getSingleton().destroyOverlayElement(*it);
         }
     }
@@ -69 +64 @@
     void HUDRadar::XMLPort(Element& xmlElement, XMLPort::Mode mode)
     {
+        if (mode == XMLPort::LoadObject)
+            this->bCorrectAspect_ = true;
+
         OrxonoxOverlay::XMLPort(xmlElement, mode);
 
         if (mode == XMLPort::LoadObject)
         {
+            marker_ = static_cast<Ogre::PanelOverlayElement*>(Ogre::OverlayManager::getSingleton()
+                .createOverlayElement("Panel", "HUDRadar_marker_" + getUniqueNumberStr()));
+            marker_->setMaterialName("Orxonox/RadarMarker");
+            overlay_->add2D(marker_);
+            marker_->hide();
+
             this->sensitivity_ = 1.0f;
             this->halfDotSizeDistance_ = 3000.0f;
@@ -85 +89 @@
         shapeMaterials_[RadarViewable::Triangle] = "RadarSquare.tga";
         shapeMaterials_[RadarViewable::Square]   = "RadarSquare.tga";
-
-        if (mode == XMLPort::LoadObject)
-        {
-            marker_ = (Ogre::PanelOverlayElement*)Ogre::OverlayManager::getSingleton().createOverlayElement("Panel", getName() + "_Marker");
-            marker_->setMaterialName("Orxonox/RadarMarker");
-            overlay_->add2D(marker_);
-            marker_->hide();
-        }
     }