Changeset 7900 in orxonox.OLD

Timestamp:

May 27, 2006, 1:09:35 PM (18 years ago)

Author:

bensch

Message:

gui: implemented the timer right here. now we calc in microseconds

Location:

branches/gui/src

Files:

• lib/gui/gl_gui/glgui_inputline.cc (modified) (1 diff)
• lib/util/timer.cc (modified) (1 diff)
• lib/util/timer.h (modified) (1 diff)
• story_entities/game_world.cc (modified) (4 diffs)
• story_entities/game_world.h (modified) (1 diff)

branches/gui/src/lib/gui/gl_gui/glgui_inputline.cc

@@ -48 +48 @@
 
     this->setFocusable(true);
-    this->setClickable(true);
 
     this->text.setParent2D(this);

branches/gui/src/lib/util/timer.cc

@@ -12 +12 @@
 #include <sys/time.h>
 
-
+/**
+ * @returns the current time in Second exact to the micro-second
+ */
 double Timer::getNow() {
 

branches/gui/src/lib/util/timer.h

@@ -13 +13 @@
 class Timer
 {
+public:
   static double getNow();
 

branches/gui/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;
 }
 

branches/gui/src/story_entities/game_world.h

@@ -93 +93 @@
 
     /* world timing */
-    Uint32              lastFrame;                    //!< last time of frame (in MiliSeconds)
+    double              lastFrame;                    //!< last time of frame (in MiliSeconds)
     Uint32              cycle;                        //!< The cycle we are in (starts with 0 and rises with every frame)
     float               dtS;                          //!< The time needed for caluculations in seconds
     float               speed;                        //!< how fast the game flows
     double              gameTime;                     //!< this is where the game time is saved
-    Uint32              frameTimes[TICK_SMOOTH_VALUE];//!< The time used for the last TICK_SMOOTH_VALUE's frames.
+    double              frameTimes[TICK_SMOOTH_VALUE];//!< The time used for the last TICK_SMOOTH_VALUE's frames.
 
     GameRules*          gameRules;                    //!< Pointer to the data structure containig the game rules