Changeset 486

Timestamp:

10/15/07 04:51:18 (11 months ago)

Author:

krobillard

Message:

Animate now handles 'loop behavior.

Location:

trunk/thune/gl

Files:

• draw_list.c (modified) (1 diff)
• gx.c (modified) (5 diffs)
• scripts/cloud.t (modified) (1 diff)

trunk/thune/gl/draw_list.c

@@ -1197 +1197 @@
                 break;
 
-            case DOP_IMAGE:                 // image [x,y] texture
+            case DOP_IMAGE:                 // image[/trans] [x,y] texture
             {
                 GLfloat x, y;

trunk/thune/gl/gx.c

@@ -29 +29 @@
 #include "glh.h"
 #include "gx.h"
+#include "urlan_atoms.h"
 #include "gx_atoms.h"
 #include "audio.h"
@@ -1383 +1384 @@
     }
 
+    behav = vc + CI_ANIM_BEHAVIOR;
+    if( ur_is(behav, UT_NONE) )     // Return early if inactive
+        return 1;
+
     curve = vc + CI_ANIM_CURVE;
     if( ! ur_is(curve, UT_BLOCK) )
@@ -1397 +1402 @@
     }
 
-    behav = vc + CI_ANIM_BEHAVIOR;
+    period = ur_decimal(vc + CI_ANIM_PERIOD);
+    timec = vc + CI_ANIM_TIME;
+
     if( ur_is(behav, UT_INT) )
     {
-        period = ur_decimal(vc + CI_ANIM_PERIOD);
-
-        timec = vc + CI_ANIM_TIME;
         dt += ur_decimal(timec);
         if( dt > period )
@@ -1417 +1421 @@
             }
         }
-        else
-        {
-            ur_decimal(timec) = dt;
-        }
-
+cval:
+        ur_decimal(timec) = dt;
         if( (period != 1.0) && (period > 0.0) )
             dt /= period;
@@ -1427 +1428 @@
         return _curveValue( ut, curve, value, dt );
     }
-#if 0
-    else if( ur_is(cell, UT_WORD) )
-    {
-        switch( ur_atom(cell) )
+    else if( ur_is(behav, UT_WORD) )
+    {
+        switch( ur_atom(behav) )
         {
             case UR_ATOM_LOOP:
+                dt += ur_decimal(timec);
+                if( dt > period )
+                    dt -= period;
+                goto cval;
+
+            /*
             case UR_ATOM_PING_PONG:
             case UR_ATOM_PONG:
                 break;
-        }
-    }
-#endif
+            */
+        }
+    }
     return 1;
 }

trunk/thune/gl/scripts/cloud.t

@@ -1 +1 @@
 ; Particle cloud test
-
-"test_fw.t" load do
 
 10.0 :zoom