Changeset 306 for trunk/thune/gl

Timestamp:

11/05/06 03:27:39 (2 years ago)

Author:

krobillard

Message:

Thune GL - Added texture! datatype.

Location:

trunk/thune/gl

Files:

• audio.c (modified) (1 diff)
• draw_list.c (modified) (3 diffs)
• gx.c (modified) (5 diffs)
• gx.h (modified) (4 diffs)
• gx_dt.c (modified) (14 diffs)
• png_load.c (modified) (1 diff)
• project.r (modified) (1 diff)
• shader.c (modified) (3 diffs)
• test.t (modified) (1 diff)

trunk/thune/gl/audio.c

@@ -178 +178 @@
     else
     {
-        ur_throwErr( UR_ERR_DATATYPE, "load-wav expected string!" );
+        ur_throwErr( UR_ERR_DATATYPE, "load.wav expected string!" );
     }
 }

trunk/thune/gl/draw_list.c

@@ -18 +18 @@
 ===========================================================================*/
 
+
+#define GL_GLEXT_PROTOTYPES
 
 #include <assert.h>
@@ -110 +112 @@
             glDisable( GL_BLEND );
 
-            gr_disableTexture();
+            //gr_disableTexture();
+            gr_enableTexture0();
             break;
 
@@ -505 +508 @@
                 //glVertex3dv( vec );
                 glVertex3fv( _state.vertVals + *it * 3 );
+                break;
+
+            case 't':
+            {
+                float* uv = _state.uvVals + *it * 2;
+                glMultiTexCoord2fv( GL_TEXTURE0_ARB, uv );
+                //glMultiTexCoord2f( GL_TEXTURE0_ARB, uv[0], 1.0f - uv[1] );
+            }
                 break;
         }

trunk/thune/gl/gx.c

@@ -31 +31 @@
 #include "audio.h"
 #include "gllist.h"
+#include "gltex.h"
 #include "math3d.h"
 //#include <time.h>
@@ -1799 +1800 @@
     { uc_play,           "play" },
     { uc_stop,           "stop" },
- //   { uc_load_png,      "load-png" },
     { uc_display_events, "display.events" },
     { uc_display_swap,   "display.swap" },
@@ -1805 +1805 @@
     { uc_key_repeat,     "key-repeat" },
     { uc_key_code,       "key-code" },
-    { uc_load_png,       "load-png" },
-    { uc_load_wav,       "load-wav" },
+    { uc_load_png,       "load.png" },
+    { uc_load_wav,       "load.wav" },
     { uc_display,        "display" },
     { uc_look_at,        "look-at" }
@@ -1853 +1853 @@
     FIXED_ATOM( "default",  7, UR_ATOM_DEFAULT );
 
+    /*
+    FIXED_ATOM( "clamp",    5, UR_ATOM_CLAMP );
+    FIXED_ATOM( "repeat",   6, UR_ATOM_REPEAT );
+    FIXED_ATOM( "nearest",  7, UR_ATOM_NEAREST );
+    FIXED_ATOM( "linear",   6, UR_ATOM_LINEAR );
+    FIXED_ATOM( "min",      3, UR_ATOM_MIN );
+    FIXED_ATOM( "mag",      3, UR_ATOM_MAG );
+    */
+
 #if MAKE_ATOM_HEADER
     exit(0);
@@ -1902 +1911 @@
 
     gllist_startup();
+    gltex_startup();
 
     return UR_EVAL_OK;

trunk/thune/gl/gx.h

@@ -31 +31 @@
 
 #define UT_RASTER   UT_BI_COUNT
-#define UT_FONT     UT_BI_COUNT+1
-#define UT_SHADER   UT_BI_COUNT+2
+#define UT_TEXTURE  UT_BI_COUNT+1
+#define UT_FONT     UT_BI_COUNT+2
+#define UT_SHADER   UT_BI_COUNT+3
 
 
@@ -84 +85 @@
 
 
+typedef UCellRasterFont     UCellTexture;
+
+
 //----------------------------------------------------------------------------
 
@@ -187 +191 @@
 UIndex ur_makeRaster( UCell*, int format, int w, int h );
 
-#define ur_rast(c)          ((RasterHead*) ur_bin(c)->ptr.v)
+#define ur_rastHead(c)      ((RasterHead*) ur_bin(c)->ptr.v)
 #define ur_rasterElem(bin)  (bin->ptr.b + sizeof(RasterHead))
 
@@ -194 +198 @@
 #define ur_fontTexId(c)     ((UCellRasterFont*) c)->glTexId
 
+#define ur_texRast(c)       ((UCellTexture*) c)->rasterN
+#define ur_texId(c)         ((UCellTexture*) c)->glTexId
+#define ur_texPool(c)       ((UCellTexture*) c)->glTexIdPool
+
 
 #endif /*GX_H*/

trunk/thune/gl/gx_dt.c

@@ -25 +25 @@
 #include "gx_atoms.h"
 #include "gllist.h"
+#include "gltex.h"
 #include "rfont.h"
 #include "shader.h"
+
+
+#ifdef __APPLE__
+#include <OpenGL/glu.h>
+#else
+#include <GL/glu.h>
+#endif
 
 
@@ -97 +105 @@
 
 
-UR_CALL( to_raster )
-{
-    UR_CALL_UNUSED_TOS
-    ur_throwErr( UR_ERR_DATATYPE, "to cannot be used on raster!" );
-}
-
-
-void toStr_raster( const UCell* cell, UString* out, int depth )
+static void toStr_raster( const UCell* cell, UString* out, int depth )
 {
     int uformat;
@@ -111 +112 @@
     (void) depth;
 
-    rh = ur_rast(cell);
+    rh = ur_rastHead(cell);
     assert( rh );
 
@@ -134 +135 @@
 
 
-int select_raster( UThread* ur_thread, UCell* val, const UCell* sel,
-                   UCell* res )
+static int select_raster( UThread* ur_thread, UCell* val, const UCell* sel,
+                          UCell* res )
 {
     RasterHead* rh;
@@ -143 +144 @@
         case UR_ATOM_X:
         case UR_ATOM_WIDTH:
-            rh = ur_rast(val);
+            rh = ur_rastHead(val);
             ur_initType(res, UT_INT);
             ur_int(res) = rh ? rh->width : 0;
@@ -150 +151 @@
         case UR_ATOM_Y:
         case UR_ATOM_HEIGHT:
-            rh = ur_rast(val);
+            rh = ur_rastHead(val);
             ur_initType(res, UT_INT);
             ur_int(res) = rh ? rh->height : 0;
@@ -172 +173 @@
     //printf( "KR mark raster\n" );
     ur_gcMarkBin( gc, cell->series.n );
+}
+
+
+/*--------------------------------------------------------------------------*/
+
+
+static void _texFormat( const RasterHead* rh, GLint* comp, GLenum* format )
+{
+    switch( rh->format )
+    {
+        case UR_RAST_GRAY:
+            *comp   = 1;
+            *format = GL_LUMINANCE;
+            break;
+
+        case UR_RAST_RGB:
+            *comp   = 3;
+            *format = GL_RGB;
+            break;
+
+        case UR_RAST_RGBA:
+            *comp   = 4;
+            *format = GL_RGBA;
+            break;
+    }
+}
+
+
+// (texture! raster -- texture)
+// (texture! [raster 'mipmap] -- texture)
+UR_CALL( make_texture )
+{
+    UCell* res = ur_s_prev(tos);
+
+    if( ur_is(res, UT_DATATYPE) )
+    {
+        if( ur_is(tos, UT_RASTER) )
+        {
+            RasterHead* rh;
+            int pool;
+            GLuint name;
+            GLenum format;
+            GLint comp;
+            int mipmap = 0;
+
+
+            name = gltex_alloc( &pool );
+            rh = ur_rastHead(tos);
+
+            glBindTexture( GL_TEXTURE_2D, name );
+            glTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE );
+
+            _texFormat( rh, &comp, &format );
+            if( mipmap )
+            {
+                gluBuild2DMipmaps( GL_TEXTURE_2D, comp, rh->width, rh->height,
+                                   format, GL_UNSIGNED_BYTE, rh + 1 );
+            }
+            else
+            {
+                glTexImage2D( GL_TEXTURE_2D, 0, comp, rh->width, rh->height, 0,
+                              format, GL_UNSIGNED_BYTE, rh + 1 );
+            }
+
+            // 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, GL_REPEAT );
+            glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT );
+
+            // GL_NEAREST, GL_LINEAR, GL_LINEAR_MIPMAP_NEAREST.
+            glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR );
+            glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR );
+
+
+            ur_initType( res, UT_TEXTURE );
+            ur_texPool(res) = pool;
+            ur_texRast(res) = tos->series.n;
+            ur_texId(res)   = name;
+
+            UR_S_DROP;
+            return;
+        }
+    }
+    ur_throwErr( UR_ERR_DATATYPE, "texture! make expected raster!" );
+}
+
+
+static void toStr_texture( const UCell* cell, UString* out, int depth )
+{
+    (void) cell;
+    (void) depth;
+    ur_strCat( out, "<texture>", 9 );
+}
+
+
+static int select_texture( UThread* ur_thread, UCell* val, const UCell* sel,
+                           UCell* res )
+{
+    if( ur_sel(sel) == UT_RASTER /*UR_ATOM_RASTER*/ )
+    {
+        UIndex ri = ur_texRast(val);
+        ur_initType(res, UT_RASTER);
+        ur_setSeries(res, ri, 0);
+        return 1;
+    }
+    return select_raster( ur_thread, val, sel, res );
+}
+
+
+static void recycle_texture( UrlanEnv* env, int phase )
+{
+    (void) env;
+    if( phase == UR_GC_PHASE_MARK )
+        gltex_gcBegin();
+    else
+        gltex_gcSweep();
+}
+
+
+static void mark_texture( UCollector* gc, UCell* cell )
+{
+    UCellTexture* tc = (UCellTexture*) cell;
+    ur_gcMarkBin( gc, tc->rasterN );
+    gltex_gcMark( tc->glTexIdPool, tc->glTexId );
 }
 
@@ -240 +367 @@
 
 
-UR_CALL( to_rfont )
-{
-    UR_CALL_UNUSED_TOS
-    ur_throwErr( UR_ERR_DATATYPE, "'to cannot be used on font!" );
-}
-
-
-void toStr_rfont( const UCell* cell, UString* out, int depth )
+static void toStr_rfont( const UCell* cell, UString* out, int depth )
 {
     (void) cell;
@@ -255 +375 @@
 
 
-int select_rfont( UThread* ur_thread, UCell* val, const UCell* sel,
-                   UCell* res )
+static int select_rfont( UThread* ur_thread, UCell* val, const UCell* sel,
+                         UCell* res )
 {
     switch( ur_sel(sel) )
@@ -380 +500 @@
 
 
-UR_CALL( to_shader )
-{
-    UR_CALL_UNUSED_TOS
-    ur_throwErr( UR_ERR_DATATYPE, "'to cannot be used on shader!" );
-}
-
-
-void toStr_shader( const UCell* cell, UString* out, int depth )
+static void toStr_shader( const UCell* cell, UString* out, int depth )
 {
     (void) cell;
@@ -395 +508 @@
 
 
-int select_shader( UThread* ur_thread, UCell* val, const UCell* sel,
-                   UCell* res )
+static void mark_shader( UCollector* gc, UCell* cell )
+{
+    ur_gcMarkBuffer( gc, cell->series.n );
+}
+
+
+static void rmbuf_shader( UBuffer* buf )
+{
+    //printf( "KR rmbuf_shader()\n" );
+    Shader* sh = (Shader*) buf->ptr;
+    if( sh )
+    {
+        destroyShader( sh );
+        memFree( sh );
+        buf->ptr = 0;
+    }
+}
+
+
+/*--------------------------------------------------------------------------*/
+
+
+UR_CALL( to_nop )
+{
+    tos = ur_s_prev(tos);
+    ur_throwErr( UR_ERR_DATATYPE, "'to cannot be used on %s!",
+                 ur_typeName( ur_type(tos) ) );
+}
+
+
+static int select_nop( UThread* ur_thread, UCell* val, const UCell* sel,
+                       UCell* res )
 {
     (void) val;
@@ -406 +549 @@
 
 
-static void mark_shader( UCollector* gc, UCell* cell )
-{
-    ur_gcMarkBuffer( gc, cell->series.n );
-}
-
-
-static void rmbuf_shader( UBuffer* buf )
-{
-    //printf( "KR rmbuf_shader()\n" );
-    Shader* sh = (Shader*) buf->ptr;
-    if( sh )
-    {
-        destroyShader( sh );
-        memFree( sh );
-        buf->ptr = 0;
-    }
-}
-
-
-/*--------------------------------------------------------------------------*/
-
-
-static void recycle_none( UrlanEnv* env, int phase )
+static void recycle_nop( UrlanEnv* env, int phase )
 {
     (void) env;
@@ -436 +557 @@
 
 
-static void rmbuf_none( UBuffer* buf )
+static void rmbuf_nop( UBuffer* buf )
 {
     (void) buf;
@@ -442 +563 @@
 
 
-UDatatype ug_datatypes[ 3 ] =
+UDatatype ug_datatypes[ 4 ] =
 {
     {"raster!", 0, 0,
-        make_raster, to_raster, toStr_raster, toStr_raster,
-        select_raster, recycle_none, mark_raster, rmbuf_none },
+        make_raster, to_nop, toStr_raster, toStr_raster,
+        select_raster, recycle_nop, mark_raster, rmbuf_nop },
+
+    {"texture!", 0, 0,
+        make_texture, to_nop, toStr_texture, toStr_texture,
+        select_texture, recycle_texture, mark_texture, rmbuf_nop },
 
     {"font!", 0, 0,
-        make_rfont, to_rfont, toStr_rfont, toStr_rfont,
-        select_rfont, recycle_rfont, mark_rfont, rmbuf_none },
+        make_rfont, to_nop, toStr_rfont, toStr_rfont,
+        select_rfont, recycle_rfont, mark_rfont, rmbuf_nop },
 
     {"shader!", 0, 0,
-        make_shader, to_shader, toStr_shader, toStr_shader,
-        select_shader, recycle_none, mark_shader, rmbuf_shader },
+        make_shader, to_nop, toStr_shader, toStr_shader,
+        select_nop, recycle_nop, mark_shader, rmbuf_shader },
 };
 

trunk/thune/gl/png_load.c

@@ -179 +179 @@
     else
     {
-        ur_throwErr( UR_ERR_DATATYPE, "load-png expected string!" );
+        ur_throwErr( UR_ERR_DATATYPE, "load.png expected string!" );
     }
 }

trunk/thune/gl/project.r

@@ -81 +81 @@
         %audio.c
         %gllist.c
+        %gltex.c
         %png_load.c
         %TexFont.c

trunk/thune/gl/shader.c

@@ -215 +215 @@
                         break;
 
+                    case GL_SAMPLER_1D_ARB:
+                    case GL_SAMPLER_2D_ARB:
+                    case GL_SAMPLER_3D_ARB:
+                        ur_initType( cval, UT_NONE );
+                        ur_texId(cval) = 0;     // Expecting texture!.
+                        break;
+
                     default:
                         ur_initType( cval, UT_NONE );
@@ -262 +269 @@
         if( cval && ur_is(cval, UT_SHADER) )
         {
+            int texUnit = 0;
             Shader* sh = (Shader*) ur_bufPtr( cval->series.n )->ptr;
             glUseProgramObjectARB( sh->program );
@@ -308 +316 @@
 
                     //case GL_INT_VEC4_ARB:
+
+                    case GL_SAMPLER_1D_ARB:
+                    case GL_SAMPLER_2D_ARB:
+                    case GL_SAMPLER_3D_ARB:
+                        glActiveTexture( GL_TEXTURE0 + texUnit );
+                        glEnable( GL_TEXTURE_2D );
+                        glBindTexture( GL_TEXTURE_2D, ur_texId(cval) );
+                        glUniform1iARB( pi->location, texUnit );
+                        ++texUnit;
+                        break;
                 }
                 ++pi;
             }
-            /*
-            glUniform1fARB( loc_specularCoeff, specular_coefficient );
-            */
-
             return;
         }

trunk/thune/gl/test.t

@@ -45 +45 @@
 [load shader! swap make] proc :load.shader   ; (file -- shader)
 
-"data/model/d7.gx" load draw-list.compile :d7-list
-
-"data/shader/brick.gx"
+
+;"data/model/d7.gx"
+"data/model/cube.gx"
+    load draw-list.compile :d7-list
+
+;"data/shader/brick.gx"
 ;"data/shader/testA.gx"
+"data/shader/colormap.gx"
     load.shader :test-shader
+
+texture!
+"data/image/primal64.png"
+;"data/image/kr_wood01.png"
+    load.png make :test-shader/cmap
+
+;test-shader .
 
 0,0,0 :strobe