Changeset 1041Tweet

Timestamp:

Sep 17, 2006, 2:32:23 AM (14 years ago)

Author:

Sam Hocevar

Message:

• Cosmetic changes to cacademo.

File:

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

libcaca/trunk/src/cacademo.c

@@ -32 +32 @@
 enum action { PREPARE, INIT, UPDATE, RENDER, FREE };
 
-void do_transition(cucul_canvas_t *mask, int transition, float time);
+void transition(cucul_canvas_t *mask, int tmode, float time);
 void plasma(enum action, cucul_canvas_t *);
 void metaballs(enum action, cucul_canvas_t *);
@@ -74 +74 @@
     int demo, next = -1, pause = 0, next_transition = DEMO_FRAMES;
     unsigned int i;
-    int transition = cucul_rand(0, TRANSITION_COUNT);
+    int tmode = cucul_rand(0, TRANSITION_COUNT);
 
     /* Set up two canvases, a mask, and attach a display to the front one */
@@ -150 +150 @@
             next = -1;
             next_transition = frame + DEMO_FRAMES;
+            tmode = cucul_rand(0, TRANSITION_COUNT);
         }
 
@@ -167 +168 @@
             cucul_clear_canvas(mask);
             cucul_set_color(mask, CUCUL_COLOR_WHITE, CUCUL_COLOR_WHITE);
-            do_transition(mask,
-                          transition,
+            transition(mask, tmode,
                           (float)(frame - next_transition) / TRANSITION_FRAMES * 3.0f / 4.0f);
             cucul_blit(frontcv, 0, 0, backcv, mask);
-        } else {
-            transition = cucul_rand(0, TRANSITION_COUNT);
         }
 
@@ -195 +193 @@
 
 /* Transitions */
-void do_transition(cucul_canvas_t *mask, int transition, float time)
+void transition(cucul_canvas_t *mask, int tmode, float time)
 {
     static float const star[] =
@@ -219 +217 @@
     unsigned int i;
 
-    switch(transition)
+    switch(tmode)
     {
         case TRANSITION_STAR: