Changeset 577Tweet

Timestamp:

May 3, 2011, 3:02:52 PM (11 years ago)

Author:

Sam Hocevar

Message:

game: get rid of milli_wait() and rewrite the fixed framerate handling.

Location:

abuse/trunk/src

Files:

• ant.cpp (modified) (1 diff)
• cop.cpp (modified) (1 diff)
• demo.cpp (modified) (1 diff)
• game.cpp (modified) (9 diffs)
• imlib/timing.h (modified) (1 diff)
• menu.cpp (modified) (2 diffs)
• netcfg.cpp (modified) (1 diff)
• sdlport/event.cpp (modified) (1 diff)
• sdlport/timing.cpp (modified) (1 diff)

abuse/trunk/src/ant.cpp

@@ -481 +481 @@
     wm->font()->put_string(screen,x,y,msg,wm->bright_color());
     wm->flush_screen();
-    milli_wait(500);
-  }
-
-}
+    Timer now; now.WaitMs(500);
+  }
+}
+

abuse/trunk/src/cop.cpp

@@ -1082 +1082 @@
 
   wm->flush_screen();
-  milli_wait(4000);   // wait 4 seconds
+  Timer now; now.WaitMs(4000);   // wait 4 seconds
 
   return NULL;

abuse/trunk/src/demo.cpp

@@ -203 +203 @@
 /*
       fade_in(cache.img(cache.reg("art/help.spe","sell6",SPEC_IMAGE,1)),8);
-      milli_wait(2000);
+      Timer now; now.WaitMs(2000);
       fade_out(8);
 */

abuse/trunk/src/game.cpp

@@ -1244 +1244 @@
     delete blank;
     fade_in(cache.img(cdc_logo), 32);
-
-    milli_wait(400);
+    Timer tmp; tmp.WaitMs(400);
+    fade_out(32);
 
     void *space_snd = LSymbol::FindOrCreate("SPACE_SND")->GetValue();
-
-    fade_out(32);
-    milli_wait(100);
-
     char *str = lstring_value(LSymbol::FindOrCreate("plot_start")->Eval());
 
@@ -1511 +1507 @@
 }
 
-
-
-time_marker *led_last_time = NULL, *fps_mark_start = NULL;
-double avg_fps = 15.0, possible_fps = 15.0;
+time_marker *led_last_time = NULL;
+static float avg_fps = 15.0f, possible_fps = 15.0f;
 
 void Game::toggle_delay()
 {
-  no_delay=!no_delay;
-  if(no_delay)
-    show_help(symbol_str("delay_off"));
-  else show_help(symbol_str("delay_on"));
-  avg_fps = possible_fps = 15.0;
+    no_delay = !no_delay;
+    show_help(symbol_str(no_delay ? "delay_off" : "delay_on"));
+    avg_fps = possible_fps = 15.0f;
 }
 
 void Game::show_time()
 {
-  if(first_view && fps_on)
-  {
-    char str[10];
+    if (!first_view || !fps_on)
+        return;
+
+    char str[16];
     sprintf(str, "%ld", (long)(avg_fps * 10.0));
     console_font->put_string(screen, first_view->cx1, first_view->cy1, str);
@@ -1535 +1528 @@
     sprintf(str, "%d", total_active);
     console_font->put_string(screen, first_view->cx1, first_view->cy1 + 10, str);
-  }
 }
 
@@ -1600 +1592 @@
 }
 
+// FIXME: refactor this to use the Lol Engine main fixed-framerate loop?
 int Game::calc_speed()
 {
+    static Timer frame_timer;
+    static int first = 1;
+
+    if (first)
+    {
+        first = 0;
+        return 0;
+    }
+
+    // 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)
+        massive_frame_panic = Max(0, Min(20, massive_frame_panic - 1));
+
     int ret = 0;
-    if(fps_mark_start)
-    {
-        time_marker t;
-
-        // find average fps for last 10 frames
-        double td = t.diff_time(fps_mark_start);
-        if(td < 0.001)     // something is rotten in the state of demark
-            td = 0.001;
-
-        avg_fps = avg_fps * 9.0 / 10.0 + 1.0/(td * 10.0);
-        possible_fps = possible_fps * 9.0 / 10.0 + 1.0/(td * 10.0);
-
-        if(avg_fps > 14)
+
+    if (dev & EDIT_MODE)
+    {
+        // ECS - Added this case and the wait.  It's a cheap hack to ensure
+        // that we don't exceed 30FPS in edit mode and hog the CPU.
+        frame_timer.WaitMs(33);
+    }
+    else if (avg_fps > 15 && need_delay)
+    {
+        frame_panic = 0;
+        if (!no_delay)
         {
-            if(massive_frame_panic > 20)
-                massive_frame_panic = 20;
-            else if(massive_frame_panic)
-                massive_frame_panic--;
+            frame_timer.WaitMs(1000.0f / 15);
+            avg_fps -= 0.1f * fps;
+            avg_fps += 0.1f * 15.0f;
         }
-
-        if(avg_fps > 15 && ((dev & EDIT_MODE)==0 || need_delay))
-        {
-            frame_panic = 0;
-            int32_t stime=(int32_t)((1 / 15.0 - 1.0 / possible_fps)*1000.0);
-            if(stime > 0 && !no_delay)
-            {
-                milli_wait(stime);
-                avg_fps -= 1.0/(td * 10.0);   // subtract out old estimate
-
-                time_marker t;
-
-                // find average fps for last 10 frames
-                double td = t.diff_time(fps_mark_start);
-                if(td < 0.00001)     // something is rotten in the state of demark
-                    td = 0.00001;
-
-                avg_fps += 1.0/(td * 10.0);       // add in new estimate
-            }
-        }
-        else if(avg_fps < 14)
-        {
-            if(avg_fps < 10)
-                massive_frame_panic++;
-            frame_panic++;
-            ret = 1;
-        }
-        else if(dev & EDIT_MODE)
-        {
-            // ECS - Added this case and the wait.  It's a cheap hack to assure that
-            // we don't exceed 30FPS in edit mode and hog the CPU.
-            milli_wait(33);
-        }
-
-        delete fps_mark_start;
-    }
-    fps_mark_start = new time_marker;
+    }
+    else if (avg_fps < 14)
+    {
+        if(avg_fps < 10)
+            massive_frame_panic++;
+        frame_panic++;
+        // All is lost, don't sleep during this frame
+        ret = 1;
+    }
+
+    // Ignore our wait time, we're more interested in the frame time
+    frame_timer.GetMs();
     return ret;
 }
@@ -2119 +2102 @@
   }
   free_pframes();
-  if(fps_mark_start) delete fps_mark_start; fps_mark_start = NULL;
   delete pal;
   free(object_names);
@@ -2449 +2431 @@
 
     stat_man = new text_status_manager();
-    if (!get_option("-no_timer"))
-        timer_init();
 
 #if !defined __CELLOS_LV2__
@@ -2472 +2452 @@
         if (main_net_cfg && !main_net_cfg->notify_reset())
         {
-            if (!get_option("-no_timer"))
-                timer_uninit();
             sound_uninit();
             exit(0);
@@ -2575 +2553 @@
         delete chat;
 
-        milli_wait(500);
+        Timer tmp; tmp.WaitMs(500);
 
         delete small_render; small_render = NULL;
@@ -2622 +2600 @@
     set_save_filename_prefix(NULL);
 
-    if (!get_option("-no_timer"))
-        timer_uninit();
-
     sound_uninit();
 

abuse/trunk/src/imlib/timing.h

@@ -26 +26 @@
 };
 
-void milli_wait(unsigned int wait_time); // sleep for a millisecond
-void timer_init();
-void timer_uninit();
-
 #endif
 

abuse/trunk/src/menu.cpp

@@ -257 +257 @@
       wm->flush_screen();
       save->put_image(screen,mx+1,by1);
-    } else milli_wait(10);
+    } else { Timer tmp; tmp.WaitMs(10); }
 
   } while (!done);
@@ -694 +694 @@
         {
             // ECS - Added so that main menu doesn't grab 100% of CPU
-            milli_wait(30);
+            Timer tmp; tmp.WaitMs(30);
         }
 

abuse/trunk/src/netcfg.cpp

@@ -512 +512 @@
         else
         {
-            // No event waiting...  We can't wait for long, because we are pretending to broadcast.
-            milli_wait(5); // ECS - Added so waiting in dialog doesn't use 100% of CPU
+            // No event waiting...  We can't wait for long, because we are
+            // pretending to broadcast.
+            // ECS - Added so waiting in dialog doesn't use 100% of CPU
+            Timer tmp; tmp.WaitMs(5);
         }
     }

abuse/trunk/src/sdlport/event.cpp

@@ -136 +136 @@
 
         if (!ewaiting)
-            milli_wait( 1 );    // Sleep for 1 millisecond if there are no events
+        {
+            // Sleep for 1 millisecond if there are no events
+            Timer tmp; tmp.WaitMs(1);
+        }
     }
 

abuse/trunk/src/sdlport/timing.cpp

@@ -65 +65 @@
 }
 
-void timer_init()
-{
-    /* Do Nothing */
-}
-
-void timer_uninit()
-{
-    /* Do Nothing */
-}
-
-void milli_wait( unsigned wait_time )
-{
-    struct timespec ts = { 0, wait_time * 1000000 };
-    nanosleep( &ts, NULL );
-}
-