Changeset 347 for trunk/thune/gl

Timestamp:

01/20/07 05:28:58 (2 years ago)

Author:

krobillard

Message:

Thune GL - Shadowmap working, imported shaders, updated atoms.

Location:

trunk/thune/gl

Files:

• data (added)
• data/font (added)
• data/image (added)
• data/model (added)
• data/shader (added)
• data/shader/brick.gx (added)
• data/shader/clsmap.gx (added)
• data/shader/cmap_shadow.gx (added)
• data/shader/colormap.gx (added)
• data/shader/lh_specular.gx (added)
• data/shader/lumimap.gx (added)
• data/shader/matte.gx (added)
• data/shader/partsphere.gx (added)
• data/shader/specular.gx (added)
• data/shader/specular_mat.gx (added)
• draw_list.c (modified) (5 diffs)
• gx.t (modified) (1 diff)
• gx_atoms.h (modified) (1 diff)
• gx_dt.c (modified) (6 diffs)
• project.r (modified) (2 diffs)
• scripts (added)
• scripts/cloud.t (added)
• scripts/fbo.t (added)
• scripts/shadow.t (added)
• scripts/view.t (added)

trunk/thune/gl/draw_list.c

@@ -336 +336 @@
 }
 #endif
+
+
+static GLfloat* _cameraMatrix = 0;
 
 
@@ -384 +387 @@
         if( ur_is(val, UT_VECTOR) && (ur_vectorDT(val) == UT_DECIMAL) )
         {
+            // glLoadTransposeMatrixf() could be used in GL 2.0?
             GLfloat eye[16];
             UBinary* arr = ur_bin(val);
             if( arr->used == 16 )
             {
+                _cameraMatrix = arr->ptr.f;
                 ur_matrixInverse( eye, arr->ptr.f );
                 glLoadMatrixf( eye );
@@ -484 +489 @@
 
 #if 1
+#define SHADOW_BACK_FACES   1
+
+static GLdouble lightViewMatrix[ 16 ];
+static GLdouble lightProjMatrix[ 16 ];
+
+
+/*
+   Camera must be set up for light before calling shadow-begin.
+*/
+static void dop_shadow_begin( /*UThread* ur_thread,*/ UCell* fbCell )
+{
+    // Save matrices for shadow-end.
+    glGetDoublev( GL_MODELVIEW_MATRIX, lightViewMatrix );
+    glGetDoublev( GL_PROJECTION_MATRIX, lightProjMatrix );
+
+
+    glDepthMask( GL_TRUE );
+    glEnable( GL_DEPTH_TEST );
+    glDisable( GL_LIGHTING );
+    glDisable( GL_BLEND );
+    gr_disableTexture();
+
+
+    glBindFramebufferEXT( GL_FRAMEBUFFER_EXT, ur_fboId(fbCell) );
+    glClear( GL_DEPTH_BUFFER_BIT );
+
+#ifdef SHADOW_BACK_FACES
+    glEnable( GL_CULL_FACE );
+    glCullFace( GL_FRONT );
+#else
+    glEnable( GL_POLYGON_OFFSET_FILL );
+    //glPolygonOffset( polygon_offset_scale, polygon_offset_bias );
+    //glPolygonOffset( 2.0f, 10.0f );
+    glPolygonOffset( 2.0f, 4.0f );
+#endif
+}
+
+
 // Transform from -1..1 to 0..1
 const GLdouble bias[] =
@@ -492 +535 @@
     0.5, 0.5, 0.5, 1.0
 };
-
-
-GLdouble lightModelMatrix[ 16 ];
-GLdouble lightProjMatrix[ 16 ];
-
-//#define SHADOW_BACK_FACES   1
-
-static void dop_shadow_begin( /*UThread* ur_thread,*/ UCell* fbCell )
-{
-    glGetDoublev( GL_MODELVIEW_MATRIX, lightModelMatrix );
-    glGetDoublev( GL_PROJECTION_MATRIX, lightProjMatrix );
-
-
-    glBindFramebufferEXT( GL_FRAMEBUFFER_EXT, ur_fboId(fbCell) );
-    glClear( GL_DEPTH_BUFFER_BIT );
-
-#ifdef SHADOW_BACK_FACES
-    glEnable( GL_CULL_FACE );
-    glCullFace( GL_FRONT );
-#else
-    //glPolygonOffset( polygon_offset_scale, polygon_offset_bias );
-    glPolygonOffset( 2.0f, 10.0f );
-    //glPolygonOffset( 2.0f, 2.0f );
-    glEnable( GL_POLYGON_OFFSET_FILL );
-#endif
-
-
-#if 0
-    glMatrixMode( GL_TEXTURE );
-    glLoadIdentity();
-    glMatrixMode( GL_MODELVIEW );
-#endif
-
-}
 
 
@@ -538 +547 @@
 
 
-    //glActiveTextureARB(GL_TEXTURE1_ARB);
-
+    glActiveTextureARB( GL_TEXTURE1 );
     glMatrixMode( GL_TEXTURE );
+
+#if 1
     glLoadMatrixd( bias );
-#if 0
-    gluPerspective( fov, 1, near, far );
 #else
+    glLoadIdentity();
+#endif
     glMultMatrixd( lightProjMatrix );
-    glMultMatrixd( lightModelMatrix );
-#endif
+    glMultMatrixd( lightViewMatrix );
+    //glMultMatrixf( _cameraMatrix );
+
     glMatrixMode( GL_MODELVIEW );
-
-    //glActiveTextureARB(GL_TEXTURE0_ARB);
+    glActiveTextureARB( GL_TEXTURE0 );
 }
 #endif

trunk/thune/gl/gx.t

@@ -52 +52 @@
 context :widget-proto
 
+
+/*
+[
+    none  :value
+    0.0   :time
+    'loop :repeat
+    none  :curve
+]
+context :anim-proto
+
+[
+    0.0,0,0 :p1
+    0.0,0,0 :p2
+    1.0  :radius
+    none :mesh
+    -1   :mask
+    []   :hits
+]
+context :hit-input
+*/
 
 [

trunk/thune/gl/gx_atoms.h

@@ -1 +1 @@
 // This file is automatically generated - do not edit.
 
-#define UR_ATOM_DRAW_LIST_OPCODES               303
-#define UR_ATOM_WIDTH           304
-#define UR_ATOM_HEIGHT          305
-#define UR_ATOM_AREA            306
-#define UR_ATOM_RECT            307
-#define UR_ATOM_RASTER          308
-#define UR_ATOM_TEXTURE         309
-#define UR_ATOM_ELEM            310
-#define UR_ATOM_CLOSE           171
-#define UR_ATOM_FOCUS           311
-#define UR_ATOM_RESIZE          312
-#define UR_ATOM_KEY_DOWN                313
-#define UR_ATOM_KEY_UP          314
-#define UR_ATOM_MOUSE_MOVE              315
-#define UR_ATOM_MOUSE_UP                316
-#define UR_ATOM_MOUSE_DOWN              317
-#define UR_ATOM_MOUSE_WHEEL             318
-#define UR_ATOM_AMBIENT         319
-#define UR_ATOM_DIFFUSE         320
-#define UR_ATOM_SPECULAR                321
-#define UR_ATOM_POS             322
-#define UR_ATOM_SHADER          323
-#define UR_ATOM_VERTEX          324
-#define UR_ATOM_FRAGMENT                325
-#define UR_ATOM_DEFAULT         326
-#define UR_ATOM_RGB             327
-#define UR_ATOM_RGBA            328
-#define UR_ATOM_DEPTH           329
-#define UR_ATOM_CLAMP           330
-#define UR_ATOM_REPEAT          331
-#define UR_ATOM_NEAREST         332
-#define UR_ATOM_LINEAR          333
-#define UR_ATOM_MIN             334
-#define UR_ATOM_MAG             335
-#define UR_ATOM_MIPMAP          336
-#define UR_ATOM_ON              247
-#define UR_ATOM_OFF             249
-#define UR_ATOM_ADD             190
-#define UR_ATOM_BURN            337
-#define UR_ATOM_COLOR           338
-#define UR_ATOM_TRANS           339
+#define UR_ATOM_DRAW_LIST_OPCODES               307
+#define UR_ATOM_WIDTH           308
+#define UR_ATOM_HEIGHT          309
+#define UR_ATOM_AREA            310
+#define UR_ATOM_RECT            311
+#define UR_ATOM_RASTER          312
+#define UR_ATOM_TEXTURE         313
+#define UR_ATOM_ELEM            314
+#define UR_ATOM_CLOSE           172
+#define UR_ATOM_FOCUS           315
+#define UR_ATOM_RESIZE          316
+#define UR_ATOM_KEY_DOWN                317
+#define UR_ATOM_KEY_UP          318
+#define UR_ATOM_MOUSE_MOVE              319
+#define UR_ATOM_MOUSE_UP                320
+#define UR_ATOM_MOUSE_DOWN              321
+#define UR_ATOM_MOUSE_WHEEL             322
+#define UR_ATOM_AMBIENT         323
+#define UR_ATOM_DIFFUSE         324
+#define UR_ATOM_SPECULAR                325
+#define UR_ATOM_POS             326
+#define UR_ATOM_SHADER          327
+#define UR_ATOM_VERTEX          328
+#define UR_ATOM_FRAGMENT                329
+#define UR_ATOM_DEFAULT         330
+#define UR_ATOM_RGB             331
+#define UR_ATOM_RGBA            332
+#define UR_ATOM_DEPTH           333
+#define UR_ATOM_CLAMP           334
+#define UR_ATOM_REPEAT          335
+#define UR_ATOM_NEAREST         336
+#define UR_ATOM_LINEAR          337
+#define UR_ATOM_MIN             338
+#define UR_ATOM_MAG             339
+#define UR_ATOM_MIPMAP          340
+#define UR_ATOM_ON              250
+#define UR_ATOM_OFF             252
+#define UR_ATOM_ADD             191
+#define UR_ATOM_BURN            341
+#define UR_ATOM_COLOR           342
+#define UR_ATOM_TRANS           343

trunk/thune/gl/gx_dt.c

@@ -240 +240 @@
 
 
-struct TextureDef
+typedef struct
 {
     const void* pixels;
@@ -250 +250 @@
     GLint  min_filter;
     GLint  mag_filter;
-};
-
-
-static void _texRast( struct TextureDef* tex, const RasterHead* rh )
+}
+TextureDef;
+
+
+static void _texRast( TextureDef* tex, const RasterHead* rh )
 {
     tex->width  = rh->width;
@@ -280 +281 @@
 
 
-static void _texCoord( struct TextureDef* tex, const UCell* cell )
+static void _texCoord( TextureDef* tex, const UCell* cell )
 {
     tex->width  = cell->coord.elem[0];
@@ -309 +310 @@
 UR_CALL( make_texture )
 {
-    struct TextureDef def;
+    TextureDef def;
     GLuint name;
     int pool;
@@ -778 +779 @@
 /*
   (framebuffer! texture -- fbo)
+  (framebuffer! coord -- fbo)
 */
+//  (framebuffer! size 'shadow -- fbo)
 UR_CALL( make_fbo )
 {
-    int pool;
-    GLuint name;
+    int fbPool;
+    int texPool;
+    GLuint fbName;
+    GLuint texName;
     const char* err;
     UCell* res = ur_s_prev(tos);
@@ -790 +795 @@
         if( ur_is(tos, UT_TEXTURE) )
         {
-            name = glfbo_alloc( &pool );
-
-            glBindFramebufferEXT( GL_FRAMEBUFFER_EXT, name );
-
-            glFramebufferTexture2DEXT( GL_FRAMEBUFFER_EXT,
-                                       GL_COLOR_ATTACHMENT0_EXT, GL_TEXTURE_2D,
-                                       ur_texId(tos), 0 );
-
-            if( (err = _framebufferStatus()) )
-            {
-                ur_throwErr( UR_ERR_INTERNAL, err );
-                return;
-            }
-
-            glBindFramebufferEXT( GL_FRAMEBUFFER_EXT, 0 );
-
-            ur_initType( res, UT_FBO );
-            ur_fboPool(res)    = pool;
-            ur_fboId(res)      = name;
-            ur_fboTexPool(res) = ur_texPool(tos);
-            ur_fboTexId(res)   = ur_texId(tos);
-
-            UR_S_DROP;
-            return;
-        }
-    }
-    ur_throwErr( UR_ERR_DATATYPE, "framebuffer! make expected texture!" );
+            fbName = glfbo_alloc( &fbPool );
+            texName = ur_texId(tos);
+            texPool = ur_texPool(tos);
+            goto build;
+        }
+        else if( ur_is(tos, UT_COORD) )
+        {
+            TextureDef def;
+
+            fbName = glfbo_alloc( &fbPool );
+
+            _texCoord( &def, tos );
+
+            texName = gltex_alloc( &texPool );
+            glBindTexture( GL_TEXTURE_2D, texName );
+
+            glTexImage2D( GL_TEXTURE_2D, 0, def.comp, def.width, def.height,
+                          0, def.format, GL_UNSIGNED_BYTE, 0 );
+            /*
+            glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, def.wrap );
+            glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, def.wrap );
+            */
+            glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR );
+            glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR );
+            goto build;
+        }
+        /*
+        else if( ur_isAWord(tos) && (ur_atom(tos) == UR_ATOM_SHADOW) )
+        {
+        }
+        */
+    }
+    ur_throwErr( UR_ERR_DATATYPE,
+                 "framebuffer! make expected texture!/coord!" );
+    return;
+
+build:
+
+    glBindFramebufferEXT( GL_FRAMEBUFFER_EXT, fbName );
+
+    glFramebufferTexture2DEXT( GL_FRAMEBUFFER_EXT,
+                               GL_COLOR_ATTACHMENT0_EXT, GL_TEXTURE_2D,
+                               texName, 0 );
+
+    if( (err = _framebufferStatus()) )
+    {
+        ur_throwErr( UR_ERR_INTERNAL, err );
+        return;
+    }
+
+    glBindFramebufferEXT( GL_FRAMEBUFFER_EXT, 0 );
+
+    ur_initType( res, UT_FBO );
+    ur_fboPool(res)    = fbPool;
+    ur_fboId(res)      = fbName;
+    ur_fboTexPool(res) = texPool;
+    ur_fboTexId(res)   = texName;
+
+    UR_S_DROP;
 }
 

trunk/thune/gl/project.r

@@ -10 +10 @@
     include_from %.
     include_from %..
+    ;include_from %hit
     ;include_from %../util
     libs_from %.. %thune0
@@ -89 +90 @@
         %shader.c
         ;%perlin.c
+        ;%hit/AABBTree.c
+        ;%hit/build_bbt.c
 
         ;%noise.c