Changeset 1043 for libcaca/trunk/srcTweet

Timestamp:

Sep 17, 2006, 2:53:48 AM (14 years ago)

Author:

Sam Hocevar

Message:

• Got rid of OFFSET_X and OFFSET_Y.

File:

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

libcaca/trunk/src/cacademo.c

@@ -61 +61 @@
 #define YSIZ 256
 
-#define OFFSET_X(i) (i*2)
-#define OFFSET_Y(i) (i*2)+1
-
 /* Global variables */
 static int frame = 0;
@@ -223 +220 @@
             for(i = 0; i < (sizeof(star) / sizeof(*star)) / 2; i++)
             {
-                x = star[OFFSET_X(i)];
-                y = star[OFFSET_Y(i)];
-
-                star_rot[OFFSET_X(i)] = x * cos(angle) - y * sin(angle);
-                star_rot[OFFSET_Y(i)] = y * cos(angle) + x * sin(angle);
+                x = star[i * 2];
+                y = star[i * 2 + 1];
+
+                star_rot[i * 2] = x * cos(angle) - y * sin(angle);
+                star_rot[i * 2 + 1] = y * cos(angle) + x * sin(angle);
             }
 
@@ -235 +232 @@
 #define DO_TRI(a, b, c) \
     cucul_fill_triangle(mask, \
-        star_rot[OFFSET_X(a)]*mulx+w2, star_rot[OFFSET_Y(a)]*muly+h2, \
-        star_rot[OFFSET_X(b)]*mulx+w2, star_rot[OFFSET_Y(b)]*muly+h2, \
-        star_rot[OFFSET_X(c)]*mulx+w2, star_rot[OFFSET_Y(c)]*muly+h2, "#")
+        star_rot[(a)*2] * mulx + w2, star_rot[(a)*2+1] * muly + h2, \
+        star_rot[(b)*2] * mulx + w2, star_rot[(b)*2+1] * muly + h2, \
+        star_rot[(c)*2] * mulx + w2, star_rot[(c)*2+1] * muly + h2, "#")
             DO_TRI(0, 1, 9);
             DO_TRI(1, 2, 3);