Changeset 390 for branches/thune/thread_safe/gl/draw_list.c

Timestamp:

05/17/07 18:27:45 (18 months ago)

Author:

krobillard

Message:

Thune - OpenGL version works in thread_safe branch.

Files:

• branches/thune/thread_safe/gl/draw_list.c (modified) (24 diffs)

branches/thune/thread_safe/gl/draw_list.c

@@ -283 +283 @@
    The pen is moved to the end of text.
 */
-void gr_drawText( const char* it, const char* end )
+void gr_drawText( UThread* ut, const char* it, const char* end )
 {
     GLfloat x, y;
@@ -328 +328 @@
 
 
-void gr_drawTextCell( UThread* ur_thread, UCell* cell )
+void gr_drawTextCell( UThread* ut, UCell* cell )
 {
     char* cpA;
     char* cpB;
 
-    if( ur_stringSlice( cell, &cpA, &cpB ) )
-    {
-        gr_drawText( cpA, cpB );
+    if( ur_stringSlice( ut, cell, &cpA, &cpB ) )
+    {
+        gr_drawText( ut, cpA, cpB );
     }
     else
     {
-        UString* str;
-        str = ur_binPtr( ur_thread->callTempBinN );
+        UString* str = ur_threadTmp( ut );
         str->used = 0;
         ur_toStr( cell, str, 0 );
-        gr_drawText( str->ptr.c, str->ptr.c + str->used );
+        gr_drawText( ut, str->ptr.c, str->ptr.c + str->used );
     }
 }
@@ -375 +374 @@
 
 
-static void dop_camera( UCell* ctx )
+static void dop_camera( UThread* ut, UCell* ctx )
 {
     double w, h;
@@ -466 +465 @@
 
 
-static void dop_light( UThread* ur_thread, UCell* val, int light )
+static void dop_light( UThread* ut, UCell* val, int light )
 {
     if( ur_is(val, UT_LOGIC) )
@@ -497 +496 @@
 
                     default:
-                        val = ur_wordCell( ur_thread, it );
+                        val = ur_wordCell( ut, it );
                         if( val )
                         {
@@ -532 +531 @@
    Camera must be set up for light before calling shadow-begin.
 */
-static void dop_shadow_begin( /*UThread* ur_thread,*/ UCell* fbCell )
+static void dop_shadow_begin( /*UThread* ut,*/ UCell* fbCell )
 {
     // Save matrices for shadow-end.
@@ -604 +603 @@
   Returns pc at last argument or zero if arguments are bad.
 */
-static UCell* dop_attrib( UThread* ur_thread, UCell* pc )
+static UCell* dop_attrib( UThread* ut, UCell* pc )
 {
     GrVertexAttribute* attr;
@@ -614 +613 @@
     if( ur_is(pc, UT_SELECT) )
     {
-        UCell* val = ur_wordCell( ur_thread, pc );
+        UCell* val = ur_wordCell( ut, pc );
         if( ! val )
             return 0;
@@ -673 +672 @@
    icell is an int array!
 */
-static void _drawPrims( UCell* icell, const char* key )
+static void _drawPrims( UThread* ut, UCell* icell, const char* key )
 {
     //GLdouble vec[3];
@@ -771 +770 @@
 #define VAL_WORD_OR_PC \
     if( ur_is(pc, UT_WORD) ) { \
-        val = ur_wordCell( ur_thread, pc ); \
+        val = ur_wordCell( ut, pc ); \
         if( ! val ) return 0; \
     } \
@@ -779 +778 @@
    Returns zero if an error occurred.
 */
-static int _runDrawList( UThread* ur_thread, UCell* val )
+static int _runDrawList( UThread* ut, UCell* val )
 {
     UBlock* blk = ur_blockPtr( val->series.n );
@@ -811 +810 @@
                         glCallList( ur_dlGL(val) );
                     }
-                    else if( ! _runDrawList( ur_thread, val ) )
+                    else if( ! _runDrawList( ut, val ) )
                         return 0;
                 }
@@ -867 +866 @@
                 VAL_WORD_OR_PC
                 if( ur_is(val, UT_CONTEXT) )
-                    dop_camera( val );
+                    dop_camera( ut, val );
             }
                 break;
@@ -877 +876 @@
                 ++pc;
                 VAL_WORD_OR_PC
-                dop_light( ur_thread, val, GL_LIGHT0 + light );
+                dop_light( ut, val, GL_LIGHT0 + light );
             }
                 break;
@@ -946 +945 @@
 
             case DOP_ATTRIB:
-                pc = dop_attrib( ur_thread, pc );
+                pc = dop_attrib( ut, pc );
                 if( ! pc )
                     return 0;
@@ -965 +964 @@
                 {
                     glBegin( _primBegin[ ur_opcode(pc-2) - DOP_POINTS ] );
-                    _drawPrims( pc, ur_atomCStr( ur_atom(pc-1), 0 ) );
+                    _drawPrims( ut, pc, ur_atomCStr( ur_atom(pc-1), 0 ) );
                     glEnd();
                 }
@@ -1047 +1046 @@
                     VAL_WORD_OR_PC
                 }
-                gr_drawTextCell( ur_thread, val );
+                gr_drawTextCell( ut, val );
                 break;
 
@@ -1053 +1052 @@
                 ++pc;
                 VAL_WORD_OR_PC
-                loadShader( val );
+                loadShader( ut, val );
                 break;
 
@@ -1069 +1068 @@
                 VAL_WORD_OR_PC
                 if( ur_is(val, UT_FBO) )
-                    dop_shadow_begin( /*ur_thread,*/ val );
+                    dop_shadow_begin( /*ut,*/ val );
                 break;
 
@@ -1097 +1096 @@
     UCell* res = ur_s_prev(tos);
 
-    ops = ur_resolveArgPath( UT_WORD, UR_ATOM_DRAW_LIST_OPCODES, UT_NONE ); 
+    ops = ur_resolvePath( ut, UR_ATOM_DRAW_LIST_OPCODES, UT_NONE ); 
     if( ! ops )
     {
@@ -1106 +1105 @@
     if( ur_is(tos, UT_BLOCK) )
     {
-        ur_infuse( ur_thread, ur_block(tos), ops );
+        ur_infuse( ut, ur_block(tos), ops );
 
         ur_initType(res, UT_DRAWLIST);
@@ -1117 +1116 @@
         int pool;
 
-        ur_infuse( ur_thread, ur_block(tos), ops );
+        ur_infuse( ut, ur_block(tos), ops );
 
         ur_initType(res, UT_DRAWLIST);
@@ -1130 +1129 @@
         glNewList( ur_dlGL(res), GL_COMPILE );
 
-        if( ! _runDrawList( ur_thread, tos ) )
+        if( ! _runDrawList( ut, tos ) )
         {
             ur_throwErr( UR_ERR_SCRIPT, "runDrawList failed" );
@@ -1160 +1159 @@
             glCallList( ur_dlGL(tos) );
         else
-            _runDrawList( ur_thread, tos );
+            _runDrawList( ut, tos );
     }
     UR_S_DROP;