Changeset 1407 for code/trunk/src/orxonox/hud/BarOverlayElement.cc

Timestamp:

May 24, 2008, 1:49:54 PM (16 years ago)

Author:

rgrieder

Message:

• reverted the HUD changes to ease up back merge from network branch

@everyone: please commit to the network branch from now on if it concerns the presentation.
Oli has also created a folder for the presentation files.
@fabian: you are excluded

File:

• code/trunk/src/orxonox/hud/BarOverlayElement.cc (modified) (5 diffs)

code/trunk/src/orxonox/hud/BarOverlayElement.cc

@@ -27 +27 @@
 
 #include <OgreOverlayManager.h>
+#include <OgreOverlayElement.h>
+#include <OgrePanelOverlayElement.h>
 #include "GraphicsEngine.h"
 #include "BarOverlayElement.h"
@@ -34 +36 @@
   using namespace Ogre;
 
-    BarOverlayElement::BarOverlayElement(const String& name):PanelOverlayElement(name){
+    BarOverlayElement::BarOverlayElement(const String& name):Ogre::PanelOverlayElement(name){
         name_ = name;
     }
@@ -40 +42 @@
     BarOverlayElement::~BarOverlayElement(){}
 
-    void BarOverlayElement::init(Real leftRel, Real topRel, Real dimRel, OverlayContainer* container){
+    void BarOverlayElement::init(Real leftRel, Real topRel, Real dimRel, Ogre::OverlayContainer* container){
         // init some values...
         container_ = container;
-        om = &OverlayManager::getSingleton();
+        om = &Ogre::OverlayManager::getSingleton();
         value_ = 0;
         color_ = 2;
@@ -51 +53 @@
         topRel_ = topRel;
         dimRel_ = dimRel;
-
+        
         // create background...
         background_ = static_cast<OverlayContainer*>(om->createOverlayElement("Panel", name_+"container"));
         background_->show();
         container_->addChild(background_);
-        background_->setMetricsMode(GMM_PIXELS);
+        background_->setMetricsMode(Ogre::GMM_PIXELS);
         background_->setMaterialName("Orxonox/BarBackground");
 
@@ -63 +65 @@
 
         show();
-        setMetricsMode(GMM_PIXELS);
+        setMetricsMode(Ogre::GMM_PIXELS);
         setMaterialName("Orxonox/Green");
         background_->addChild(this);