Changeset 3300 for code/trunk/src/orxonox/overlays

Timestamp:

Jul 17, 2009, 11:53:35 PM (15 years ago)

Author:

rgrieder

Message:

Found a few more C-Style casts.

Location:

code/trunk/src/orxonox/overlays

Files:

• GUIOverlay.cc (modified) (1 diff)
• OrxonoxOverlay.cc (modified) (2 diffs)
• console/InGameConsole.cc (modified) (3 diffs)
• hud/GametypeStatus.cc (modified) (1 diff)
• hud/HUDBar.cc (modified) (1 diff)
• hud/HUDHealthBar.cc (modified) (1 diff)
• hud/HUDTimer.cc (modified) (1 diff)
• map/Map.cc (modified) (3 diffs)

code/trunk/src/orxonox/overlays/GUIOverlay.cc

@@ -67 +67 @@
             std::string str;
             std::stringstream out;
-            out << (long)this;
+            out << static_cast<long>(this);
             str = out.str();
             GUIManager::getInstance().executeCode("showCursor()");

code/trunk/src/orxonox/overlays/OrxonoxOverlay.cc

@@ -215 +215 @@
             if (angle < 0.0)
                 angle = -angle;
-            angle -= 180.0f * (int)(angle / 180.0);
+            angle -= 180.0f * static_caste<int>(angle / 180.0);
 
             // take the reverse if angle is about 90 degrees
@@ -277 +277 @@
         if (angle < 0.0)
             angle = -angle;
-        angle -= Ogre::Math::PI * (int)(angle / (Ogre::Math::PI));
+        angle -= Ogre::Math::PI * static_cast<int>(angle / (Ogre::Math::PI));
         if (angle > Ogre::Math::PI * 0.5)
             angle = Ogre::Math::PI - angle;

code/trunk/src/orxonox/overlays/console/InGameConsole.cc

@@ -332 +332 @@
 
         this->consoleOverlayCursor_->setCaption(std::string(pos,' ') + cursorSymbol_);
-        this->consoleOverlayCursor_->setTop((int) this->windowH_ * this->relativeHeight - 24);
+        this->consoleOverlayCursor_->setTop(static_cast<int>(this->windowH_ * this->relativeHeight) - 24);
     }
 
@@ -416 +416 @@
         this->windowW_ = newWidth;
         this->windowH_ = newHeight;
-        this->consoleOverlayBorder_->setWidth((int) this->windowW_* this->relativeWidth);
-        this->consoleOverlayBorder_->setHeight((int) this->windowH_ * this->relativeHeight);
-        this->consoleOverlayNoise_->setWidth((int) this->windowW_ * this->relativeWidth - 10);
-        this->consoleOverlayNoise_->setHeight((int) this->windowH_ * this->relativeHeight - 5);
+        this->consoleOverlayBorder_->setWidth(static_cast<int>(this->windowW_* this->relativeWidth));
+        this->consoleOverlayBorder_->setHeight(static_cast<int>(this->windowH_ * this->relativeHeight));
+        this->consoleOverlayNoise_->setWidth(static_cast<int>(this->windowW_ * this->relativeWidth) - 10);
+        this->consoleOverlayNoise_->setHeight(static_cast<int>(this->windowH_ * this->relativeHeight) - 5);
         this->consoleOverlayNoise_->setTiling(consoleOverlayNoise_->getWidth() / (50.0f * this->noiseSize_), consoleOverlayNoise_->getHeight() / (50.0f * this->noiseSize_));
 
         // now adjust the text lines...
-        this->desiredTextWidth_ = (int) (this->windowW_ * this->relativeWidth) - 12;
+        this->desiredTextWidth_ = static_cast<int>(this->windowW_ * this->relativeWidth) - 12;
 
         if (LINES > 0)
-            this->maxCharsPerLine_ = std::max((unsigned int)10, (unsigned int) ((float)this->desiredTextWidth_ / CHAR_WIDTH));
+            this->maxCharsPerLine_ = std::max(10U, static_cast<unsigned int>(static_cast<float>(this->desiredTextWidth_) / CHAR_WIDTH));
         else
             this->maxCharsPerLine_ = 10;
@@ -433 +433 @@
         {
             this->consoleOverlayTextAreas_[i]->setWidth(this->desiredTextWidth_);
-            this->consoleOverlayTextAreas_[i]->setTop((int) this->windowH_ * this->relativeHeight - 24 - 14*i);
+            this->consoleOverlayTextAreas_[i]->setTop(static_cast<int>(this->windowH_ * this->relativeHeight) - 24 - 14*i);
         }
 

code/trunk/src/orxonox/overlays/hud/GametypeStatus.cc

@@ -70 +70 @@
             {
                 if (gtinfo->isStartCountdownRunning())
-                    this->setCaption(multi_cast<std::string>((int)ceil(gtinfo->getStartCountdown())));
+                    this->setCaption(multi_cast<std::string>(static_cast<int>(ceil(gtinfo->getStartCountdown()))));
                 else if (ce->isA(Class(Spectator)))
                     this->setCaption("Press [Fire] to respawn");

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

@@ -73 +73 @@
         // create new material
         std::string materialname = "barmaterial" + multi_cast<std::string>(materialcount_s++);
-        Ogre::MaterialPtr material = (Ogre::MaterialPtr)Ogre::MaterialManager::getSingleton().create(materialname, "General");
+        Ogre::MaterialPtr material = static_cast<Ogre::MaterialPtr>(Ogre::MaterialManager::getSingleton().create(materialname, "General"));
         material->getTechnique(0)->getPass(0)->setSceneBlending(Ogre::SBT_TRANSPARENT_ALPHA);
         this->textureUnitState_ = material->getTechnique(0)->getPass(0)->createTextureUnitState();

code/trunk/src/orxonox/overlays/hud/HUDHealthBar.cc

@@ -83 +83 @@
         {
             this->setValue(this->owner_->getHealth() / this->owner_->getInitialHealth());
-            this->textoverlay_->setCaption(multi_cast<std::string>((int)this->owner_->getHealth()));
+            this->textoverlay_->setCaption(multi_cast<std::string>(static_cast<int>(this->owner_->getHealth())));
         }
 

code/trunk/src/orxonox/overlays/hud/HUDTimer.cc

@@ -59 +59 @@
             if (gametype->getTimerIsActive())
             {
-                this->setCaption(multi_cast<std::string>((int)gametype->getTime() + 1));
+                this->setCaption(multi_cast<std::string>(static_cast<int>(gametype->getTime()) + 1));
             }
         }

code/trunk/src/orxonox/overlays/map/Map.cc

@@ -332 +332 @@
                 //this->CamNodeHelper_->attachObject(this->Cam_);
                     this->Cam_->setPosition(0, 0, DISTANCE);
-                    this->Cam_->pitch( (Degree)PITCH );
+                    this->Cam_->pitch( static_cast<Degree>(PITCH) );
                     this->Cam_->lookAt(Vector3(0,0,0));
                 //this->Cam_->setAutoTracking(true, this->playerShipNode_);
@@ -425 +425 @@
 
 /*
-        singletonMap_s->CamNode_->setOrientation(singletonMap_s->CamNode_->getOrientation() * Quaternion( (Degree)(-value.y * singletonMap_s->mouseLookSpeed_) , singletonMap_s->playerShipNode_->getLocalAxes().GetColumn(1) ));
+        singletonMap_s->CamNode_->setOrientation(singletonMap_s->CamNode_->getOrientation() * Quaternion( static_cast<Degree>(-value.y * singletonMap_s->mouseLookSpeed_) , singletonMap_s->playerShipNode_->getLocalAxes().GetColumn(1) ));
 
         Map::singletonMap_s->CamNodeHelper_->setDirection(Vector3::UNIT_Y, Ogre::Node::TS_PARENT, Vector3::UNIT_Y);
         Map::singletonMap_s->CamNodeHelper_->lookAt(Vector3(0,0,0), Ogre::Node::TS_PARENT);
 */
-        singletonMap_s->CamNode_->yaw( (Degree)(-value.y * singletonMap_s->mouseLookSpeed_), Ogre::Node::TS_PARENT);
+        singletonMap_s->CamNode_->yaw( static_cast<Degree>(-value.y * singletonMap_s->mouseLookSpeed_), Ogre::Node::TS_PARENT);
     }
 
@@ -437 +437 @@
         if(!( Map::singletonMap_s && Map::singletonMap_s->CamNode_ ))
             return;
-            //singletonMap_s->Cam_->setOrientation(singletonMap_s->Cam_->getOrientation() * Quaternion( (Degree)(-value.y * singletonMap_s->mouseLookSpeed_) , Vector3::UNIT_X));
-/*        singletonMap_s->CamNode_->setOrientation(singletonMap_s->CamNode_->getOrientation() * Quaternion( (Degree)(-value.y * singletonMap_s->mouseLookSpeed_) , singletonMap_s->playerShipNode_->getLocalAxes().GetColumn(0) ));
+            //singletonMap_s->Cam_->setOrientation(singletonMap_s->Cam_->getOrientation() * Quaternion( static_cast<Degree>(-value.y * singletonMap_s->mouseLookSpeed_) , Vector3::UNIT_X));
+/*        singletonMap_s->CamNode_->setOrientation(singletonMap_s->CamNode_->getOrientation() * Quaternion( static_cast<Degree>(-value.y * singletonMap_s->mouseLookSpeed_) , singletonMap_s->playerShipNode_->getLocalAxes().GetColumn(0) ));
 
         Map::singletonMap_s->CamNodeHelper_->setDirection(Vector3::UNIT_Y, Ogre::Node::TS_PARENT, Vector3::UNIT_Y);
         Map::singletonMap_s->CamNodeHelper_->lookAt(Vector3(0,0,0), Ogre::Node::TS_PARENT);
 */
-        singletonMap_s->CamNode_->pitch( (Degree)(value.y * singletonMap_s->mouseLookSpeed_), Ogre::Node::TS_LOCAL);
+        singletonMap_s->CamNode_->pitch( static_cast<Degree>(value.y * singletonMap_s->mouseLookSpeed_), Ogre::Node::TS_LOCAL);
 
     }