Changeset 527 for trunk/thune/gl/draw_list.c

Timestamp:

05/26/08 17:22:18 (6 months ago)

Author:

krobillard

Message:

Added thune-gl widget! datatype.

Files:

• trunk/thune/gl/draw_list.c (modified) (17 diffs)

trunk/thune/gl/draw_list.c

@@ -72 +72 @@
 
 
-struct GrRenderState grState;
-
-
-#if 0
+GrRenderState grState;
+
+
+#if 1
 void gr_disableTexture()
 {
@@ -132 +132 @@
         case GRS_SOLID:
             glDepthMask( GL_FALSE );
+#if 0
             gr_disable( "lbct" );
-            /*
+#else
             glDisable( GL_LIGHTING );
             glDisable( GL_BLEND );
             glDisable( GL_CULL_FACE );
             gr_disableTexture();
-            */
+
+            grState.enableMask &=
+                ~(EN_LIGHTING | EN_BLEND | EN_CULL_FACE | EN_TEXTURE_2D);
+#endif
             break;
 
@@ -163 +167 @@
 
             // NOTE: Must disable all texture units but GL_TEXTURE0 if not
-            // using a shader or text may not render properly.
+            //       using a shader or text may not render properly.
             gr_enableTexture0();
 
@@ -235 +239 @@
 
 
-int gr_textWidth( const TexFont* tf, const char* it, const char* end )
-{
-    TexGlyphInfo* prev = 0;
-    TexGlyphInfo* tgi;
-    int width = 0;
-
-    while( it != end )
-    {
-        if( *it == '\n' )
-            break;
-        if( *it == ' ' )
-        {
-            tgi = txf_glyph( tf, ' ' );
-            if( tgi )
-                width += tgi->advance;
-            prev = 0;
-        }
-        else
-        {
-            tgi = txf_glyph( tf, *it );
-            if( tgi )
-            {
-                width += tgi->advance;
-                if( prev )
-                    width += txf_kerning( tf, prev, tgi );
-                prev = tgi;
-            }
-        }
-        ++it;
-    }
-
-    return width;
-}
-
-
 /*
   Returns TexGlyphInfo of rendered glyph.
@@ -395 +364 @@
     {
         int16_t* rect = area->coord.elem;
-        int w = gr_textWidth( tf, cpA, cpB );
+        int w = txf_width( tf, cpA, cpB );
         int h = tf->max_ascent - (tf->max_ascent >> 1);
 
@@ -646 +615 @@
 
         blk = ur_block(val);
-        UR_ITER_BLOCK( it, end, blk, val );
+        UR_ITER_BLOCK( it, end, blk, val )
         while( it != end )
         {
@@ -826 +795 @@
     COW_VALUE(pc, ts);
     if( ! ur_is(ts, UT_COORD) )
+    {
+bad_dt:
+        ur_throwErr( UR_ERR_DATATYPE, "qaud-skin expected coord!" );
         return 0;
+    }
     ++pc;
     COW_VALUE(pc, tc);
     if( ! ur_is(tc, UT_COORD) )
-        return 0;
+        goto bad_dt;
     ++pc;
     COW_VALUE(pc, vc);
     if( ! ur_is(vc, UT_COORD) )
-        return 0;
+        goto bad_dt;
 
     {
@@ -1163 +1136 @@
         glEnable( e ); }
 
+#if 1
 #define DISABLE(f,e) \
     if( grState.enableMask & f ) { \
         grState.enableMask &= ~f; \
         glDisable( e ); }
+#else
+#define DISABLE(f,e)    glDisable( e );
+#endif
+
 
 static void gr_enable( const char* cp )
@@ -1288 +1266 @@
    Returns zero if an error occurred.
 */
-static int _runDrawList( UThread* ut, UCell* val )
+int ug_runDrawList( UThread* ut, UCell* val )
 {
     UBlock* blk = ur_blockPtr( val->series.n );
@@ -1337 +1315 @@
                         glCallList( ur_dlGL(val) );
                     }
-                    else if( ! _runDrawList( ut, val ) )
+                    else if( ! ug_runDrawList( ut, val ) )
                         return 0;
+                }
+                else if( ur_is(val, UT_WIDGET) )
+                {
+                    // NOTE: Compiliation of widget draw lists will happen
+                    //       inside gui_render().
+                    gui_render( &gxEnv.gui, ur_int(val) );
                 }
                 break;
@@ -1654 +1638 @@
                 {
                     if( ! ur_is(val, UT_COORD) || (val->coord.len < 4) )
+                    {
+                        ur_throwErr( UR_ERR_DATATYPE,
+                                     "text expected area coord!" );
                         return 0;
+                    }
                     area = val;
                     ++pc;
@@ -1689 +1677 @@
                 loadShader( ut, val );
                 break;
-#if 0
+#if 1
             case DOP_UNIFORM:
             {
@@ -1737 +1725 @@
                 if( ur_is(pc, UT_BLOCK) )
                 {
-                    if( ! _runDrawList( ut, pc ) )
+                    if( ! ug_runDrawList( ut, pc ) )
                         return 0;
                 }
@@ -1805 +1793 @@
 
 
+int ug_compileDrawList( UThread* ut, UCell* blkCell, GLuint dl )
+{
+    int ok;
+
+    //printf( "KR compile DL %d\n", dl );
+
+    // Need to keep grState.shaderProg for uniform to work in compiled list.
+    //gr_clearState();
+
+    glNewList( dl, GL_COMPILE );
+    ok = ug_runDrawList( ut, blkCell );
+    glEndList();
+
+    return ok;
+}
+
+
 /*
    (draw-list! block -- dlist)
@@ -1826 +1831 @@
         ur_initType(res, UT_DRAWLIST);
         ur_setSeries(res, tos->series.n, tos->series.it );
-        ur_dlGL(res)   = 0;
+        ur_dlGL(res) = 0;
         //ur_dlPool(res) = 0;   // Cleared by ur_initType.
     }
@@ -1841 +1846 @@
 
         gr_clearState();
-
-        //printf( "KR compile %d\n", ur_dlGL(tos) );
-
-        glNewList( ur_dlGL(res), GL_COMPILE );
-
-        if( ! _runDrawList( ut, tos ) )
-        {
-            ur_throwErr( UR_ERR_SCRIPT, "runDrawList failed" );
-        }
-
-        glEndList();
+        if( ! ug_compileDrawList( ut, tos, ur_dlGL(res) ) )
+            return;
     }
     else
@@ -1871 +1867 @@
     if( ur_is(tos, UT_DRAWLIST) )
     {
+        if( ur_dlGL(tos) )
+        {
+            glCallList( ur_dlGL(tos) );
+        }
+        else
+        {
+            gr_clearState();
+            ug_runDrawList( ut, tos );
+        }
+    }
+    else if( ur_is(tos, UT_WIDGET) )
+    {
         gr_clearState();
-
-        if( ur_dlGL(tos) )
-            glCallList( ur_dlGL(tos) );
-        else
-            _runDrawList( ut, tos );
+        gui_render( &gxEnv.gui, ur_int(tos) );
     }
     UR_S_DROP;