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

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/stats

Files:

• CreateLines.cc (modified) (1 diff)
• Scoreboard.cc (modified) (1 diff)
• Stats.cc (modified) (1 diff)

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_);