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

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

@@ -43 +43 @@
     unsigned int HUDBar::materialcount_s = 0;
 
-    using namespace Ogre;
-
     HUDBar::HUDBar()
         : bar_(0)
@@ -54 +52 @@
     HUDBar::~HUDBar()
     {
-        if (this->isInitialized())
-        {
-            if (this->bar_)
-                OverlayManager::getSingleton().destroyOverlayElement(this->bar_);
-            // FIXME: Check whether we have to delete the textureUnitState_;
-        }
+        if (this->bar_)
+            Ogre::OverlayManager::getSingleton().destroyOverlayElement(this->bar_);
     }
 
@@ -82 +76 @@
             barOffsetLeft_s = 0.06f;
             barOffsetTop_s = 0.0f;
-            this->bar_ = static_cast<PanelOverlayElement*>(OverlayManager::getSingleton().createOverlayElement("Panel", getName() + "Bar" + getUniqueNumberStr()));
+
+            this->bar_ = static_cast<Ogre::PanelOverlayElement*>(Ogre::OverlayManager::getSingleton()
+                .createOverlayElement("Panel", "HUDBar_bar_" + getUniqueNumberStr()));
             this->bar_->setMaterialName(materialname);
             this->background_->addChild(bar_);