Changeset 2254 for libcaca/trunk/src/cacademo.cTweet

Timestamp:

Mar 2, 2008, 3:27:43 PM (15 years ago)

Author:

Jean-Yves Lamoureux

Message:

• Fixed line transitions (both vertical and horizontal ones)

File:

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

libcaca/trunk/src/cacademo.c

@@ -231 +231 @@
     float angle = (0.0075f * completed * 360) * 3.14 / 180, x, y;
     unsigned int i;
+    int w = cucul_get_canvas_width(mask);
+    int h = cucul_get_canvas_height(mask);
 
     switch(tmode)
@@ -294 +296 @@
             for(i = 0; i < 8; i++)
             {
-                int w = cucul_get_canvas_width(mask);
-                int h = cucul_get_canvas_height(mask);
-                int z = ((i & 1) ? h : -h) * (100 - completed) / 100;
-
-                cucul_fill_box(mask, i * w / 8, z, (i + 1) * w / 8, z + h, '#');
+                int z = ((i & 1) ? w : (-w)/2) * (100 - completed) / 100;
+                cucul_fill_box(mask, i * w / 8, z ,  (w / 8) + 1, z + h, '#');
             }
             break;
 
         case TRANSITION_HLINES:
+
             for(i = 0; i < 6; i++)
             {
-                int w = cucul_get_canvas_width(mask);
-                int h = cucul_get_canvas_height(mask);
-                int z = ((i & 1) ? w : -w) * (100 - completed) / 100;
-
-                cucul_fill_box(mask, z, i * h / 6, z + w, (i + 1) * h / 6, '#');
+                int z = ((i & 1) ? w : (-w)/2) * (100 - completed) / 100;
+                cucul_fill_box(mask, z, i * h / 6, z + w, (h / 6) + 1, '#');
             }
             break;