Changeset 1042Tweet

Timestamp:

Sep 17, 2006, 2:48:30 AM (15 years ago)

Author:

Sam Hocevar

Message:

• More cleanup in cacademo.c.

File:

• libcaca/trunk/src/cacademo.c (modified) (4 diffs)

libcaca/trunk/src/cacademo.c

@@ -32 +32 @@
 enum action { PREPARE, INIT, UPDATE, RENDER, FREE };
 
-void transition(cucul_canvas_t *mask, int tmode, float time);
+void transition(cucul_canvas_t *, int, int);
 void plasma(enum action, cucul_canvas_t *);
 void metaballs(enum action, cucul_canvas_t *);
@@ -169 +169 @@
             cucul_set_color(mask, CUCUL_COLOR_WHITE, CUCUL_COLOR_WHITE);
             transition(mask, tmode,
-                          (float)(frame - next_transition) / TRANSITION_FRAMES * 3.0f / 4.0f);
+                       100 * (frame - next_transition) / TRANSITION_FRAMES);
             cucul_blit(frontcv, 0, 0, backcv, mask);
         }
@@ -193 +193 @@
 
 /* Transitions */
-void transition(cucul_canvas_t *mask, int tmode, float time)
+void transition(cucul_canvas_t *mask, int tmode, int completed)
 {
     static float const star[] =
@@ -210 +210 @@
     static float star_rot[sizeof(star)/sizeof(*star)];
 
-    float mulx = time * cucul_get_canvas_width(mask);
-    float muly = time * cucul_get_canvas_height(mask);
+    float mulx = 0.0075f * completed * cucul_get_canvas_width(mask);
+    float muly = 0.0075f * completed * cucul_get_canvas_height(mask);
     int w2 = cucul_get_canvas_width(mask) / 2;
     int h2 = cucul_get_canvas_height(mask) / 2;
-    float angle = (time*360)*3.14/180, x,y;
+    float angle = (0.0075f * completed * 360) * 3.14 / 180, x, y;
     unsigned int i;