Changeset 3289 for code/branches/netp6/src/core

Timestamp:

Jul 14, 2009, 10:09:12 AM (15 years ago)

Author:

scheusso

Message:

a fix in Clock (more ogre-overflow safe now)
moved framerate control from gsdedicated to game
desired framerate can be controlled by config value FPSLimit_ (in the Game class) now

Location:

code/branches/netp6/src/core

Files:

• Clock.cc (modified) (2 diffs)
• Game.cc (modified) (3 diffs)
• Game.h (modified) (1 diff)

code/branches/netp6/src/core/Clock.cc

@@ -59 +59 @@
         tickDtFloat_ = static_cast<float>(tickDt_) / 1000000.0f;
 
-        if (timersTime > 0x7FFFFFF0)
+        if (timersTime > 0xFFFFFFFF/4)
         {
             // Ogre timer will overflow at 2^32 microseconds if unsigned long is 32 bit
@@ -74 +74 @@
     unsigned long long Clock::getRealMicroseconds() const
     {
-        return this->timer_->getMicroseconds();
+        return this->timer_->getMicroseconds() + this->storedTime_;
     }
 }

code/branches/netp6/src/core/Game.cc

@@ -40 +40 @@
 #include "util/Debug.h"
 #include "util/Exception.h"
+#include "util/Sleep.h"
 #include "util/SubString.h"
 #include "Clock.h"
@@ -120 +121 @@
         SetConfigValue(levelName_, "presentation_dm.oxw")
             .description("Sets the preselection of the level in the main menu.");
+      SetConfigValue(FPSLimit_, 50)
+            .description("Sets the desired framerate (0 for no limit).");
     }
 
@@ -156 +159 @@
         while (!this->abort_ && !this->activeStates_.empty())
         {
+            uint64_t currentTime = this->gameClock_->getRealMicroseconds();
+
+            uint64_t nextTickTime = statisticsTickTimes_.back().tickTime + 1000000.f/this->FPSLimit_;
+            if( currentTime < nextTickTime )
+            {
+                usleep( nextTickTime - currentTime );
+                continue;
+            }
             this->gameClock_->capture();
-            uint64_t currentTime = this->gameClock_->getMicroseconds();
 
             // STATISTICS

code/branches/netp6/src/core/Game.h

@@ -131 +131 @@
         unsigned int                    statisticsRefreshCycle_;
         unsigned int                    statisticsAvgLength_;
+        unsigned int                    FPSLimit_;
         std::string                     levelName_;