Changeset 442 for branches/thune/thread_safe/gl/gx.c

Timestamp:

08/05/07 00:26:17 (16 months ago)

Author:

krobillard

Message:

Added ++/-- to replace word inc/dec.
Renamed UR_FLAG_EOL as UR_FLAG_SOL.
GL - Added 'sphere draw opcode and 'curve-value call.

Files:

• branches/thune/thread_safe/gl/gx.c (modified) (6 diffs)

branches/thune/thread_safe/gl/gx.c

@@ -1188 +1188 @@
 
 
-// (val1 val2 time -- valI)
-UR_CALL( uc_lerp )
-{
-    UCell* v1;
-    UCell* v2;
-
-#define INTERP(A,B)     A += (B - A) * frac;
-
-    if( ur_is(tos, UT_DECIMAL) )
-    {
-        double frac = ur_decimal(tos);
-
+#define INTERP(R,A,B)     R = A + (B - A) * frac;
+
+/*
+   res may be v1 or v2.
+
+   \return non-zero if successful.
+*/
+static int _lerpCells( UCell* v1, UCell* v2, double frac, UCell* res )
+{
+    if( ur_type(v1) == ur_type(v2) )
+    {
         if( frac < 0.0 )
             frac = 0.0;
@@ -1205 +1204 @@
             frac = 1.0;
 
+        if( ur_is(v1, UT_DECIMAL) )
+        {
+            ur_initType(res, UT_DECIMAL);
+            INTERP( ur_decimal(res), ur_decimal(v1), ur_decimal(v2) );
+            return 1;
+        }
+        else if( ur_is(v1, UT_VEC3) )
+        {
+            ur_initType(res, UT_VEC3);
+            INTERP( res->vec3.xyz[0], v1->vec3.xyz[0], v2->vec3.xyz[0] );
+            INTERP( res->vec3.xyz[1], v1->vec3.xyz[1], v2->vec3.xyz[1] );
+            INTERP( res->vec3.xyz[2], v1->vec3.xyz[2], v2->vec3.xyz[2] );
+            return 1;
+        }
+        else if( ur_is(v1, UT_COORD) )
+        {
+            int i;
+            int len = v1->coord.len;
+            if( v2->coord.len < len )
+                len = v2->coord.len;
+            for( i = 0; i < len; ++i )
+            {
+                INTERP( res->coord.elem[i],
+                        v1->coord.elem[i], v2->coord.elem[i] );
+            }
+            ur_initType(res, UT_COORD);
+            res->coord.len = len;
+            return 1;
+        }
+    }
+    return 0;
+}
+
+
+// (val1 val2 time -- valI)
+UR_CALL( uc_lerp )
+{
+    UCell* v1;
+    UCell* v2;
+
+    if( ur_is(tos, UT_DECIMAL) )
+    {
         v2 = ur_s_prev(tos);
         v1 = ur_s_prev(v2);
-        if( ur_type(v1) == ur_type(v2) )
-        {
-            if( ur_is(v1, UT_DECIMAL) )
-            {
-                INTERP( ur_decimal(v1), ur_decimal(v2) );
-            }
-            else if( ur_is(v1, UT_VEC3) )
-            {
-                INTERP( v1->vec3.xyz[0], v2->vec3.xyz[0] );
-                INTERP( v1->vec3.xyz[1], v2->vec3.xyz[1] );
-                INTERP( v1->vec3.xyz[2], v2->vec3.xyz[2] );
-            }
-            else if( ur_is(v1, UT_COORD) )
-            {
-                int i;
-                int len = v1->coord.len;
-                if( v2->coord.len < len )
-                    len = v2->coord.len;
-                for( i = 0; i < len; ++i )
-                {
-                    INTERP( v1->coord.elem[i], v2->coord.elem[i] );
-                }
-            }
-            else
-            {
-                ur_throwErr( UR_ERR_DATATYPE,
-                             "lerp expected decimal!/vec3!/coord! value" );
-                return;
-            }
+        if( _lerpCells( v1, v2, ur_decimal(tos), v1 ) )
+        {
             UR_S_DROPN( 2 );
             return;
         }
         ur_throwErr( UR_ERR_DATATYPE,
-                     "lerp expected 2 values of the same type" );
+                     "lerp expected 2 decimal!/vec3!/coord! values" );
         return;
     }
     ur_throwErr( UR_ERR_DATATYPE, "lerp expected decimal! fraction" );
+}
+
+
+// (curve t -- val)
+UR_CALL( uc_curve_value )
+{
+    double t, t1, d;
+    int len;
+    UCell* v1;
+    UCell* cv;
+    UCell* it;
+    UCell* end;
+    UBlock* blk;
+
+    if( ur_is(tos, UT_DECIMAL) )
+        t = ur_decimal(tos);
+    else if( ur_is(tos, UT_INT) )
+        t = (double) ur_int(tos);
+    else
+        goto bad_dt;
+
+    cv = ur_s_prev(tos);
+    if( ur_is(cv, UT_BLOCK) )
+    {
+        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( cv, it[1] );
+                        goto finish;
+                    }
+
+                    t1 = ur_decimal(v1);
+                    d  = ur_decimal(it) - t1;
+                    if( ! d )
+                        goto copy;
+
+                    if( _lerpCells( v1 + 1, it + 1, (t - t1) / d, cv ) )
+                        goto finish;
+                    ur_throwErr( UR_ERR_DATATYPE,
+                             "lerp expected 2 decimal!/vec3!/coord! values" );
+                    return;
+                }
+                v1 = it;
+                it += 2;
+            }
+copy:
+            ur_copyCell( cv, v1[1] );
+        }
+        else
+        {
+            ur_setNone( cv );
+        }
+
+finish:
+        UR_S_DROP;
+        return;
+    }
+
+bad_dt:
+
+    ur_throwErr( UR_ERR_DATATYPE,
+                 "curve-value expected block! int!/decimal!" );
 }
 
@@ -1286 +1377 @@
 
 #if 0
-#if 0
+#if 1
 extern float perlinNoise2D( float x, float y, int octaves, float persist );
 #define PReal   float
@@ -1341 +1432 @@
                     for( x = 0.0f; x < w; x += 1.0f )
                     {
-                      //n = perlinNoise2D( x * 0.1, y * 0.1, octaves, persist );
-                        n = perlinNoise2D( x/w, y/h, persist, 2, octaves );
+                        n = perlinNoise2D( x * 0.1, y * 0.1, octaves, persist );
+                      //n = perlinNoise2D( x/w, y/h, persist, 2, octaves );
 
                         //printf( "%g\n", n );
@@ -1464 +1555 @@
     { uc_look_at,        "look-at" },
     { uc_lerp,           "lerp" },
+    { uc_curve_value,    "curve-value" },
     { uc_gl_extensions,  "gl-extensions" },
     { uc_gl_max_textures,"gl-max-textures" },
@@ -1582 +1674 @@
 #endif
 
-    gView = glv_create( GLV_ATTRIB_DOUBLEBUFFER );
+    gView = glv_create( GLV_ATTRIB_DOUBLEBUFFER | GLV_ATTRIB_MULTISAMPLE );
     if( ! gView )
     {