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

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

Files:

• TextureGenerator.cc (modified) (1 diff)
• Timer.h (modified) (1 diff)

code/trunk/src/orxonox/tools/TextureGenerator.cc

@@ -73 +73 @@
         {
             std::string materialName = textureName + "_Material_" + 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);
             Ogre::TextureUnitState* textureUnitState = material->getTechnique(0)->getPass(0)->createTextureUnitState();

code/trunk/src/orxonox/tools/Timer.h

@@ -100 +100 @@
             /** @brief Returns the remaining time until the Timer calls the function. @return The remaining time */
             inline float getRemainingTime() const
-                { return (float)this->time_ / 1000000.0f; }
+                { return static_cast<float>(this->time_ / 1000000.0f); }
             /** @brief Gives the Timer some extra time. @param time The amount of extra time in seconds */
             inline void addTime(float time)