Changeset 1342 for code/branches/hud3/src/orxonox/hud/BarOverlayElement.cc

Timestamp:

May 21, 2008, 12:57:10 PM (16 years ago)

Author:

FelixSchulthess

Message:

removed some warnings caused by implicit conversion

File:

• code/branches/hud3/src/orxonox/hud/BarOverlayElement.cc (modified) (4 diffs)

code/branches/hud3/src/orxonox/hud/BarOverlayElement.cc

@@ -42 +42 @@
     BarOverlayElement::~BarOverlayElement(){}
 
-    void BarOverlayElement::init(Real leftRel, Real topRel, Real widthRel, Real heightRel, Ogre::OverlayContainer* container){
+    void BarOverlayElement::init(Real leftRel, Real topRel, Real dimRel, Ogre::OverlayContainer* container){
         // init some values...
         container_ = container;
@@ -49 +49 @@
         color_ = 2;
         autoColor_ = true;
-        left2Right = false; // default: right to left progress
-
-        // get window data...
-        windowW_ = GraphicsEngine::getSingleton().getWindowWidth();
-        windowH_ = GraphicsEngine::getSingleton().getWindowHeight();
+        left2Right = false;     // default is right to left progress
         leftRel_ = leftRel;
         topRel_ = topRel;
-        widthRel_ = widthRel;
-        heightRel_ = heightRel;
-
-        // cálculate absolute coordinates...
-        left_ = leftRel_ * windowW_;
-        top_ = topRel_ * windowH_;
-        width_ = widthRel_ * windowW_;
-        height_ = heightRel_ * windowH_;
-
+        dimRel_ = dimRel;
+        
         // create background...
         background_ = static_cast<OverlayContainer*>(om->createOverlayElement("Panel", name_+"container"));
@@ -72 +61 @@
         background_->setMaterialName("Orxonox/BarBackground");
 
+        // calculate absolute coordinates...
+        resize();
+
         show();
-        background_->addChild(this);
         setMetricsMode(Ogre::GMM_PIXELS);
         setMaterialName("Orxonox/Green");
-        resize();
+        background_->addChild(this);
     }
 
@@ -82 +73 @@
         windowW_ = GraphicsEngine::getSingleton().getWindowWidth();
         windowH_ = GraphicsEngine::getSingleton().getWindowHeight();
-        // cálculate new absolute coordinates...
-        left_ = leftRel_ * windowW_;
-        top_ = topRel_ * windowH_;
-        width_ = widthRel_ * windowW_;
-        height_ = heightRel_ * windowH_;
+        // calculate new absolute coordinates...
+        left_ = (int) (leftRel_ * windowW_);
+        top_ = (int) (topRel_ * windowH_);
+        width_ = (int) (dimRel_ * windowW_);
+        height_ = (int) (0.1*width_);   // the texture has dimensions height:length = 1:10
         // adapt background
         background_->setPosition(left_, top_);