Changeset 311 for trunk/thune/gl

Timestamp:

11/22/06 22:12:17 (2 years ago)

Author:

krobillard

Message:

Thune GL - Added 'gl-extensions & improved texture! 'make.

Location:

trunk/thune/gl

Files:

• gx.c (modified) (4 diffs)
• gx_atoms.h (modified) (1 diff)
• gx_dt.c (modified) (3 diffs)

trunk/thune/gl/gx.c

@@ -1103 +1103 @@
 
     ur_throwErr( UR_ERR_DATATYPE, "look-at expected array! vec3!" );
+}
+
+
+// ( -- string)
+UR_CALL( uc_gl_extensions )
+{
+    // Replace with 'gl-info that returns version, extensions, etc.?
+    const GLubyte* str;
+    UIndex binN;
+
+    UR_CALL_UNUSED_TH
+
+    str = glGetString( GL_EXTENSIONS );
+    binN = ur_makeString( (const char*) str, -1 );
+
+
+    UR_S_GROW;
+    tos = UR_TOS;
+    ur_initType(tos, UT_STRING);
+    ur_setSeries(tos, binN, 0 );
 }
 
@@ -1809 +1829 @@
     { uc_load_wav,       "load.wav" },
     { uc_display,        "display" },
-    { uc_look_at,        "look-at" }
+    { uc_look_at,        "look-at" },
+    { uc_gl_extensions,  "gl-extensions" }
 };
 
@@ -1833 +1854 @@
     FIXED_ATOM( "width",        5, UR_ATOM_WIDTH )
     FIXED_ATOM( "height",       6, UR_ATOM_HEIGHT )
+    FIXED_ATOM( "area",         4, UR_ATOM_AREA )
+    FIXED_ATOM( "rect",         4, UR_ATOM_RECT )
     FIXED_ATOM( "raster",       6, UR_ATOM_RASTER )
     FIXED_ATOM( "elem",         4, UR_ATOM_ELEM )
@@ -1864 +1887 @@
     FIXED_ATOM( "min",      3, UR_ATOM_MIN );
     FIXED_ATOM( "mag",      3, UR_ATOM_MAG );
+    FIXED_ATOM( "mipmap",   6, UR_ATOM_MIPMAP );
 
     // Particles

trunk/thune/gl/gx_atoms.h

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

trunk/thune/gl/gx_dt.c

@@ -157 +157 @@
             ur_int(res) = rh ? rh->height : 0;
             break;
-
+#if 0
+        case UR_ATOM_RECT:          // Can plug directly into camera/viewport.
+            ur_initType(res, UT_COORD);
+            res->coord.elem[0] = 0;
+            res->coord.elem[1] = 0;
+
+            rh = ur_rastHead(val);
+            if( rh )
+            {
+                res->coord.elem[2] = rh->width;
+                res->coord.elem[3] = rh->height;
+                res->coord.len = 4;
+            }
+            else
+            {
+                res->coord.len = 2;
+            }
+            break;
+#endif
         case UR_ATOM_ELEM:
             ur_initType(res, UT_BINARY);
@@ -181 +199 @@
 
 
-static void _texFormat( const RasterHead* rh, GLint* comp, GLenum* format )
-{
+struct TextureDef
+{
+    const void* pixels;
+    int    width;
+    int    height;
+    GLenum format;
+    GLint  comp;
+    GLint  wrap;
+    GLint  min_filter;
+    GLint  mag_filter;
+};
+
+
+static void _texRast( struct TextureDef* tex, const RasterHead* rh )
+{
+    tex->width  = rh->width;
+    tex->height = rh->height;
+    tex->pixels = rh + 1;
+
     switch( rh->format )
     {
         case UR_RAST_GRAY:
-            *comp   = 1;
-            *format = GL_LUMINANCE;
+            tex->comp   = 1;
+            tex->format = GL_LUMINANCE;
             break;
 
         case UR_RAST_RGB:
-            *comp   = 3;
-            *format = GL_RGB;
+            tex->comp   = 3;
+            tex->format = GL_RGB;
             break;
 
         case UR_RAST_RGBA:
-            *comp   = 4;
-            *format = GL_RGBA;
+        default:
+            tex->comp   = 4;
+            tex->format = GL_RGBA;
             break;
     }
@@ -203 +239 @@
 
 
-// (texture! raster -- texture)
-// (texture! coord  -- texture)
-//;(texture! [raster coord 'mipmap 'nearest 'linear 'repeat 'clamp] -- texture)
+static void _texCoord( struct TextureDef* tex, const UCell* cell )
+{
+    tex->width  = cell->coord.elem[0];
+    tex->height = cell->coord.elem[1];
+    tex->pixels = 0;
+    tex->comp   = 4;
+    tex->format = GL_RGBA;
+
+    if( cell->coord.len > 2 )
+    {
+        if( cell->coord.elem[2] == 3 )
+        {
+            tex->comp   = 3;
+            tex->format = GL_RGB;
+        }
+        else if( cell->coord.elem[2] == 1 )
+        {
+            tex->comp   = 1;
+            tex->format = GL_LUMINANCE;
+        }
+    }
+}
+
+
+// (texture! raster -- tex)
+// (texture! coord  -- tex)
+// (texture! [raster!/coord! 'mipmap 'nearest 'linear 'repeat 'clamp] -- tex)
 UR_CALL( make_texture )
 {
+    struct TextureDef def;
+    GLuint name;
     int pool;
-    GLuint name;
-    GLenum format;
-    GLint comp;
-    int width, height;
-    void* pixels;
     int mipmap = 0;
-    int wrap   = GL_REPEAT;
-    int filter = GL_LINEAR;
-    RasterHead* rh = 0;
+    UIndex rastN = 0;
     UCell* res = ur_s_prev(tos);
 
+    def.wrap       = GL_REPEAT;
+    def.min_filter = GL_NEAREST_MIPMAP_LINEAR;
+    def.mag_filter = GL_LINEAR;
+
     if( ur_is(res, UT_DATATYPE) )
     {
         if( ur_is(tos, UT_RASTER) )
         {
-            rh = ur_rastHead(tos);
-            width  = rh->width;
-            height = rh->height;
-            pixels = rh + 1;
-            _texFormat( rh, &comp, &format );
+            rastN = tos->series.n;
+            _texRast( &def, ur_rastHead(tos) );
+            goto build;
+        }
+        else if( ur_is(tos, UT_COORD) )
+        {
+            _texCoord( &def, tos );
+            goto build;
+        }
+        else if( ur_is(tos, UT_BLOCK) )
+        {
+            UCell* it;
+            UCell* end;
+            UCell* val;
+            UBlock* blk;
+
+            def.width = 0;
+
+            blk = ur_block(tos);
+            UR_ITER_BLOCK( it, end, blk, tos );
+            while( it != end )
+            {
+                switch( ur_type(it) )
+                {
+                    case UT_WORD:
+                        val = ur_wordCell( ur_thread, it );
+                        if( ! val )
+                            return;
+                        if( ur_is(val, UT_RASTER) )
+                        {
+                            rastN = val->series.n;
+                            _texRast( &def, ur_rastHead(val) );
+                        } 
+                        else if( ur_is(val, UT_COORD) )
+                        {
+                            _texCoord( &def, val );
+                        }
+                        break;
+
+                    case UT_LITWORD:
+                        switch( ur_atom( it ) )
+                        {
+                            case UR_ATOM_CLAMP:
+                                def.wrap = GL_CLAMP;
+                                break;
+
+                            case UR_ATOM_REPEAT:
+                                def.wrap = GL_REPEAT;
+                                break;
+
+                            case UR_ATOM_NEAREST:
+                                def.min_filter = GL_NEAREST;
+                                def.mag_filter = GL_NEAREST;
+                                break;
+
+                            case UR_ATOM_LINEAR:
+                                def.min_filter = GL_LINEAR;
+                                def.mag_filter = GL_LINEAR;
+                                break;
+
+                            case UR_ATOM_MIPMAP:
+                                mipmap = 1;
+                                break;
+                        }
+                        break;
+
+                    case UT_COORD:
+                        _texCoord( &def, it );
+                        break;
+                }
+                ++it;
+            }
+
+            if( def.width )
+                goto build;
+        }
+    }
+
+    ur_throwErr( UR_ERR_DATATYPE, "texture! make expected coord!/raster!" );
+    return;
 
 build:
-            name = gltex_alloc( &pool );
-            glBindTexture( GL_TEXTURE_2D, name );
-
-            if( mipmap )
-            {
-                gluBuild2DMipmaps( GL_TEXTURE_2D, comp, width, height,
-                                   format, GL_UNSIGNED_BYTE, pixels );
-            }
-            else
-            {
-                glTexImage2D( GL_TEXTURE_2D, 0, comp, width, height, 0,
-                              format, GL_UNSIGNED_BYTE, pixels );
-            }
-
-            // GL_DECAL, GL_MODULATE, GL_REPLACE
-            //glTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE );
-
-            // GL_CLAMP, GL_REPEAT.
-            glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, wrap );
-            glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, wrap );
-
-            // GL_NEAREST, GL_LINEAR, GL_LINEAR_MIPMAP_NEAREST.
-            glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, filter );
-            glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, filter );
-
-
-            ur_initType( res, UT_TEXTURE );
-            ur_texPool(res) = pool;
-            ur_texRast(res) = rh ? tos->series.n : 0;
-            ur_texId(res)   = name;
-
-            UR_S_DROP;
+
+    name = gltex_alloc( &pool );
+    glBindTexture( GL_TEXTURE_2D, name );
+
+    // TODO: Support texture type of GL_FLOAT.
+    if( mipmap )
+    {
+        gluBuild2DMipmaps( GL_TEXTURE_2D, def.comp, def.width, def.height,
+                           def.format, GL_UNSIGNED_BYTE, def.pixels );
+    }
+    else
+    {
+        // Ensure that a non-mipmap minifying filter is used.
+        // Using a mipmap filter can cause FBO format errors and textures to
+        // not appear.
+        if( def.min_filter != GL_NEAREST )
+            def.min_filter = GL_LINEAR;
+
+        glTexImage2D( GL_TEXTURE_2D, 0, def.comp, def.width, def.height, 0,
+                      def.format, GL_UNSIGNED_BYTE, def.pixels );
+    }
+
+    {
+        GLenum err = glGetError();
+        if( err != GL_NO_ERROR )
+        {
+            ur_throwErr( UR_ERR_INTERNAL, (const char*) gluErrorString( err ) );
             return;
         }
-        else if( ur_is(tos, UT_COORD) )
-        {
-            width  = tos->coord.elem[0];
-            height = tos->coord.elem[1];
-            pixels = 0;
-            comp   = 4;
-            format = GL_RGBA;
-
-            if( tos->coord.len > 2 )
-            {
-                if( tos->coord.elem[2] == 3 )
-                {
-                    comp   = 3;
-                    format = GL_RGB;
-                }
-                else if( tos->coord.elem[2] == 1 )
-                {
-                    comp   = 1;
-                    format = GL_LUMINANCE;
-                }
-            }
-
-            goto build;
-        }
-    }
-    ur_throwErr( UR_ERR_DATATYPE, "texture! make expected raster!" );
+    }
+
+    // GL_DECAL, GL_MODULATE, GL_REPLACE
+    //glTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE );
+
+    // GL_CLAMP, GL_CLAMP_TO_EDGE, GL_REPEAT.
+    glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, def.wrap );
+    glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, def.wrap );
+
+    // TODO: Support all GL_TEXTURE_MIN_FILTER types.
+    // GL_NEAREST, GL_LINEAR, GL_LINEAR_MIPMAP_NEAREST, etc.
+    glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, def.min_filter );
+
+    // GL_NEAREST, GL_LINEAR
+    glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, def.mag_filter );
+
+    ur_initType( res, UT_TEXTURE );
+    ur_texPool(res) = pool;
+    ur_texRast(res) = rastN;
+    ur_texId(res)   = name;
+
+    UR_S_DROP;
 }