Changeset 331 for trunk/thune/gl

Timestamp:

01/02/07 03:35:04 (2 years ago)

Author:

krobillard

Message:

Thune GL - Added draw-list! and 'draw.

Location:

trunk/thune/gl

Files:

• draw_list.c (modified) (6 diffs)
• gx.c (modified) (4 diffs)
• gx.h (modified) (2 diffs)
• gx.t (modified) (1 diff)
• gx_atoms.h (modified) (1 diff)
• gx_dt.c (modified) (2 diffs)
• test.t (modified) (1 diff)
• test_fw.t (modified) (1 diff)

trunk/thune/gl/draw_list.c

@@ -31 +31 @@
 #include FT_FREETYPE_H
 #include "TexFont.h"
-
-
-#define ur_glpool(cell)     (cell)->coord.elem[2]
-#define ur_gldl(cell)       (cell)->series.end
 
 
@@ -643 +639 @@
 static int _runDrawList( UThread* ur_thread, UCell* val )
 {
-    UBlock* blk = ur_blockPtr( val->code.n );
+    UBlock* blk = ur_blockPtr( val->series.n );
     UCell* pc  = blk->ptr.cells;
     UCell* end = pc + blk->used;
@@ -660 +656 @@
                 ++pc;
                 VAL_WORD_OR_PC
-                if( ur_is(val, UT_CODE) )
-                {
-                    if( ur_gldl(val) )
+                if( ur_is(val, UT_DRAWLIST) )
+                {
+                    if( ur_dlGL(val) )
                     {
-                        //if( ur_gldl(val) != 1 )
-                        //    printf( "KR list %d\n", ur_gldl(val) );
-                        glCallList( ur_gldl(val) );
+                        //if( ur_dlGL(val) != 1 )
+                        //    printf( "KR list %d\n", ur_dlGL(val) );
+                        glCallList( ur_dlGL(val) );
                     }
                     else if( ! _runDrawList( ur_thread, val ) )
@@ -933 +929 @@
 
 
-extern ULanguage dl_language;
-
-
 /*
-   (block -- code)
+   (draw-list! block -- dlist)
 */
-UR_CALL( dl_compile )
-{
-    UR_CALL_UNUSED_TH
+UR_CALL_PUB( make_dlist )
+{
+    UCell* ops;
+    UCell* res = ur_s_prev(tos);
+
+    ops = ur_resolveArgPath( UT_WORD, UR_ATOM_DRAW_LIST_OPCODES, UT_NONE ); 
+    if( ! ops )
+    {
+        ur_throwErr( UR_ERR_INTERNAL, "draw-list-opcodes not found" );
+        return;
+    }
 
     if( ur_is(tos, UT_BLOCK) )
     {
-        ur_initType(tos, UT_CODE);
-        tos->code.langId = dl_language.langId;
-        // tos->code.n is already set.
-        ur_gldl(tos)     = 0;
+        ur_infuse( ur_thread, ur_block(tos), ops );
+
+        ur_initType(res, UT_DRAWLIST);
+        ur_setSeries(res, tos->series.n, tos->series.it );
+        ur_dlGL(res)   = 0;
+        //ur_dlPool(res) = 0;   // Cleared by ur_initType.
     }
     else if( ur_is(tos, UT_PAREN) )
@@ -954 +957 @@
         int pool;
 
-        ur_initType(tos, UT_CODE);
-        tos->code.langId = dl_language.langId;
-        // tos->code.n is already set.
-
-        ur_gldl(tos)   = gllist_alloc( &pool );
-        ur_glpool(tos) = pool;
-
-        if( ! ur_gldl(tos) )
-        {
-            ur_throwErr( UR_ERR_INTERNAL, "glGenLists() failed" );
-            return;
-        }
+        ur_infuse( ur_thread, ur_block(tos), ops );
+
+        ur_initType(res, UT_DRAWLIST);
+        ur_setSeries(res, tos->series.n, tos->series.it );
+        ur_dlGL(res)   = gllist_alloc( &pool );
+        ur_dlPool(res) = pool;
 
         gr_clearState();
 
-        //printf( "KR compile %d\n", ur_gldl(tos) );
-
-        glNewList( ur_gldl(tos), GL_COMPILE );
+        //printf( "KR compile %d\n", ur_dlGL(tos) );
+
+        glNewList( ur_dlGL(res), GL_COMPILE );
 
         if( ! _runDrawList( ur_thread, tos ) )
@@ -980 +977 @@
         glEndList();
     }
+    else
+    {
+        ur_throwErr( UR_ERR_DATATYPE,
+                     "draw-list! make expected block!/paren!" );
+        return;
+    }
+
+    UR_S_DROP;
 }
 
 
 /*
-   (code -- )
+   (dlist -- )
 */
-UR_CALL( dl_run )
-{
-    gr_clearState();
-
-    if( ur_gldl(tos) )
-        glCallList( ur_gldl(tos) );
-    else
-        _runDrawList( ur_thread, tos );
-
+UR_CALL_PUB( uc_draw )
+{
+    if( ur_is(tos, UT_DRAWLIST) )
+    {
+        gr_clearState();
+
+        if( ur_dlGL(tos) )
+            glCallList( ur_dlGL(tos) );
+        else
+            _runDrawList( ur_thread, tos );
+    }
     UR_S_DROP;
 }
 
 
-static void dl_codeGC( UCollector* gc, UCell* cell )
-{
-    //printf( "KR dl_codeGC\n" );
-    ur_gcMarkBlock( gc, cell->code.n );
-
-    if( ur_gldl(cell) )
-        gllist_gcMark( ur_glpool(cell), ur_gldl(cell) );
-}
-
-
-ULanguage dl_language =
-{
-    0, 0,
-    dl_compile,
-    dl_run,
-    dl_codeGC
-};
-
-
 /*EOF*/

trunk/thune/gl/gx.c

@@ -1322 +1322 @@
 
 
-extern void uc_load_wav( UThread*, UCell* );
-extern void uc_load_png( UThread*, UCell* );
-extern void uc_save_png( UThread*, UCell* );
+UR_EXTERN_CALL( uc_draw );
+UR_EXTERN_CALL( uc_load_wav );
+UR_EXTERN_CALL( uc_load_png );
+UR_EXTERN_CALL( uc_save_png );
 
 static UCallDef _gxCalls[] =
 {
+    { uc_draw,           "draw" },
     { uc_play,           "play" },
     { uc_stop,           "stop" },
@@ -1366 +1368 @@
 #endif
 
+    FIXED_ATOM( "draw-list-opcodes", 17, UR_ATOM_DRAW_LIST_OPCODES )
     FIXED_ATOM( "width",        5, UR_ATOM_WIDTH )
     FIXED_ATOM( "height",       6, UR_ATOM_HEIGHT )
@@ -1418 +1421 @@
 
 
-extern ULanguage dl_language;
-
 int gx_startup( UrlanEnv* env )
 {
@@ -1440 +1441 @@
 
     ur_makeCalls( env, _gxCalls, sizeof(_gxCalls) / sizeof(UCallDef) );
-
-    ur_registerLanguage( env, "draw-list", &dl_language );
 
     {

trunk/thune/gl/gx.h

@@ -30 +30 @@
 
 
-#define UT_RASTER   UT_BI_COUNT
-#define UT_TEXTURE  (UT_BI_COUNT+1)
-#define UT_FONT     (UT_BI_COUNT+2)
-#define UT_SHADER   (UT_BI_COUNT+3)
-#define UT_FBO      (UT_BI_COUNT+4)
+#define UT_DRAWLIST UT_BI_COUNT
+#define UT_RASTER   (UT_BI_COUNT+1)
+#define UT_TEXTURE  (UT_BI_COUNT+2)
+#define UT_FONT     (UT_BI_COUNT+3)
+#define UT_SHADER   (UT_BI_COUNT+4)
+#define UT_FBO      (UT_BI_COUNT+5)
+
+
+//----------------------------------------------------------------------------
+
+
+typedef struct
+{
+    uint8_t  type;
+    uint8_t  flags;
+    uint16_t glListPool;
+    UIndex   blkN;
+    UIndex   _pad;
+    GLuint   glListId;
+}
+UCellDrawList;
 
 
@@ -180 +196 @@
 UIndex ur_makeRaster( UCell*, int format, int w, int h, UBinary** );
 
+#define ur_dlGL(c)          ((UCellDrawList*) (c))->glListId
+#define ur_dlPool(c)        ((UCellDrawList*) (c))->glListPool
+#define ur_dlBlkN(c)        ((UCellDrawList*) (c))->blkN
+
 #define ur_rastHead(c)      ((RasterHead*) ur_bin(c)->ptr.v)
 #define ur_rastElem(bin)    ((bin)->ptr.b + sizeof(RasterHead))

trunk/thune/gl/gx.t

@@ -141 +141 @@
 
 
-[src block!]
 [
-    code!
-    src draw-list-opcodes infuse
-    'draw-list make
+    draw-list! swap make
 ]
-func :draw-list     ; (src -- dl)
+proc :draw-list     ; (src -- dl)
 
 
-[src block!]
 [
-    code!
-    src draw-list-opcodes infuse  paren! as
-    'draw-list make
+    draw-list! swap paren! as make
 ]
-func :draw-list.compile     ; (src -- dl)
+proc :draw-list.compile     ; (src -- dl)
 
 

trunk/thune/gl/gx_atoms.h

@@ -1 +1 @@
 // This file is automatically generated - do not edit.
 
-#define UR_ATOM_WIDTH           303
-#define UR_ATOM_HEIGHT          304
-#define UR_ATOM_AREA            305
-#define UR_ATOM_RECT            306
-#define UR_ATOM_RASTER          307
-#define UR_ATOM_TEXTURE         308
-#define UR_ATOM_ELEM            309
+#define UR_ATOM_DRAW_LIST_OPCODES               303
+#define UR_ATOM_WIDTH           304
+#define UR_ATOM_HEIGHT          305
+#define UR_ATOM_AREA            306
+#define UR_ATOM_RECT            307
+#define UR_ATOM_RASTER          308
+#define UR_ATOM_TEXTURE         309
+#define UR_ATOM_ELEM            310
 #define UR_ATOM_CLOSE           171
-#define UR_ATOM_FOCUS           310
-#define UR_ATOM_RESIZE          311
-#define UR_ATOM_KEY_DOWN                312
-#define UR_ATOM_KEY_UP          313
-#define UR_ATOM_MOUSE_MOVE              314
-#define UR_ATOM_MOUSE_UP                315
-#define UR_ATOM_MOUSE_DOWN              316
-#define UR_ATOM_MOUSE_WHEEL             317
-#define UR_ATOM_AMBIENT         318
-#define UR_ATOM_DIFFUSE         319
-#define UR_ATOM_SPECULAR                320
-#define UR_ATOM_POS             321
-#define UR_ATOM_SHADER          322
-#define UR_ATOM_VERTEX          323
-#define UR_ATOM_FRAGMENT                324
-#define UR_ATOM_DEFAULT         325
-#define UR_ATOM_RGB             326
-#define UR_ATOM_RGBA            327
-#define UR_ATOM_DEPTH           328
-#define UR_ATOM_CLAMP           329
-#define UR_ATOM_REPEAT          330
-#define UR_ATOM_NEAREST         331
-#define UR_ATOM_LINEAR          332
-#define UR_ATOM_MIN             333
-#define UR_ATOM_MAG             334
-#define UR_ATOM_MIPMAP          335
+#define UR_ATOM_FOCUS           311
+#define UR_ATOM_RESIZE          312
+#define UR_ATOM_KEY_DOWN                313
+#define UR_ATOM_KEY_UP          314
+#define UR_ATOM_MOUSE_MOVE              315
+#define UR_ATOM_MOUSE_UP                316
+#define UR_ATOM_MOUSE_DOWN              317
+#define UR_ATOM_MOUSE_WHEEL             318
+#define UR_ATOM_AMBIENT         319
+#define UR_ATOM_DIFFUSE         320
+#define UR_ATOM_SPECULAR                321
+#define UR_ATOM_POS             322
+#define UR_ATOM_SHADER          323
+#define UR_ATOM_VERTEX          324
+#define UR_ATOM_FRAGMENT                325
+#define UR_ATOM_DEFAULT         326
+#define UR_ATOM_RGB             327
+#define UR_ATOM_RGBA            328
+#define UR_ATOM_DEPTH           329
+#define UR_ATOM_CLAMP           330
+#define UR_ATOM_REPEAT          331
+#define UR_ATOM_NEAREST         332
+#define UR_ATOM_LINEAR          333
+#define UR_ATOM_MIN             334
+#define UR_ATOM_MAG             335
+#define UR_ATOM_MIPMAP          336
 #define UR_ATOM_ON              247
 #define UR_ATOM_OFF             249
 #define UR_ATOM_ADD             190
-#define UR_ATOM_BURN            336
-#define UR_ATOM_COLOR           337
-#define UR_ATOM_TRANS           338
+#define UR_ATOM_BURN            337
+#define UR_ATOM_COLOR           338
+#define UR_ATOM_TRANS           339

trunk/thune/gl/gx_dt.c

@@ -30 +30 @@
 #include "rfont.h"
 #include "shader.h"
+
+
+/*--------------------------------------------------------------------------*/
+
+
+UR_EXTERN_CALL( make_dlist );
+
+
+static void toStr_dlist( const UCell* cell, UString* out, int depth )
+{
+    (void) cell;
+    (void) depth;
+    ur_strCat( out, "<draw-list>", 11 );
+}
+
+
+static void mark_dlist( UCollector* gc, UCell* cell )
+{
+    if( ur_dlBlkN(cell) )
+        ur_gcMarkBlock( gc, ur_dlBlkN(cell) );
+
+    if( ur_dlGL(cell) )
+        gllist_gcMark( ur_dlPool(cell), ur_dlGL(cell) );
+}
+
+
+/*--------------------------------------------------------------------------*/
 
 
@@ -872 +899 @@
 
 
-UDatatype ug_datatypes[ 5 ] =
-{
+UDatatype ug_datatypes[ 6 ] =
+{
+    {"draw-list!", 0, 0,
+        make_dlist, to_nop, toStr_dlist, toStr_dlist,
+        select_nop, recycle_nop, mark_dlist, rmres_nop },
+
     {"raster!", 0, 0,
         make_raster, to_nop, toStr_raster, toStr_raster,

trunk/thune/gl/test.t

@@ -318 +318 @@
     background handle.events
     sim-update
-    background/draw ;do
+    background/draw draw
     none display.swap
 ] forever

trunk/thune/gl/test_fw.t

@@ -62 +62 @@
         wid handle.events
         sim-update
-        wid/draw ;do
+        wid/draw draw
         none display.swap
     ]