Changeset 484

Timestamp:

10/13/07 05:20:10 (11 months ago)

Author:

krobillard

Message:

ThuneGL - Added animation & animate.

Files:

• trunk/thune/gl/boot.c (modified) (2 diffs)
• trunk/thune/gl/gx.c (modified) (5 diffs)
• trunk/thune/gl/gx.t (modified) (1 diff)
• trunk/thune/gl/gx_atoms.h (modified) (1 diff)

trunk/thune/gl/boot.c

@@ -7 +7 @@
-  "] func :load\n"
-  "[\n"
-
-
+
+
+
+
-  "    0.1 :near\n"
-  "    10.0 :far\n"
@@ -29 +31 @@
-  "]\n"
-  "context :widget-proto\n"
+  "[\n"
+  "    none :value\n"
+  "    none :curve\n"
+  "    1.0 :period\n"
+  "    0.0 :time\n"
+  "    1 :behavior\n"
+  "]\n"
+  "context :animation\n"
-  "script-env/os [\n"
-  "    linux [$100 :mouse-lb\n"

trunk/thune/gl/gx.c

@@ -1261 +1261 @@
-
-
+/*
+  cv & res may be the same.
+
+  Return zero if error thrown.
+*/
+static int _curveValue( UThread* ut, UCell* cv, UCell* res, double t )
+{
+    UBlock* blk;
+    UCell* it;
+    UCell* end;
+    UCell* v1;
+    int len;
+    double t1, d;
+
+    blk = ur_block( cv );
+    UR_ITER_BLOCK( it, end, blk, cv );
+    len = end - it;
+    if( len & 1 )
+    {
+        --len;
+        --end;
+    }
+    if( len )
+    {
+        v1 = 0;
+        while( it != end )
+        {
+            // Assume decimal! for speed.
+            if( t <= ur_decimal(it) )
+            {
+                if( ! v1 )
+                {
+                    ur_copyCell( res, it[1] );
+                    return 1;
+                }
+
+                t1 = ur_decimal(v1);
+                d  = ur_decimal(it) - t1;
+                if( ! d )
+                    goto copy;
+
+                if( _lerpCells( v1 + 1, it + 1, (t - t1) / d, res ) )
+                    return 1;
+
+                ur_throwErr( UR_ERR_DATATYPE,
+                         "lerp expected 2 decimal!/vec3!/coord! values" );
+                return 0;
+            }
+            v1 = it;
+            it += 2;
+        }
+copy:
+        ur_copyCell( res, v1[1] );
+    }
+    else
+    {
+        ur_setNone( res );
+    }
+    return 1;
+}
+
+
-// (curve t -- val)
-UR_CALL( uc_curve_value )
-{
-
-
-
+
-    UCell* cv;
-    UCell* it;
-    UCell* end;
-    UBlock* blk;
-
-    if( ur_is(tos, UT_DECIMAL) )
@@ -1282 +1339 @@
-    if( ur_is(cv, UT_BLOCK) )
-    {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-        return;
-    }
@@ -1335 +1350 @@
-    ur_throwErr( UR_ERR_DATATYPE,
-                 "curve-value expected block! int!/decimal!" );
+}
+
+
+enum ContextIndexAnimation
+{
+    CI_ANIM_VALUE = 0,
+    CI_ANIM_CURVE,
+    CI_ANIM_PERIOD,
+    CI_ANIM_TIME,
+    CI_ANIM_BEHAVIOR,
+    CI_ANIM_CELLS
+};
+
+
+/*
+  Return zero if error thrown.
+*/
+static int _animate( UThread* ut, UCell* acell, double dt )
+{
+    double period;
+    UCell* behav;
+    UCell* curve;
+    UCell* value;
+    UCell* timec;
+    UBlock* vblk = ur_blockPtr( acell->ctx.valBlk );
+    UCell* vc = vblk->ptr.cells;
+
+    if( vblk->used < CI_ANIM_CELLS )
+    {
+        ur_throwErr( UR_ERR_SCRIPT, "Invalid animation context" );
+        return 0;
+    }
+
+    curve = vc + CI_ANIM_CURVE;
+    if( ! ur_is(curve, UT_BLOCK) )
+    {
+        ur_throwErr( UR_ERR_DATATYPE, "animation curve must be a block!" );
+        return 0;
+    }
+
+    value = vc + CI_ANIM_VALUE;
+    if( ur_is(value, UT_BLOCK) )
+    {
+        vblk = ur_block(value);
+        value = vblk->ptr.cells + value->series.it;
+    }
+
+    behav = vc + CI_ANIM_BEHAVIOR;
+    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 )
+        {
+            int repeat = ur_int(behav) - 1;
+            if( repeat < 1 ) 
+            {
+                ur_setNone(behav);
+            }
+            else
+            {
+                dt -= period;
+                ur_int(behav) = repeat;
+            }
+        }
+        else
+        {
+            ur_decimal(timec) = dt;
+        }
+
+        if( (period != 1.0) && (period > 0.0) )
+            dt /= period;
+
+        return _curveValue( ut, curve, value, dt );
+    }
+#if 0
+    else if( ur_is(cell, UT_WORD) )
+    {
+        switch( ur_atom(cell) )
+        {
+            case UR_ATOM_LOOP:
+            case UR_ATOM_PING_PONG:
+            case UR_ATOM_PONG:
+                break;
+        }
+    }
+#endif
+    return 1;
+}
+
+
+// (anims time -- )
+UR_CALL( uc_animate )
+{
+    UCell* prev;
+    double dt;
+
+    if( ! ur_is(tos, UT_DECIMAL) )
+    {
+        ur_throwErr( UR_ERR_DATATYPE, "animate expected decimal! time" );
+        return;
+    }
+    dt = ur_decimal(tos);
+
+    prev = ur_s_prev(tos);
+    if( ur_is(prev, UT_CONTEXT) )
+    {
+        if( ! _animate( ut, prev, dt ) )
+            return;
+    }
+    else if( ur_is(prev, UT_BLOCK) )
+    {
+        UBlock* blk;
+        UCell* it;
+        UCell* end;
+        blk = ur_block(prev);
+        UR_ITER_BLOCK( it, end, blk, prev );
+        while( it != end )
+        {
+            if( ur_is(it, UT_CONTEXT) )
+            {
+                if( ! _animate( ut, it, dt ) )
+                    return;
+            }
+            ++it;
+        }
+    }
+    else
+    {
+        ur_throwErr( UR_ERR_DATATYPE, "animate expected block!/context!" );
+        return;
+    }
+    UR_S_DROPN(2);
-}
-
@@ -1551 +1701 @@
-    { uc_lerp,           "lerp" },
-    { uc_curve_value,    "curve-value" },
+    { uc_animate,        "animate" },
-    { uc_gl_extensions,  "gl-extensions" },
-    { uc_gl_max_textures,"gl-max-textures" },
@@ -1628 +1779 @@
-    FIXED_ATOM( "sprite",   6, UR_ATOM_SPRITE );
-
+    // Animation
+    FIXED_ATOM( "once",      4, UR_ATOM_ONCE );
+    //FIXED_ATOM( "loop",      4, UR_ATOM_LOOP );
+    FIXED_ATOM( "ping-pong", 9, UR_ATOM_PING_PONG );
+    FIXED_ATOM( "pong",      4, UR_ATOM_PONG );
+
-#if MAKE_ATOM_HEADER
-    exit(0);

trunk/thune/gl/gx.t

@@ -48 +48 @@
-context :widget-proto
-
+[
+    none :value
+    none :curve
+    1.0  :period
+    0.0  :time
+    1    :behavior
+]
+context :animation
-
-/*

trunk/thune/gl/gx_atoms.h

@@ -47 +47 @@
-#define UR_ATOM_TRANS           359
-#define UR_ATOM_SPRITE          360
+#define UR_ATOM_ONCE            361
+#define UR_ATOM_PING_PONG               362
+#define UR_ATOM_PONG            363