Changeset 7159 in orxonox.OLD

Timestamp:

Feb 18, 2006, 1:50:59 AM (18 years ago)

Author:

bensch

Message:

better tick in framework

Location:

trunk/src/subprojects

Files:

• framework.cc (modified) (2 diffs)
• framework.h (modified) (2 diffs)

trunk/src/subprojects/framework.cc

@@ -66 +66 @@
 {
   Framework* framework = Framework::getInstance();
+
+  // initialize Timing
+  framework->cycle = 0;
+  for (unsigned int i = 0; i < TICK_SMOOTH_VALUE; i++)
+    framework->frameTimes[i] = 100;
+  framework->dtS = 0.0f;
+  framework->lastFrame = SDL_GetTicks ();
+
+
   while(!framework->isFinished)
     {
@@ -103 +112 @@
 float Framework::tick()
 {
-  currFrame = SDL_GetTicks();
-  float dt = (float)(currFrame - lastFrame) / 1000.0;
-  lastFrame = currFrame;
-  this->camera->tick(dt);
-
-  this->moduleTick(dt);
-
-  return dt;
+      // CALCULATE FRAMERATE
+  Uint32 frameTimesIndex;
+  Uint32 getTicks;
+  Uint32 i;
+
+  frameTimesIndex = this->cycle % TICK_SMOOTH_VALUE;
+  getTicks = SDL_GetTicks();
+  this->frameTimes[frameTimesIndex] = getTicks - this->lastFrame;
+  this->lastFrame = getTicks;
+  ++this->cycle;
+  this->dtS = 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->camera->tick(dtS);
+
+  this->moduleTick(dtS);
+
+  return dtS;
 }
 

trunk/src/subprojects/framework.h

@@ -12 +12 @@
 
 #define MOUSE_BUTTON_COUNT 3
+
+#define TICK_SMOOTH_VALUE 10
 
 class Camera;
@@ -59 +61 @@
     float                       backgroundColor[4];
 
-    Uint32                      lastFrame;
-    Uint32                      currFrame;
+    /* world timing */
+    Uint32              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.
 
     Uint8*                      keys;        // This variable will be used in the keyboard routine