Changeset 616 for libcaca/trunk/src/cacaball.cTweet

Timestamp:

Mar 15, 2006, 2:06:25 PM (14 years ago)

Author:

Jean-Yves Lamoureux

Message:

• Optimised cacaballs a bit

File:

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

libcaca/trunk/src/cacaball.c

@@ -50 +50 @@
     float i = 10.0, j = 17.0, k = 11.0;
     int p, frame = 0, pause = 0;
+    double frameOffset[360+80];
+    double frameOffset40[360];
+    double frameOffset80[360];
 
     qq = cucul_init();
@@ -81 +84 @@
     }
 
+    for(frame = 0; frame<360; frame++) {
+        frameOffset[frame] = frame * M_PI / 60;
+        frameOffset40[frame] = (frame + 40) * M_PI / 60;
+        frameOffset80[frame] = (frame + 80) * M_PI / 60;
+    }
+
+
     /* Go ! */
     for(;;)
@@ -94 +104 @@
 
         frame++;
+        if(frame>=360)
+            frame=0;
 
         /* Crop the palette */
@@ -99 +111 @@
         {
             int t1, t2, t3;
-            t1 = p < 0x40 ? 0 : p < 0xc0 ? (p - 0x40) * 0x20 : 0xfff;
+            double c1 = 1.0 + sin((double)frameOffset[frame]);
+            double c2 = 1.0 + sin((double)frameOffset40[frame]);
+            double c3 = 1.0 + sin((double)frameOffset80[frame]);
+
+
+            t1 = p < 0x40 ? 0 : p < 0xc0 ? (p - 0x40) * 0x20 : 0xfff;
             t2 = p < 0xe0 ? 0 : (p - 0xe0) * 0x80;
             t3 = p < 0x40 ? p * 0x40 : 0xfff;
-
-            r[p] = (1.0 + sin((double)frame * M_PI / 60)) * t1 / 4
-                 + (1.0 + sin((double)(frame + 40) * M_PI / 60)) * t2 / 4
-                 + (1.0 + sin((double)(frame + 80) * M_PI / 60)) * t3 / 4;
-            g[p] = (1.0 + sin((double)frame * M_PI / 60)) * t2 / 4
-                 + (1.0 + sin((double)(frame + 40) * M_PI / 60)) * t3 / 4
-                 + (1.0 + sin((double)(frame + 80) * M_PI / 60)) * t1 / 4;
-            b[p] = (1.0 + sin((double)frame * M_PI / 60)) * t3 / 4
-                 + (1.0 + sin((double)(frame + 40) * M_PI / 60)) * t1 / 4
-                 + (1.0 + sin((double)(frame + 80) * M_PI / 60)) * t2 / 4;
-        }
+            t1/=4; t2/=4; t3/=4;
+
+
+            r[p] = c1 * t1
+                 + c2 * t2
+                 + c3 * t3;
+            g[p] = c1 * t2
+                 + c2 * t3
+                 + c3 * t1;
+            b[p] = c1 * t3
+                 + c2 * t1
+                 + c3 * t2;
+        }
+
 
         /* Set the palette */