Changeset 6502 for code/trunk/src/modules/overlays

Timestamp:

Mar 11, 2010, 11:34:20 AM (15 years ago)

Author:

rgrieder

Message:

Removed a ton of msvc warnings revealed with OGRE v1.7 (they removed the warning suppressors in OgrePrerequisites.h).
All of them are conversions from one type to another that might be lossy (mostly double to float, please always use "3.7f" instead of "3.7" as constants when using floats).

Location:

code/trunk/src/modules/overlays

Files:

• hud/HUDNavigation.cc (modified) (5 diffs)
• hud/HUDRadar.cc (modified) (1 diff)
• stats/CreateLines.cc (modified) (1 diff)
• stats/Scoreboard.cc (modified) (1 diff)
• stats/Stats.cc (modified) (1 diff)

code/trunk/src/modules/overlays/hud/HUDNavigation.cc

@@ -153 +153 @@
         int dist = static_cast<int>(getDist2Focus());
         navText_->setCaption(multi_cast<std::string>(dist));
-        float textLength = multi_cast<std::string>(dist).size() * navText_->getCharHeight() * 0.3;
+        float textLength = multi_cast<std::string>(dist).size() * navText_->getCharHeight() * 0.3f;
 
         orxonox::Camera* cam = CameraManager::getInstance().getActiveCamera();
@@ -191 +191 @@
                 {
                     // up
-                    float position = pos.x / pos.y + 1.0;
-                    navMarker_->setPosition((position - navMarker_->getWidth()) * 0.5, 0.0);
-                    navMarker_->setUV(0.5, 0.0, 1.0, 0.5);
-                    navText_->setLeft((position - textLength) * 0.5);
+                    float position = pos.x / pos.y + 1.0f;
+                    navMarker_->setPosition((position - navMarker_->getWidth()) * 0.5f, 0.0f);
+                    navMarker_->setUV(0.5f, 0.0f, 1.0f, 0.5f);
+                    navText_->setLeft((position - textLength) * 0.5f);
                     navText_->setTop(navMarker_->getHeight());
                 }
@@ -200 +200 @@
                 {
                     // left
-                    float position = pos.y / pos.x + 1.0;
-                    navMarker_->setPosition(0.0, (position - navMarker_->getWidth()) * 0.5);
-                    navMarker_->setUV(0.0, 0.0, 0.5, 0.5);
-                    navText_->setLeft(navMarker_->getWidth() + 0.01);
-                    navText_->setTop((position - navText_->getCharHeight()) * 0.5);
+                    float position = pos.y / pos.x + 1.0f;
+                    navMarker_->setPosition(0.0f, (position - navMarker_->getWidth()) * 0.5f);
+                    navMarker_->setUV(0.0f, 0.0f, 0.5f, 0.5f);
+                    navText_->setLeft(navMarker_->getWidth() + 0.01f);
+                    navText_->setTop((position - navText_->getCharHeight()) * 0.5f);
                 }
             }
@@ -212 +212 @@
                 {
                     // down
-                    float position = -pos.x / pos.y + 1.0;
-                    navMarker_->setPosition((position - navMarker_->getWidth()) * 0.5, 1.0 - navMarker_->getHeight());
-                    navMarker_->setUV(0.0, 0.5, 0.5, 1.0);
-                    navText_->setLeft((position - textLength) * 0.5);
-                    navText_->setTop(1.0 - navMarker_->getHeight() - navText_->getCharHeight());
+                    float position = -pos.x / pos.y + 1.0f;
+                    navMarker_->setPosition((position - navMarker_->getWidth()) * 0.5f, 1.0f - navMarker_->getHeight());
+                    navMarker_->setUV(0.0f, 0.5f, 0.5f, 1.0f);
+                    navText_->setLeft((position - textLength) * 0.5f);
+                    navText_->setTop(1.0f - navMarker_->getHeight() - navText_->getCharHeight());
                 }
                 else
                 {
                     // right
-                    float position = -pos.y / pos.x + 1.0;
-                    navMarker_->setPosition(1.0 - navMarker_->getWidth(), (position - navMarker_->getHeight()) * 0.5);
-                    navMarker_->setUV(0.5, 0.5, 1.0, 1.0);
-                    navText_->setLeft(1.0 - navMarker_->getWidth() - textLength - 0.01);
-                    navText_->setTop((position - navText_->getCharHeight()) * 0.5);
+                    float position = -pos.y / pos.x + 1.0f;
+                    navMarker_->setPosition(1.0f - navMarker_->getWidth(), (position - navMarker_->getHeight()) * 0.5f);
+                    navMarker_->setUV(0.5f, 0.5f, 1.0f, 1.0f);
+                    navText_->setLeft(1.0f - navMarker_->getWidth() - textLength - 0.01f);
+                    navText_->setTop((position - navText_->getCharHeight()) * 0.5f);
                 }
             }
@@ -243 +243 @@
 
             // object is in view
-            navMarker_->setUV(0.0, 0.0, 1.0, 1.0);
-            navMarker_->setLeft((pos.x + 1.0 - navMarker_->getWidth()) * 0.5);
-            navMarker_->setTop((-pos.y + 1.0 - navMarker_->getHeight()) * 0.5);
+            navMarker_->setUV(0.0f, 0.0f, 1.0f, 1.0f);
+            navMarker_->setLeft((pos.x + 1.0f - navMarker_->getWidth()) * 0.5f);
+            navMarker_->setTop((-pos.y + 1.0f - navMarker_->getHeight()) * 0.5f);
 
 /*
             aimMarker_->show();
-            aimMarker_->setLeft((aimpos.x + 1.0 - aimMarker_->getWidth()) * 0.5);
-            aimMarker_->setTop((-aimpos.y + 1.0 - aimMarker_->getHeight()) * 0.5);
-*/
-            navText_->setLeft((pos.x + 1.0 + navMarker_->getWidth()) * 0.5);
-            navText_->setTop((-pos.y + 1.0 + navMarker_->getHeight()) * 0.5);
+            aimMarker_->setLeft((aimpos.x + 1.0f - aimMarker_->getWidth()) * 0.5f);
+            aimMarker_->setTop((-aimpos.y + 1.0f - aimMarker_->getHeight()) * 0.5f);
+*/
+            navText_->setLeft((pos.x + 1.0f + navMarker_->getWidth()) * 0.5f);
+            navText_->setTop((-pos.y + 1.0f + navMarker_->getHeight()) * 0.5f);
         }
     }

code/trunk/src/modules/overlays/hud/HUDRadar.cc

@@ -141 +141 @@
         // calc position on radar...
         Vector2 coord = get2DViewcoordinates(this->owner_->getPosition(), this->owner_->getOrientation() * WorldEntity::FRONT, this->owner_->getOrientation() * WorldEntity::UP, wePointer->getWorldPosition());
-        coord *= Ogre::Math::PI / 3.5; // small adjustment to make it fit the texture
-        panel->setPosition((1.0 + coord.x - size) * 0.5, (1.0 - coord.y - size) * 0.5);
+        coord *= Ogre::Math::PI / 3.5f; // small adjustment to make it fit the texture
+        panel->setPosition((1.0f + coord.x - size) * 0.5f, (1.0f - coord.y - size) * 0.5f);
 
         if (bIsMarked)
         {
             this->marker_->show();
-            this->marker_->setDimensions(size * 1.5, size * 1.5);
-            this->marker_->setPosition((1.0 + coord.x - size * 1.5) * 0.5, (1.0 - coord.y - size * 1.5) * 0.5);
+            this->marker_->setDimensions(size * 1.5f, size * 1.5f);
+            this->marker_->setPosition((1.0f + coord.x - size * 1.5f) * 0.5f, (1.0f - coord.y - size * 1.5f) * 0.5f);
         }
     }

code/trunk/src/modules/overlays/stats/CreateLines.cc

@@ -38 +38 @@
     {
         playerNameText_ = new OverlayText(0);
-        playerNameText_->setTextSize(0.04);
-        playerNameText_->setColour(ColourValue(0, 0.75, 0.2, 1));
-        playerNameText_->setPosition(Vector2(0.1, topOffset + 0.01));
+        playerNameText_->setTextSize(0.04f);
+        playerNameText_->setColour(ColourValue(0.0f, 0.75f, 0.2f, 1.0f));
+        playerNameText_->setPosition(Vector2(0.1f, topOffset + 0.01f));
 
         scoreText_ = new OverlayText(0);
-        scoreText_->setTextSize(0.04);
-        scoreText_->setColour(ColourValue(0, 0.75, 0.2, 1));
-        scoreText_->setPosition(Vector2(0.6, topOffset + 0.01));
+        scoreText_->setTextSize(0.04f);
+        scoreText_->setColour(ColourValue(0.0f, 0.75f, 0.2f, 1.0f));
+        scoreText_->setPosition(Vector2(0.6f, topOffset + 0.01f));
 
         deathsText_ = new OverlayText(0);
-        deathsText_->setTextSize(0.04);
-        deathsText_->setColour(ColourValue(0, 0.75, 0.2, 1));
-        deathsText_->setPosition(Vector2(0.8, topOffset + 0.01));
+        deathsText_->setTextSize(0.04f);
+        deathsText_->setColour(ColourValue(0, 0.75f, 0.2f, 1.0f));
+        deathsText_->setPosition(Vector2(0.8f, topOffset + 0.01f));
 
         background_ = new Stats(0);

code/trunk/src/modules/overlays/stats/Scoreboard.cc

@@ -79 +79 @@
         const std::map<PlayerInfo*, Player>& playerList = this->getGametype()->getPlayers();
 
-        const float topOffset  = 0.2;
-        const float leftOffset = 0.075;
-        const float distance   = 0.01;
-        const float width      = 0.85;
-        const float height     = 0.05;
+        const float topOffset  = 0.2f;
+        const float leftOffset = 0.075f;
+        const float distance   = 0.01f;
+        const float width      = 0.85f;
+        const float height     = 0.05f;
         while (playerList.size() > this->lines_.size())
         {

code/trunk/src/modules/overlays/stats/Stats.cc

@@ -59 +59 @@
         this->statsOverlayBorder_ = static_cast<Ogre::BorderPanelOverlayElement*>(ovMan->createOverlayElement("BorderPanel", "StatsBorderPanel" + getUniqueNumberString()));
         //this->statsOverlayBorder_->setMaterialName("StatsCenter");
-        this->statsOverlayBorder_->setBorderSize(0.003, 16 * 0.003);
+        this->statsOverlayBorder_->setBorderSize(0.003f, 16.0f * 0.003f);
         this->statsOverlayBorder_->setBorderMaterialName("StatsBorder");
-        this->statsOverlayBorder_->setTopBorderUV(0.49, 0.0, 0.51, 0.5);
-        this->statsOverlayBorder_->setTopLeftBorderUV(0.0, 0.0, 0.5, 0.5);
-        this->statsOverlayBorder_->setTopRightBorderUV(0.5, 0.0, 1.0, 0.5);
-        this->statsOverlayBorder_->setLeftBorderUV(0.0, 0.49, 0.5, 0.51);
-        this->statsOverlayBorder_->setRightBorderUV(0.5, 0.49, 1.0, 0.5);
-        this->statsOverlayBorder_->setBottomBorderUV(0.49, 0.5, 0.51, 1.0);
-        this->statsOverlayBorder_->setBottomLeftBorderUV(0.0, 0.5, 0.5, 1.0);
-        this->statsOverlayBorder_->setBottomRightBorderUV(0.5, 0.5, 1.0, 1.0);
+        this->statsOverlayBorder_->setTopBorderUV(0.49f, 0.0f, 0.51f, 0.5f);
+        this->statsOverlayBorder_->setTopLeftBorderUV(0.0f, 0.0f, 0.5f, 0.5f);
+        this->statsOverlayBorder_->setTopRightBorderUV(0.5f, 0.0f, 1.0f, 0.5f);
+        this->statsOverlayBorder_->setLeftBorderUV(0.0f, 0.49f, 0.5f, 0.51f);
+        this->statsOverlayBorder_->setRightBorderUV(0.5f, 0.49f, 1.0f, 0.5f);
+        this->statsOverlayBorder_->setBottomBorderUV(0.49f, 0.5f, 0.51f, 1.0f);
+        this->statsOverlayBorder_->setBottomLeftBorderUV(0.0f, 0.5f, 0.5f, 1.0f);
+        this->statsOverlayBorder_->setBottomRightBorderUV(0.5f, 0.5f, 1.0f, 1.0f);
 
         background_->addChild(statsOverlayBorder_);