Changeset 178 for ttyvadersTweet

Timestamp:

Nov 14, 2003, 8:00:07 PM (20 years ago)

Author:

Sam Hocevar

Message:

• libee/ee.c: + Implemented correct framerate wait loop. + No framedropping yet.
• test/demo.c src/main.c: + Set an arbitrary framerate for demos.

Location:

ttyvaders/trunk

Files:

• libee/ee.c (modified) (3 diffs)
• src/main.c (modified) (1 diff)
• test/demo.c (modified) (1 diff)

ttyvaders/trunk/libee/ee.c

@@ -191 +191 @@
 }
 
-void ee_set_delay(int usec)
-{
-    _ee_delay = usec;
-}
-
 int ee_get_width(void)
 {
@@ -218 +213 @@
 }
 
-#if !defined(USE_CONIO)
-static int64_t local_time(void)
-{
+void ee_set_delay(int usec)
+{
+    _ee_delay = usec;
+}
+
+static unsigned int _ee_getticks(void)
+{
+    static unsigned int last_sec = 0, last_usec = 0;
+
     struct timeval tv;
-    int64_t now;
+    unsigned int ticks = 0;
 
     gettimeofday(&tv, NULL);
-    now = tv.tv_sec;
-    now *= 1000000;
-    now += tv.tv_usec;
-    return now;
-}
-#endif
+
+    if(last_sec != 0)
+    {
+        ticks = (tv.tv_sec - last_sec) * 1000000 + (tv.tv_usec - last_usec);
+    }
+
+    last_sec = tv.tv_sec;
+    last_usec = tv.tv_usec;
+
+    return ticks;
+}
 
 void ee_refresh(void)
 {
-#if !defined(USE_CONIO)
-    static int64_t local_clock = 0;
-    int64_t now;
-
-    if(!local_clock)
-    {
-        /* Initialize local_clock */
-        local_clock = local_time();
-    }
-
-    if(local_time() > local_clock + 10000)
-    {
-        /* If we are late, we shouldn't display anything */
-    }
-#endif
+    static int lastticks = 0;
+    unsigned int ticks = lastticks + _ee_getticks();
 
 #if defined(USE_SLANG)
@@ -262 +255 @@
 #endif
 
-#if !defined(USE_CONIO)
-    now = local_time();
-
-    if(now < local_clock + _ee_delay - 10000)
-    {
-        usleep(local_clock + _ee_delay - 10000 - now);
-    }
-
-    local_clock += _ee_delay;
-#else
-    delay(5);
-#endif
+    /* Wait until _ee_delay + time of last call */
+    for(ticks += _ee_getticks(); ticks < _ee_delay; ticks += _ee_getticks())
+        usleep(10000);
+
+    lastticks = ticks - _ee_delay;
+
+    /* If we drifted too much, it's bad, bad, bad. */
+    if(lastticks > _ee_delay)
+        lastticks = 0;
 }
 

ttyvaders/trunk/src/main.c

@@ -46 +46 @@
         return 1;
     }
+
+    ee_set_delay(100000);
 
     /* Initialize our program */

ttyvaders/trunk/test/demo.c

@@ -56 +56 @@
     }
 
+    ee_set_delay(40000);
+
     /* Initialize data */
     sprite = ee_load_sprite("data/barboss.txt");