Changeset 576Tweet

Timestamp:

May 2, 2011, 2:28:20 PM (6 years ago)

Author:

sam

Message:

game: properly time the fade in and fade out effects, as well as the
introduction scrolling.

File:

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

abuse/trunk/src/game.cpp

@@ -1162 +1162 @@
 extern int start_doubled;
 
-static template<int N> Fade(image *im, int steps)
-{
+template<int N> static void Fade(image *im, int steps)
+{
+    /* 25ms per step */
+    float const duration = 25.f;
+
     palette *old_pal = pal->copy();
 
@@ -1173 +1176 @@
     }
 
-    for (int i = 0; i < steps; i++)
-    {
+    for (Timer total; total.PollMs() < duration * steps; )
+    {
+        Timer frame;
         uint8_t *sl1 = (uint8_t *)pal->addr();
         uint8_t *sl2 = (uint8_t *)old_pal->addr();
+        int i = (int)(total.PollMs() / duration);
         int v = (N ? i + 1 : steps - i) * 256 / steps;
-        for (int j = 0; j < 256; j++)
-        {
-            *sl1 = (int)*sl2++ * v / 256;
-            *sl1 = (int)*sl2++ * v / 256;
-            *sl1 = (int)*sl2++ * v / 256;
-        }
+
+        for (int j = 0; j < 3 * 256; j++)
+            *sl1++ = (int)*sl2++ * v / 256;
+
         pal->load();
         wm->flush_screen();
-        milli_wait(25);
+        frame.WaitMs(duration);
     }
 
@@ -1201 +1204 @@
 void fade_in(image *im, int steps)
 {
-    Fade<1>(NULL, steps);
+    Fade<1>(im, steps);
 }
 
@@ -1249 +1252 @@
     milli_wait(100);
 
-    int i;
     char *str = lstring_value(LSymbol::FindOrCreate("plot_start")->Eval());
 
@@ -1264 +1266 @@
 
         char nm[20];
-        for(i = 0; i < 5; i++)
+        for (int i = 0; i < 5; i++)
         {
             sprintf(nm, "smoke%04d.pcx", i + 1);
@@ -1279 +1281 @@
         fade_in(NULL, 16);
         uint8_t cmap[32];
-        for(i = 0; i < 32; i++)
+        for(int i = 0; i < 32; i++)
         cmap[i] = pal->find_closest(i * 256 / 32, i * 256 / 32, i * 256 / 32);
 
         event ev;
         ev.type = EV_SPURIOUS;
-        time_marker start;
-
-        for(i = 0; i < 320 && (ev.type != EV_KEY && ev.type != EV_MOUSE_BUTTON); i++)
-        {
+        Timer total;
+
+        while (ev.type != EV_KEY && ev.type != EV_MOUSE_BUTTON)
+        {
+            Timer frame;
+
+            // 100 ms per step
+            int i = (int)(total.PollMs() / 100.f);
+            if (i >= 320)
+                break;
+
             gray->put_image(screen, dx, dy);
             smoke[i % 5]->put_image(screen, dx + 24, dy + 5);
@@ -1294 +1303 @@
             time_marker now;
 
-            while(now.diff_time(&start) < 0.18)
-            {
-                milli_wait(20); // ECS - Added the wait, so CPU utilization stays low during the story
-                now.get_time();
-            }
-
-            start.get_time();
-
             while(wm->event_waiting() && ev.type != EV_KEY)
-            {
                 wm->get_event(ev);
-            }
+
             if((i % 5) == 0 && DEFINEDP(space_snd) && (sound_avail & SFX_INITIALIZED))
-            {
                 cache.sfx(lnumber_value(space_snd))->play(sfx_volume * 90 / 127);
-            }
+
+            frame.WaitMs(25.f);
         }
 
@@ -1316 +1316 @@
         fade_out(16);
 
-        for(i = 0; i < 5; i++)
+        for (int i = 0; i < 5; i++)
             delete smoke[i];
         delete gray;