Changeset 3289 for code/branches/netp6/src/orxonox/gamestates

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/orxonox/gamestates

Files:

• GSDedicated.cc (modified) (2 diffs)
• GSDedicated.h (modified) (1 diff)

code/branches/netp6/src/orxonox/gamestates/GSDedicated.cc

@@ -58 +58 @@
         : GameState(name)
         , server_(0)
-        , timeSinceLastUpdate_(0)
         , closeThread_(false)
         , cleanLine_(true)
@@ -109 +108 @@
     void GSDedicated::update(const Clock& time)
     {
-        timeSinceLastUpdate_ += time.getDeltaTime();
-        //if (timeSinceLastUpdate_ >= NETWORK_PERIOD)
-        {
-            timeSinceLastUpdate_ -= static_cast<unsigned int>(timeSinceLastUpdate_ / NETWORK_PERIOD) * NETWORK_PERIOD;
-            server_->update(time);
-        }
-        /*else
-        {
-            msleep(static_cast<unsigned int>((NETWORK_PERIOD - timeSinceLastUpdate_)*1000));
-            msleep(static_cast<unsigned int>(NETWORK_PERIOD*1000)); // NOTE: this is to throttle the non-network framerate
-//            COUT(0) << "sleeping for " << (int)((NETWORK_PERIOD - timeSinceLastUpdate_) * 1000 * 1000) << " usec" << endl;
-        }*/
+        server_->update(time);
         processQueue();
         printLine();

code/branches/netp6/src/orxonox/gamestates/GSDedicated.h

@@ -66 +66 @@
         
         Server*                 server_;
-        float                   timeSinceLastUpdate_;
         
         boost::thread           *inputThread_;