Changeset 442

Timestamp:

08/05/07 00:26:17 (15 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.

Location:

branches/thune/thread_safe

Files:

• boot.c (modified) (1 diff)
• component.c (modified) (2 diffs)
• doc/GLManual (modified) (3 diffs)
• doc/thune.vim (modified) (1 diff)
• eval.c (modified) (6 diffs)
• gl/boot.c (modified) (1 diff)
• gl/draw_list.c (modified) (6 diffs)
• gl/draw_ops.h (modified) (1 diff)
• gl/glfbo.c (modified) (1 diff)
• gl/gx.c (modified) (6 diffs)
• gl/gx.t (modified) (1 diff)
• gl/gx_atoms.h (modified) (2 diffs)
• gl/project.r (modified) (1 diff)
• gl/testfw.t (modified) (2 diffs)
• internal.h (modified) (1 diff)
• mkboot.t (modified) (1 diff)
• print.c (modified) (5 diffs)
• tests/working/inc.t (modified) (1 diff)
• thune.c (modified) (3 diffs)
• tokenize.c (modified) (2 diffs)
• urlan.c (modified) (1 diff)
• urlan.h (modified) (1 diff)

branches/thune/thread_safe/boot.c

@@ -30 +30 @@
   "  opcode! 25 'inc     make :inc\n"
   "  opcode! 26 'dec     make :dec\n"
-  "  opcode! 27 'verify  make :verify\n"
-  "  opcode! 28 'forever make :forever\n"
+  "  opcode! 27 '++      make :++\n"
+  "  opcode! 28 '--      make :--\n"
+  "  opcode! 29 'verify  make :verify\n"
+  "  opcode! 30 'forever make :forever\n"
   "  int!/decimal! :number!\n"
   "  word!/set-word!/get-word!/lit-word! :any-word!\n"

branches/thune/thread_safe/component.c

@@ -52 +52 @@
     while( it != end )
     {
-        if( ur_is(it, UT_WORD) )
+        if( ur_is(it, UT_WORD) || ur_is(it, UT_OPCODE) )
         {
             if( ur_atom(it) == UR_ATOM_DDASH )
@@ -91 +91 @@
     while( it != end )
     {
-        if( ur_is(it, UT_WORD) || ur_is(it, UT_SELECT) )
+        if( ur_is(it, UT_WORD) || ur_is(it, UT_OPCODE) ||
+            ur_is(it, UT_SELECT) )
         {
             atom = ur_atom(it);

branches/thune/thread_safe/doc/GLManual

@@ -169 +169 @@
 ================  ======================  ======================
 lerp_             (val1 val2 t -- valt)
+curve-value_      (curve t -- valt)
 ================  ======================  ======================
 
 
 lerp
+++++
+
+Does a linear interpolation between two values of the same type
+(decimal!, vec3!, or coord!).
+
+This is the calculation used::
+
+        result = v1 + ((v2 - v1) * t)
+
+Stack usage::
+
+    (v1 decimal!/vec3!/coord!
+     v2 decimal!/vec3!/coord!
+     t  decimal!
+     -- decimal!/vec3!/coord!)
+
+
+curve-value
 +++++++++++
 
-Does a linear interpolation between two decimal or two vec3 values.
-
-::
-
-    (decimal!/vec3!  decimal!/vec3! decimal! -- decimal!/vec3!)
+Returns value on curve at time t.  Currently only linear segments are
+implemented.
+
+Stack usage::
+
+    (block!  decimal!/int! -- value)
+
+Example::
+
+    [0.0  2.0
+     0.5  7.0
+     1.0  7.0
+     8.0  2.0] 3 curve-value
+    = 5.57143
 
 
@@ -196 +224 @@
 clear                                     glClear()
 call              draw-list
+enable/F                                  glEnable()
+disable/F                                 glDisable()
 solid                                     Draw without textures
 model                                     Draw with texture (will be changed)
@@ -212 +242 @@
 font              font!                   Draw with font
 text              [coord!] text           Draw text in current font
+sphere            radius slices,stacks    Draw textured GLUT sphere
 shader            shader!/none!/0         Load shader
 framebuffer       framebuffer!/none!/0    Bind framebuffer

branches/thune/thread_safe/doc/thune.vim

@@ -44 +44 @@
 syn keyword     thuneOpcode     nop drop dup dup2 over swap nip tuck
 syn keyword     thuneOpcode     rot rot.r do
-syn keyword     thuneOpcode     inc dec verify
+syn keyword     thuneOpcode     inc dec ++ -- verify
 
 " Values

branches/thune/thread_safe/eval.c

@@ -1386 +1386 @@
             if( wrdN > -1 )
             {
-                flags = it->id.flags & UR_FLAG_EOL;
+                flags = it->id.flags & UR_FLAG_SOL;
 
                 ur_copyCell( it, values[ wrdN ] );
 
-                it->id.flags = (it->id.flags & ~UR_FLAG_EOL) | flags;
+                it->id.flags = (it->id.flags & ~UR_FLAG_SOL) | flags;
             }
         }
@@ -1404 +1404 @@
                 UCell* src;
                 int sel;
-#define ISEL_FLAGS   (UR_FLAG_EOL | UR_FLAG_SEL_ATOM)
+#define ISEL_FLAGS   (UR_FLAG_SOL | UR_FLAG_SEL_ATOM)
 
                 src = values + wrdN;
@@ -1473 +1473 @@
     while( it != end )
     {
-        if( ur_is(it, UT_WORD) )
+        if( ur_is(it, UT_WORD) || ur_is(it, UT_OPCODE) )
         {
             if( ur_atom(it) == UR_ATOM_DDASH )
@@ -1496 +1496 @@
     while( it != end )
     {
-        if( ur_is(it, UT_WORD) )
+        if( ur_is(it, UT_WORD) || ur_is(it, UT_OPCODE) )
         {
             if( ur_atom(it) == UR_ATOM_DDASH )
@@ -1615 +1615 @@
         {
             cell = blk->ptr.cells + tos->series.it;
-            cell->id.flags |= UR_FLAG_EOL;
+            cell->id.flags |= UR_FLAG_SOL;
         }
     }
@@ -1628 +1628 @@
             {
                 cell = blk->ptr.cells + tos->series.it;
-                cell->id.flags |= UR_FLAG_BLOCK_EOL;
+                cell->id.flags |= UR_FLAG_BLOCK_SOL;
             }
             UR_S_DROP;

branches/thune/thread_safe/gl/boot.c

@@ -97 +97 @@
   "    quads\n"
   "    quad-strip\n"
+  "    sphere\n"
   "    camera\n"
   "    light\n"

branches/thune/thread_safe/gl/draw_list.c

@@ -41 +41 @@
     EN_LIGHTING     = 0x0010,
     EN_LINE_SMOOTH  = 0x0020,
-    EN_POINT_SMOOTH = 0x0040,
-    EN_POINT_SPRITE = 0x0080,
-    EN_SCISSOR_TEST = 0x0100,
-    EN_STENCIL_TEST = 0x0200,
-    EN_TEXTURE_2D   = 0x0400,
-    EN_VERTEX_PROGRAM_POINT_SIZE = 0x0800
+    EN_MULTISAMPLE  = 0x0040,
+    EN_POINT_SMOOTH = 0x0080,
+    EN_POINT_SPRITE = 0x0100,
+    EN_SCISSOR_TEST = 0x0200,
+    EN_STENCIL_TEST = 0x0400,
+    EN_TEXTURE_2D   = 0x0800,
+    EN_VERTEX_PROGRAM_POINT_SIZE = 0x1000
 };
 
@@ -735 +736 @@
 
 /*
+   This should only be used from a compiled draw list since a GLUquadricObj
+   is created and deleted.
+*/
+static UCell* dop_sphere( UThread* ut, UCell* pc )
+{
+    GLdouble radius; 
+    GLint slices, stacks;
+
+    ++pc;
+    if( ur_is(pc, UT_DECIMAL) )
+        radius = ur_decimal(pc);
+    else if( ur_is(pc, UT_INT) )
+        radius = (GLdouble) ur_int(pc);
+    else
+    {
+        ur_throwErr( UR_ERR_DATATYPE, "sphere expected number! for radius" );
+        return 0;
+    }
+
+    ++pc;
+    if( ur_is(pc, UT_COORD) )
+    {
+        slices = pc->coord.elem[0];
+        stacks = pc->coord.elem[1];
+    }
+    else
+    {
+        ur_throwErr( UR_ERR_DATATYPE,
+                     "sphere expected coord! for slices,stacks" );
+        return 0;
+    }
+
+    GLUquadricObj* obj = gluNewQuadric();
+    if( obj )
+    {
+        gluQuadricTexture( obj, GL_TRUE );
+        gluQuadricNormals( obj, GLU_SMOOTH );
+        gluQuadricDrawStyle( obj, GLU_FILL );
+        gluQuadricOrientation( obj, GLU_OUTSIDE );
+
+        gluSphere( obj, radius, slices, stacks );
+
+        gluDeleteQuadric( obj );
+    }
+
+    return pc;
+}
+
+
+/*
   attrib/1 shader/my-attrib float-count #[...]
 
@@ -927 +978 @@
     PRINT_STATE( "GL_LIGHTING/l",     EN_LIGHTING,     GL_LIGHTING )
     PRINT_STATE( "GL_LINE_SMOOTH/n",  EN_LINE_SMOOTH,  GL_LINE_SMOOTH )
+    PRINT_STATE( "GL_MULTISAMPLE/m",  EN_MULTISAMPLE,  GL_MULTISAMPLE )
     PRINT_STATE( "GL_POINT_SMOOTH/o", EN_POINT_SMOOTH, GL_POINT_SMOOTH )
     PRINT_STATE( "GL_POINT_SPRITE/p", EN_POINT_SPRITE, GL_POINT_SPRITE )
@@ -970 +1022 @@
                 ENABLE( EN_LIGHTING, GL_LIGHTING )
                 break;
+            case 'm':
+                ENABLE( EN_MULTISAMPLE, GL_MULTISAMPLE )
+                break;
             case 'n':
                 ENABLE( EN_LINE_SMOOTH, GL_LINE_SMOOTH )
@@ -1023 +1078 @@
             case 'l':
                 DISABLE( EN_LIGHTING, GL_LIGHTING )
+                break;
+            case 'm':
+                DISABLE( EN_MULTISAMPLE, GL_MULTISAMPLE )
                 break;
             case 'n':
@@ -1209 +1267 @@
                         break;
                 }
+                break;
+
+            case DOP_SPHERE:                 // sphere rad silces,stacks
+                pc = dop_sphere( ut, pc );
+                if( ! pc )
+                    return 0;
                 break;
 

branches/thune/thread_safe/gl/draw_ops.h

@@ -26 +26 @@
 #define DOP_QUADS           23
 #define DOP_QUAD_STRIP      24
-#define DOP_CAMERA          25
-#define DOP_LIGHT           26
-#define DOP_LIGHTING        27
-#define DOP_PUSH            28
-#define DOP_POP             29
-#define DOP_TRANSLATE       30
-#define DOP_ROTATE          31
-#define DOP_SCALE           32
-#define DOP_FONT            33
-#define DOP_TEXT            34
-#define DOP_SHADER          35
-#define DOP_FRAMEBUFFER     36
-#define DOP_SHADOW_BEGIN    37
-#define DOP_SHADOW_END      38
-#define DOP_SAMPLES_QUERY   39
-#define DOP_SAMPLES_BEGIN   40
+#define DOP_SPHERE          25
+#define DOP_CAMERA          26
+#define DOP_LIGHT           27
+#define DOP_LIGHTING        28
+#define DOP_PUSH            29
+#define DOP_POP             30
+#define DOP_TRANSLATE       31
+#define DOP_ROTATE          32
+#define DOP_SCALE           33
+#define DOP_FONT            34
+#define DOP_TEXT            35
+#define DOP_SHADER          36
+#define DOP_FRAMEBUFFER     37
+#define DOP_SHADOW_BEGIN    38
+#define DOP_SHADOW_END      39
+#define DOP_SAMPLES_QUERY   40
+#define DOP_SAMPLES_BEGIN   41

branches/thune/thread_safe/gl/glfbo.c

@@ -118 +118 @@
             GLuint name = listBase + i;
             glDeleteFramebuffersEXT( 1, &name );
+            //printf( "KR glDeleteFramebuffersEXT(1,%d)\n", name );
         }
     }

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 )
     {

branches/thune/thread_safe/gl/gx.t

@@ -161 +161 @@
     quads
     quad-strip
+
+    sphere
 
     camera

branches/thune/thread_safe/gl/gx_atoms.h

@@ -9 +9 @@
 #define UR_ATOM_TEXTURE         325
 #define UR_ATOM_ELEM            326
-#define UR_ATOM_CLOSE           179
+#define UR_ATOM_CLOSE           178
 #define UR_ATOM_FOCUS           327
 #define UR_ATOM_RESIZE          328
@@ -42 +42 @@
 #define UR_ATOM_ON              258
 #define UR_ATOM_OFF             260
-#define UR_ATOM_ADD             198
+#define UR_ATOM_ADD             197
 #define UR_ATOM_BURN            355
 #define UR_ATOM_COLOR           356

branches/thune/thread_safe/gl/project.r

@@ -93 +93 @@
         %rfont.c
         %shader.c
+        ;%noise.c
         ;%perlin.c
+        ;%../util/cbparse.c
+        ;%curves.c
         ;%hit/AABBTree.c
         ;%hit/build_bbt.c
-
-        ;%noise.c
-        ;%../util/cbparse.c
-        ;%curves.c
     ]
 ]

branches/thune/thread_safe/gl/testfw.t

@@ -59 +59 @@
 1.0 :zoom
 0,0,155 :bg-color
+;true :multisample
+
 
 
@@ -93 +95 @@
         key-down [
             esc [quit]
+            ;m   [multisample complement dup . dup :multisample
+            ;     [enable/m][disable/m?] either]