Changeset 6502 for code/trunk/src/libraries

Timestamp:

Mar 11, 2010, 11:34:20 AM (14 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/libraries

Files:

• core/GUIManager.cc (modified) (1 diff)
• core/Game.cc (modified) (2 diffs)
• core/GraphicsManager.cc (modified) (1 diff)
• util/Math.h (modified) (1 diff)

code/trunk/src/libraries/core/GUIManager.cc

@@ -145 +145 @@
 
         // Align CEGUI mouse with OIS mouse
-        guiSystem_->injectMousePosition(mousePosition.first, mousePosition.second);
+        guiSystem_->injectMousePosition((float)mousePosition.first, (float)mousePosition.second);
 
         // Hide the mouse cursor unless playing in full screen mode

code/trunk/src/libraries/core/Game.cc

@@ -284 +284 @@
         uint64_t currentTime = gameClock_->getMicroseconds();
         uint64_t currentRealTime = gameClock_->getRealMicroseconds();
-        this->statisticsTickTimes_.back().tickLength += currentRealTime - currentTime;
-        this->periodTickTime_ += currentRealTime - currentTime;
+        this->statisticsTickTimes_.back().tickLength += (uint32_t)(currentRealTime - currentTime);
+        this->periodTickTime_ += (uint32_t)(currentRealTime - currentTime);
         if (this->periodTime_ > this->statisticsRefreshCycle_)
         {
@@ -318 +318 @@
         while (currentRealTime < nextTime - minimumSleepTime_)
         {
-            usleep(nextTime - currentRealTime);
+            usleep((unsigned long)(nextTime - currentRealTime));
             currentRealTime = gameClock_->getRealMicroseconds();
         }
         // Integrate excess to avoid steady state error
-        excessSleepTime_ = currentRealTime - nextTime;
+        excessSleepTime_ = (int)(currentRealTime - nextTime);
         // Anti windup
         if (excessSleepTime_ > 50000) // 20ms is about the maximum time Windows would sleep for too long

code/trunk/src/libraries/core/GraphicsManager.cc

@@ -366 +366 @@
         uint64_t timeAfterTick = time.getRealMicroseconds();
         // Subtract the time used for rendering from the tick time counter
-        Game::getInstance().subtractTickTime(timeAfterTick - timeBeforeTick);
+        Game::getInstance().subtractTickTime((int32_t)(timeAfterTick - timeBeforeTick));
 
         // again, just to be sure OGRE works fine

code/trunk/src/libraries/util/Math.h

@@ -79 +79 @@
     inline T sgn(T x)
     {
-        return (x >= 0) ? 1 : -1;
+        return (x >= 0) ? (T)1 : (T)-1;
     }