Changeset 603Tweet

Timestamp:

May 8, 2011, 5:32:24 PM (12 years ago)

Author:

Sam Hocevar

Message:

game: refactor the framerate logic so that it predicts framerate based
on time averages rather than frames per second averages.

File:

• abuse/trunk/src/game.cpp (modified) (6 diffs)

abuse/trunk/src/game.cpp

@@ -1509 +1509 @@
 
 time_marker *led_last_time = NULL;
-static float avg_fps = 15.0f, possible_fps = 15.0f;
+static float avg_ms = 1000.0f / 15, possible_ms = 1000.0f / 15;
 
 void Game::toggle_delay()
@@ -1515 +1515 @@
     no_delay = !no_delay;
     show_help(symbol_str(no_delay ? "delay_off" : "delay_on"));
-    avg_fps = possible_fps = 15.0f;
+    avg_ms = possible_ms = 1000.0f / 15;
 }
 
@@ -1524 +1524 @@
 
     char str[16];
-    sprintf(str, "%ld", (long)(avg_fps * 10.0));
+    sprintf(str, "%ld", (long)(10000.0f / avg_ms));
     console_font->put_string(screen, first_view->cx1, first_view->cy1, str);
 
@@ -1606 +1606 @@
 
     // Find average fps for last 10 frames
-    float fps = 1000.0f / Max(1.0f, frame_timer.PollMs());
-
-    avg_fps = 0.9f * avg_fps + 0.1f * fps;
-    possible_fps = 0.9f * possible_fps + 0.1f * fps;
-
-    if (avg_fps > 14)
+    float deltams = Max(1.0f, frame_timer.PollMs());
+
+    avg_ms = 0.9f * avg_ms + 0.1f * deltams;
+    possible_ms = 0.9f * possible_ms + 0.1f * deltams;
+
+    if (avg_ms < 1000.0f / 14)
         massive_frame_panic = Max(0, Min(20, massive_frame_panic - 1));
 
@@ -1622 +1622 @@
         frame_timer.WaitMs(33);
     }
-    else if (avg_fps > 15 && need_delay)
+    else if (avg_ms < 1000.0f / 15 && need_delay)
     {
         frame_panic = 0;
@@ -1628 +1628 @@
         {
             frame_timer.WaitMs(1000.0f / 15);
-            avg_fps -= 0.1f * fps;
-            avg_fps += 0.1f * 15.0f;
+            avg_ms -= 0.1f * deltams;
+            avg_ms += 0.1f * 1000.0f / 15;
         }
     }
-    else if (avg_fps < 14)
-    {
-        if(avg_fps < 10)
+    else if (avg_ms > 1000.0f / 14)
+    {
+        if(avg_ms > 1000.0f / 10)
             massive_frame_panic++;
         frame_panic++;