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

Timestamp:

06/30/07 08:14:01 (17 months ago)

Author:

krobillard

Message:

Thune GL - Added 'image & mouse button words. Fixes to specular model shaders.

Files:

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

branches/thune/thread_safe/gl/draw_list.c

@@ -28 +28 @@
 #include "shader.h"
 #include "TexFont.h"
+
+
+extern struct GXEnv gxEnv;
 
 
@@ -66 +69 @@
 void gr_disableTexture()
 {
-    glDisable( GL_TEXTURE_2D );
-}
+    GLint i;
+    for( i = 0; i < gxEnv.maxTextureUnits; ++i )
+    {
+        glActiveTexture( GL_TEXTURE0 + i );
+        glDisable( GL_TEXTURE_2D );
+    }
+}
+#endif
 
 
 void gr_enableTexture0()
 {
-#if 1
+    GLint i;
+    for( i = 1; i < gxEnv.maxTextureUnits; ++i )
+    {
+        glActiveTexture( GL_TEXTURE0 + i );
+        glDisable( GL_TEXTURE_2D );
+    }
+    glActiveTexture( GL_TEXTURE0 );
     glEnable( GL_TEXTURE_2D );
-#else
-    glActiveTexture( GL_TEXTURE0 + 0 );
-    glEnable( GL_TEXTURE_2D );
-    glActiveTexture( GL_TEXTURE0 + 1 );
-    glEnable( GL_TEXTURE_2D );
-#endif
-}
-#endif
+}
 
 
@@ -144 +152 @@
             glDepthMask( GL_FALSE );
 
-            gr_enable( "bt" );
+            // NOTE: Must disable all texture units but GL_TEXTURE0 if not
+            // using a shader or text may not render properly.
+            gr_enableTexture0();
+
+            gr_enable( "b" );
             gr_disable( "adl" );
             /*
@@ -150 +162 @@
             glDisable( GL_DEPTH_TEST );
             glDisable( GL_LIGHTING );
-
             glEnable( GL_BLEND );
-            gr_enableTexture0();
             */
             glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA );
-
 
             //glTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE );
@@ -379 +388 @@
 
 
+static void gr_image( UThread* ut, UCell* val, GLfloat x, GLfloat y,
+                      UAtom atom )
+{
+    RasterHead* rh;
+
+    if( atom == UR_ATOM_TRANS )
+    {
+        //gr_disable( "adl" );
+        //gr_enable( "b" );
+
+        glDisable( GL_ALPHA_TEST );
+        glDisable( GL_DEPTH_TEST );
+        glDisable( GL_LIGHTING );
+        glEnable( GL_BLEND );
+
+        glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA );
+    }
+    else
+    {
+        gr_disable( "abdl" );
+    }
+
+    glDepthMask( GL_FALSE );
+
+    gr_enableTexture0();
+    glBindTexture( GL_TEXTURE_2D, ur_texId(val) );
+    //printf( "KR tex %d\n", ur_texId(val) );
+
+    rh = (RasterHead*) ur_binPtr( ur_texRast(val) )->ptr.v;
+
+    glBegin( GL_QUADS );
+
+    glMultiTexCoord2f( GL_TEXTURE0, 0.0f, 1.0f );
+    glVertex2f( x, y );
+    glMultiTexCoord2f( GL_TEXTURE0, 1.0f, 1.0f );
+    glVertex2f( x + rh->width, y );
+    glMultiTexCoord2f( GL_TEXTURE0, 1.0f, 0.0f );
+    glVertex2f( x + rh->width, y + rh->height );
+    glMultiTexCoord2f( GL_TEXTURE0, 0.0f, 0.0f );
+    glVertex2f( x, y + rh->height );
+
+    glEnd();
+}
+
+
+//----------------------------------------------------------------------------
+
+
 #if 0
 GLuint gr_querySamples()
@@ -1075 +1132 @@
                 ++pc;
                 VAL_WORD_OR_PC
-                glBindTexture( GL_TEXTURE_2D, ur_texId(val) );
+                if( ur_is(val, UT_TEXTURE) )
+                {
+                    glBindTexture( GL_TEXTURE_2D, ur_texId(val) );
+                }
+                break;
+
+            case DOP_IMAGE:                 // image [x,y] texture
+            {
+                GLfloat x, y;
+                int atom = ur_sel(pc);
+                ++pc;
+                VAL_WORD_OR_PC
+                if( ur_is(val, UT_COORD) )
+                {
+                    x = (GLfloat) val->coord.elem[0];
+                    y = (GLfloat) val->coord.elem[1];
+                    ++pc;
+                    VAL_WORD_OR_PC
+                }
+                else if( ur_is(val, UT_VEC3) )
+                {
+                    x = val->vec3.xyz[0];
+                    y = val->vec3.xyz[1];
+                    ++pc;
+                    VAL_WORD_OR_PC
+                }
+                else
+                {
+                    x = y = 0.0;
+                }
+                if( ur_is(val, UT_TEXTURE) )
+                    gr_image( ut, val, x, y, atom );
+            }
                 break;
 
@@ -1311 +1400 @@
                     VAL_WORD_OR_PC
                 }
+                else if( ur_is(val, UT_VEC3) )
+                {
+                    _state.penX = val->vec3.xyz[0];
+                    _state.penY = val->vec3.xyz[1];
+                    ++pc;
+                    VAL_WORD_OR_PC
+                }
                 gr_drawTextCell( ut, val );
                 break;
@@ -1344 +1440 @@
                 int hidden = ur_sel(pc);    // UR_ATOM_HIDDEN
 
-                ++pc;
-                if( ! ur_is(pc, UT_BLOCK) )
-                    return 0;
-
                 _state.samplesQueryId = 0;
 
@@ -1358 +1450 @@
                 }
 
-                // Run draw-list containing samples-begin ops.
-                if( ! _runDrawList( ut, pc ) )
-                    return 0;
+                // Run draw-list containing samples-begin (DOP_SAMPLES_BEGIN).
+                ++pc;
+                if( ur_is(pc, UT_BLOCK) )
+                {
+                    if( ! _runDrawList( ut, pc ) )
+                        return 0;
+                }
+#if 1
+                else if( ur_is(pc, UT_DRAWLIST) )
+                {
+                    if( ur_dlGL(pc) )
+                        glCallList( ur_dlGL(pc) );
+                }
+#endif
 
                 if( _state.samplesQueryId )
@@ -1376 +1479 @@
                     GLuint samples;
                     GLuint id;
-                    //UBinary* bin;
-                    //UIndex binN;
 
                     // Push query results on stack and call process-block.
-
-                    //bin = ur_binaryPtr( binN );
 
                     for( id = 1; id <= _state.samplesQueryId; ++id )