Changeset 312 for trunk/thune/gl

Timestamp:

12/03/06 04:52:27 (2 years ago)

Author:

krobillard

Message:

Thune - Renamed array! to vector!. Added vector! make.

Location:

trunk/thune/gl

Files:

• draw_list.c (modified) (11 diffs)
• draw_ops.h (modified) (1 diff)
• glh.h (added)
• gx.c (modified) (6 diffs)
• gx.t (modified) (2 diffs)
• gx_dt.c (modified) (2 diffs)
• project.r (modified) (1 diff)
• test.t (modified) (1 diff)

trunk/thune/gl/draw_list.c

@@ -19 +19 @@
 
 
-#define GL_GLEXT_PROTOTYPES
-
 #include <assert.h>
+#include "glh.h"
 #include "gx.h"
 #include "gx_atoms.h"
@@ -32 +31 @@
 #include FT_FREETYPE_H
 #include "TexFont.h"
-
-#ifdef __APPLE__
-#include <OpenGL/glu.h>
-#else
-#include <GL/glu.h>
-#endif
 
 
@@ -393 +386 @@
 
         val = ctxCells + CAM_CTX_ORIENT;
-        if( ur_is(val, UT_ARRAY) && (ur_arrayDT(val) == UT_DECIMAL) )
+        if( ur_is(val, UT_VECTOR) && (ur_arrayDT(val) == UT_DECIMAL) )
         {
             GLfloat eye[16];
@@ -494 +487 @@
 
 
+#if 0
+// Transform from -1..1 to 0..1
+const GLdouble bias[] =
+{
+    0.5, 0.0, 0.0, 0.0, 
+    0.0, 0.5, 0.0, 0.0,
+    0.0, 0.0, 0.5, 0.0,
+    0.5, 0.5, 0.5, 1.0
+};
+
+
+static void dop_shadowmap( /*UThread* ur_thread,*/ UCell* fbCell )
+{
+    glBindFramebufferEXT( GL_FRAMEBUFFER_EXT, ur_fboId(fbCell) );
+    glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT );
+
+    //glPolygonOffset( polygon_offset_scale, polygon_offset_bias );
+    glPolygonOffset( 2.0f, 10.0f );
+    glEnable( GL_POLYGON_OFFSET_FILL );
+
+    glMatrixMode( GL_TEXTURE );
+    glLoadMatrixd( bias );
+#if 1
+    gluPerspective( fov, 1, near, far );
+#else
+    glMultMatrixd( l->get_proj_matrix() );
+    glMultMatrixd( l->get_model_matrix() );
+#endif
+    glMatrixMode( GL_MODELVIEW );
+}
+
+
+static void dop_shadowmap_end()
+{
+    glDisable( GL_POLYGON_OFFSET_FILL );
+    glBindFramebufferEXT( GL_FRAMEBUFFER_EXT, 0 );
+}
+#endif
+
+
 /*
    icell is an int array!
@@ -598 +631 @@
                 {
                     if( ur_gldl(val) )
+                    {
+                        //if( ur_gldl(val) != 1 )
+                        //    printf( "KR list %d\n", ur_gldl(val) );
                         glCallList( ur_gldl(val) );
+                    }
                     else if( ! _runDrawList( ur_thread, val ) )
                         return 0;
@@ -710 +747 @@
             case DOP_VERTS:
                 ++pc;
-                if( ur_is(pc, UT_ARRAY) )
+                if( ur_is(pc, UT_VECTOR) )
                     _state.vertVals = ur_bin(pc)->ptr.f;
                 break;
@@ -716 +753 @@
             case DOP_NORMALS:
                 ++pc;
-                if( ur_is(pc, UT_ARRAY) )
+                if( ur_is(pc, UT_VECTOR) )
                     _state.normVals = ur_bin(pc)->ptr.f;
                 break;
@@ -722 +759 @@
             case DOP_UVS:
                 ++pc;
-                if( ur_is(pc, UT_ARRAY) )
+                if( ur_is(pc, UT_VECTOR) )
                     _state.uvVals = ur_bin(pc)->ptr.f;
                 break;
@@ -736 +773 @@
                 pc += 2;
                 if( ur_is(pc-1, UT_WORD) &&
-                    ur_is(pc, UT_ARRAY) && (ur_arrayDT(pc) == UT_INT) &&
+                    ur_is(pc, UT_VECTOR) && (ur_arrayDT(pc) == UT_INT) &&
                     _state.vertVals )
                 {
@@ -839 +876 @@
                     glBindFramebufferEXT( GL_FRAMEBUFFER_EXT, 0 );
                 break;
-
+#if 0
+            case DOP_SHADOWMAP:
+                ++pc;
+                VAL_WORD_OR_PC
+                if( ur_is(val, UT_FBO) )
+                    dop_shadowmap( /*ur_thread,*/ val );
+                else
+                    dop_shadowmap_end();
+                break;
+#endif
             default:
                 assert( 0 && "Invalid Draw List Opcode" );
@@ -889 +935 @@
         gr_clearState();
 
+        //printf( "KR compile %d\n", ur_gldl(tos) );
+
         glNewList( ur_gldl(tos), GL_COMPILE );
 

trunk/thune/gl/draw_ops.h

@@ -32 +32 @@
 #define DOP_SHADER          29
 #define DOP_FRAMEBUFFER     30
+#define DOP_SHADOWMAP       31

trunk/thune/gl/gx.c

@@ -27 +27 @@
 #include <glv_keys.h>
 #include "os.h"
+#include "glh.h"
 #include "gx.h"
 #include "gx_atoms.h"
@@ -35 +36 @@
 #include "math3d.h"
 //#include <time.h>
-
-#ifdef __APPLE__
-#include <OpenGL/glu.h>
-#else
-#include <GL/glu.h>
-#endif
 
 
@@ -1074 +1069 @@
     prev = ur_s_prev(tos);
 
-    if( ur_is(prev, UT_ARRAY) && ur_is(tos, UT_VEC3) )
+    if( ur_is(prev, UT_VECTOR) && ur_is(tos, UT_VEC3) )
     {
         bin = ur_bin( prev );
@@ -1106 +1101 @@
 
 
+// Should 'gl-extensions, etc. be replaced with a single 'gl-info call that
+// returns a context holding version, extensions, max-textures, etc.?
+
 // ( -- string)
 UR_CALL( uc_gl_extensions )
 {
-    // Replace with 'gl-info that returns version, extensions, etc.?
     const GLubyte* str;
     UIndex binN;
@@ -1124 +1121 @@
     ur_setSeries(tos, binN, 0 );
 }
+
+
+// ( -- count)
+UR_CALL( uc_gl_max_textures )
+{
+    GLint count;
+
+    UR_CALL_UNUSED_TH
+    UR_CALL_UNUSED_TOS
+
+    glGetIntegerv( GL_MAX_TEXTURE_UNITS, &count );
+
+    UR_S_GROW;
+    ur_initType(UR_TOS, UT_INT);
+    ur_int(UR_TOS) = count;
+}
+
+
+#if 0
+#if 0
+extern float perlinNoise2D( float x, float y, int octaves, float persist );
+#define PReal   float
+#else
+extern double perlinNoise2D( double x, double y, double alpha, double beta,
+                             int n );
+#define PReal   double
+#endif
+
+// (raster octaves persist -- raster)
+UR_CALL( uc_perlin )
+{
+    RasterHead* rh;
+    int octaves;
+    PReal persist;
+    UCell* octc = ur_s_prev(tos);
+    UCell* rasc = ur_s_prev(octc);
+
+    if( ur_is(rasc, UT_RASTER) &&
+        ur_is(octc, UT_INT) &&
+        ur_is(tos, UT_DECIMAL) )
+    {
+        PReal x, y, w, h, n;
+        int in;
+        uint8_t* ep;
+
+        octaves = ur_int(octc);
+        if( octaves < 1 )
+            octaves = 1;
+        else if( octaves > 4 )
+            octaves = 4;
+
+        persist = ur_decimal(tos);
+        if( persist < 0.05f )
+            persist = 0.05f;
+        else if( persist > 1.0f )
+            persist = 1.0f;
+
+        rh = ur_rastHead(rasc);
+        assert( rh );
+
+        w  = (PReal) rh->width;
+        h  = (PReal) rh->height;
+        ep = (uint8_t*) (rh + 1);
+
+        switch( rh->format )
+        {
+            case UR_RAST_GRAY:
+                break;
+
+            case UR_RAST_RGB:
+                for( y = 0.0f; y < h; y += 1.0f )
+                {
+                    for( x = 0.0f; x < w; x += 1.0f )
+                    {
+                      //n = perlinNoise2D( x * 0.1, y * 0.1, octaves, persist );
+                        n = perlinNoise2D( x/w, y/h, persist, 2, octaves );
+
+                        //printf( "%g\n", n );
+                        in = (int) ((n + 1.0f) * 127.0f);
+                        *ep++ = in;
+                        *ep++ = in;
+                        *ep++ = in;
+                    }
+                    //printf( "\n" );
+                }
+                break;
+
+            case UR_RAST_RGBA:
+                break;
+        }
+
+        
+        UR_S_DROPN(2);
+        return;
+    }
+
+    ur_throwErr( UR_ERR_DATATYPE, "perlin expected raster! int! decimal!" );
+}
+
+
+extern const char* _framebufferStatus();
+
+// (size -- framebuffer)
+UR_CALL( uc_shadowmap )
+{
+    if( ur_is(tos, UT_COORD) )
+    {
+        GLuint fboName;
+        GLuint texName;
+        GLint depthBits;
+        int fboPool;
+        int texPool;
+        const char* err;
+
+
+        glGetIntegerv( GL_DEPTH_BITS, &depthBits );
+        printf( "KR depthBits %d\n", depthBits );
+
+        // TODO: Hold texture! (return context?)
+        texName = gltex_alloc( &texPool );
+        glBindTexture( GL_TEXTURE_2D, texName );
+        glTexImage2D( GL_TEXTURE_2D, 0,
+                      (depthBits == 16) ? GL_DEPTH_COMPONENT16 :
+                                          GL_DEPTH_COMPONENT24,
+                      tos->coord.elem[0], tos->coord.elem[1], 0,
+                      GL_DEPTH_COMPONENT,
+                      //GL_UNSIGNED_INT,
+                      GL_UNSIGNED_BYTE,
+                      NULL );
+
+        glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR );
+        glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR );
+        glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE );
+        glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE );
+        glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_COMPARE_MODE_ARB,
+                                        GL_COMPARE_R_TO_TEXTURE_ARB );
+        glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_COMPARE_FUNC_ARB,
+                                        GL_LEQUAL );
+        //glTexParameteri( GL_TEXTURE_2D, GL_DEPTH_TEXTURE_MODE_ARB,
+        //                 GL_INTENSITY );
+
+
+        fboName = glfbo_alloc( &fboPool );
+        glBindFramebufferEXT( GL_FRAMEBUFFER_EXT, fboName );
+        glFramebufferTexture2DEXT( GL_FRAMEBUFFER_EXT,
+                 GL_DEPTH_ATTACHMENT_EXT, GL_TEXTURE_2D, texName, 0 );
+        glDrawBuffer( GL_NONE );
+        //glReadBuffer( GL_FALSE );
+
+        if( (err = _framebufferStatus()) )
+        {
+            ur_throwErr( UR_ERR_INTERNAL, err );
+            return;
+        }
+
+        glBindFramebufferEXT( GL_FRAMEBUFFER_EXT, 0 );
+
+        ur_initType( tos, UT_FBO );
+        ur_fboPool(tos) = fboPool;
+        ur_fboId(tos)   = fboName;
+        return;
+    }
+    ur_throwErr( UR_ERR_DATATYPE, "shadowmap expected coord!" );
+}
+#endif
 
 
@@ -1830 +1992 @@
     { uc_display,        "display" },
     { uc_look_at,        "look-at" },
-    { uc_gl_extensions,  "gl-extensions" }
+    { uc_gl_extensions,  "gl-extensions" },
+    { uc_gl_max_textures,"gl-max-textures" },
+    //{ uc_perlin,         "perlin" },
+    //{ uc_shadowmap,      "shadowmap" }
 };
 

trunk/thune/gl/gx.t

@@ -135 +135 @@
     shader
     framebuffer
+    shadowmap
 ]
 make-opcodes :draw-list-opcodes
@@ -193 +194 @@
 [load.png texture! swap make] proc :load.tex    ; (png -- texture)
 
+[file | rast]
+[
+    file load.png :rast
+    texture! [rast 'mipmap] make
+] func :load.mip    ; (png -- texture)
+
 
 ;eof

trunk/thune/gl/gx_dt.c

@@ -19 +19 @@
 
 
-#ifdef __APPLE__
-#include <OpenGL/glu.h>
-#else
-#define GL_GLEXT_PROTOTYPES
-#include <GL/glu.h>
-#endif
-
-
 #include "os.h"
+#include "glh.h"
 #include "gx.h"
 #include "internal.h"
@@ -695 +688 @@
 
 
-static const char* _framebufferStatus()
+const char* _framebufferStatus()
 {
     GLenum status;

trunk/thune/gl/project.r

@@ -87 +87 @@
         %rfont.c
         %shader.c
-        ;%res.c
+        ;%perlin.c
+        ;%noise.c
         ;%../util/cbparse.c
         ;%png_save.c

trunk/thune/gl/test.t

@@ -50 +50 @@
 
 ;"data/shader/brick.gx"
-;"data/shader/testA.gx"
+;"data/shader/specular.gx"
 "data/shader/colormap.gx"
     load.shader :test-shader