Changeset 7919 in orxonox.OLD for trunk/src/story_entities/game_world.cc

Timestamp:

May 28, 2006, 3:48:13 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the gui branche back
merged with command:
​https://svn.orxonox.net/orxonox/branches/gui
no conflicts

File:

• trunk/src/story_entities/game_world.cc (modified) (5 diffs)

trunk/src/story_entities/game_world.cc

@@ -25 +25 @@
 
 #include "util/loading/game_loader.h"
+#include "util/timer.h"
 
 #include "player.h"
@@ -259 +260 @@
   this->cycle = 0;
   for (unsigned int i = 0; i < TICK_SMOOTH_VALUE; i++)
-    this->frameTimes[i] = 100;
+    this->frameTimes[i] = 0.01f;
   this->dtS = 0.0f;
-  this->lastFrame = SDL_GetTicks ();
+  this->lastFrame = Timer::getNow();
 
   if (this->dataTank->music != NULL)
@@ -356 +357 @@
 void GameWorld::tick ()
 {
-  Uint32 currentFrame = SDL_GetTicks();
-
   if( !this->bPaused)
   {
     // CALCULATE FRAMERATE
     Uint32 frameTimesIndex;
-    Uint32 getTicks;
     Uint32 i;
+    double currentFrame = Timer::getNow();
 
     frameTimesIndex = this->cycle % TICK_SMOOTH_VALUE;
-    getTicks = SDL_GetTicks();
-    this->frameTimes[frameTimesIndex] = getTicks - this->lastFrame;
-    this->lastFrame = getTicks;
+    this->frameTimes[frameTimesIndex] = currentFrame - this->lastFrame;
+    this->lastFrame = currentFrame;
     ++this->cycle;
-    this->dtS = 0;
+    this->dtS = 0.0;
     for (i = 0; i < TICK_SMOOTH_VALUE; i++)
       this->dtS += this->frameTimes[i];
-    this->dtS = this->dtS / TICK_SMOOTH_VALUE / 1000.0f * speed;
+    this->dtS = this->dtS / TICK_SMOOTH_VALUE * speed;
 
     // TICK everything
@@ -390 +388 @@
       this->dataTank->gameRule->tick(this->dtS);
   }
-  this->lastFrame = currentFrame;
 }
 
@@ -526 +523 @@
   GraphicsEngine* engine = GraphicsEngine::getInstance();
 
+
   AtmosphericEngine::getInstance()->draw();
+
+  //glEnable(GL_DEPTH_TEST);
+  //glEnable(GL_LIGHTING);
 
   // set camera