Changeset 383

Timestamp:

04/29/07 06:21:11 (19 months ago)

Author:

krobillard

Message:

Thune GL - Shader attributes can now be used.

Location:

trunk/thune

Files:

• doc/GLManual (modified) (3 diffs)
• gl/boot.c (modified) (1 diff)
• gl/draw_list.c (modified) (8 diffs)
• gl/draw_ops.h (modified) (1 diff)
• gl/gx.h (modified) (2 diffs)
• gl/gx.t (modified) (1 diff)

trunk/thune/doc/GLManual

@@ -229 +229 @@
 normals           vector!                 Set normal array
 uvs               vector!                 Set texture UV array
+attrib            select! (int!) vector!  Set user attribute array
 points            attr vector!            Draw points
 lines             attr vector!            Draw line primitives
@@ -256 +257 @@
 UV                t                       Index into texture *uvs* vector
 Vertex            v                       Index into *verts* vector
+User Attribute    a                       Index into *attrib* vector
 ================  ======================  ===========================
 
+The UV attribute (t) may appear more than once in the word.  Each occurance
+will set the UV of the next texture unit (0, 1, 2, etc.).
 
 Some primitive examples::
@@ -267 +271 @@
 
     quads tnv #[0 0 0   1 0 1   2 0 2   3 0 3
-
 
 

trunk/thune/gl/boot.c

@@ -69 +69 @@
   "    normals\n"
   "    uvs\n"
+  "    attrib\n"
   "    points\n"
   "    lines\n"

trunk/thune/gl/draw_list.c

@@ -73 +73 @@
     _state.uvVals    = 0;
     _state.colorVals = 0;
+    _state.attr[0].vals = 0;
+    _state.attr[1].vals = 0;
 }
 
@@ -598 +600 @@
 
 /*
+  attrib/1 shader/my-attrib float-count #[...]
+
+  Returns pc at last argument or zero if arguments are bad.
+*/
+static UCell* dop_attrib( UThread* ur_thread, UCell* pc )
+{
+    GrVertexAttribute* attr;
+    Shader* sh = 0;
+
+    attr = _state.attr; // + ur_sel(pc);
+    ++pc;
+
+    if( ur_is(pc, UT_SELECT) )
+    {
+        UCell* val = ur_wordCell( ur_thread, pc );
+        if( ! val )
+            return 0;
+        if( ur_is(val, UT_CONTEXT) )
+        {
+            UCell* cval = ur_blockPtr( val->ctx.valBlk )->ptr.cells;
+            if( cval && ur_is(cval, UT_SHADER) )
+            {
+                sh = (Shader*) ur_resPtr( cval->series.n )->ptr;
+            }
+        }
+        else if( ur_is(val, UT_SHADER) )
+        {
+            sh = (Shader*) ur_resPtr( val->series.n )->ptr;
+        }
+    }
+
+    if( ! sh )
+    {
+        ur_throwErr( UR_ERR_DATATYPE, "attrib expected shader!" );
+        return 0;
+    }
+
+    //glUseProgram( sh->program );
+
+    // LIMIT: Shader attribute names must be lower-case.
+    attr->loc = glGetAttribLocation( sh->program, ur_atomCStr(ur_sel(pc), 0) );
+    if( attr->loc == -1 )
+    {
+        ur_throwErr( UR_ERR_SCRIPT, "attrib '%s not found",
+                     ur_atomCStr(ur_sel(pc), 0) );
+        return 0;
+    }
+
+    ++pc;
+    if( ur_is(pc, UT_INT) )
+    {
+        attr->count = ur_int(pc);
+        ++pc;
+    }
+    else
+    {
+        attr->count = 3;
+    }
+
+    if( ur_is(pc, UT_VECTOR) )
+    {
+        attr->vals = ur_bin(pc)->ptr.f;
+        return pc;
+    }
+
+    ur_throwErr( UR_ERR_DATATYPE, "attrib expected vector!" );
+    return 0;
+}
+
+
+/*
    icell is an int array!
 */
@@ -604 +677 @@
     //GLdouble vec[3];
     const char* ki;
+    int ti;
     UCell* col;
     int32_t* it;
@@ -613 +687 @@
 
     ki = key;
+    ti = 0;
 
     while( it != end )
@@ -618 +693 @@
         switch( *ki )
         {
-            /*
-            glUseProgram( program );
-            GLint attrib_loc = glGetAttribLocation( program, “my_attrib” );
-            if( attrib_loc == -1 ) not_found;
             case 'a':
-                glVertexAttrib3f( attrib_loc, 4.0f, 2.0f, 7.0f );
-                break;
-            */
+            {
+                GrVertexAttribute* attr = _state.attr;
+                switch( attr->count )
+                {
+                case 1:
+                    glVertexAttrib1fv( attr->loc, attr->vals + *it );
+                    break;
+                case 2:
+                    glVertexAttrib2fv( attr->loc, attr->vals + *it * 2 );
+                    break;
+                case 3:
+                    glVertexAttrib3fv( attr->loc, attr->vals + *it * 3 );
+                    break;
+                case 4:
+                    glVertexAttrib4fv( attr->loc, attr->vals + *it * 4 );
+                    break;
+                }
+            }
+                break;
 
             case 'c':
@@ -657 +744 @@
                 float* uv = _state.uvVals + *it * 2;
                 //glMultiTexCoord2fv( GL_TEXTURE0, uv );
-                glMultiTexCoord2f( GL_TEXTURE0, uv[0], 1.0f - uv[1] );
+                glMultiTexCoord2f( GL_TEXTURE0 + ti, uv[0], 1.0f - uv[1] );
+                ++ti;
             }
                 break;
@@ -664 +752 @@
         ++ki;
         if( *ki == '\0' )
+        {
             ki = key;
+            ti = 0;
+        }
 
         ++it;
@@ -852 +943 @@
                 if( ur_is(pc, UT_VECTOR) )
                     _state.uvVals = ur_bin(pc)->ptr.f;
+                break;
+
+            case DOP_ATTRIB:
+                pc = dop_attrib( ur_thread, pc );
+                if( ! pc )
+                    return 0;
                 break;
 

trunk/thune/gl/draw_ops.h

@@ -14 +14 @@
 #define DOP_NORMALS         11
 #define DOP_UVS             12
-#define DOP_POINTS          13
-#define DOP_LINES           14
-#define DOP_LINE_STRIP      15
-#define DOP_TRIS            16
-#define DOP_TRI_STRIP       17
-#define DOP_TRI_FAN         18
-#define DOP_QUADS           19
-#define DOP_QUAD_STRIP      20
-#define DOP_CAMERA          21
-#define DOP_LIGHT           22
-#define DOP_LIGHTING        23
-#define DOP_PUSH            24
-#define DOP_POP             25
-#define DOP_TRANSLATE       26
-#define DOP_ROTATE          27
-#define DOP_SCALE           28
-#define DOP_FONT            29
-#define DOP_TEXT            30
-#define DOP_SHADER          31
-#define DOP_FRAMEBUFFER     32
-#define DOP_SHADOW_BEGIN    33
-#define DOP_SHADOW_END      34
+#define DOP_ATTRIB          13
+#define DOP_POINTS          14
+#define DOP_LINES           15
+#define DOP_LINE_STRIP      16
+#define DOP_TRIS            17
+#define DOP_TRI_STRIP       18
+#define DOP_TRI_FAN         19
+#define DOP_QUADS           20
+#define DOP_QUAD_STRIP      21
+#define DOP_CAMERA          22
+#define DOP_LIGHT           23
+#define DOP_LIGHTING        24
+#define DOP_PUSH            25
+#define DOP_POP             26
+#define DOP_TRANSLATE       27
+#define DOP_ROTATE          28
+#define DOP_SCALE           29
+#define DOP_FONT            30
+#define DOP_TEXT            31
+#define DOP_SHADER          32
+#define DOP_FRAMEBUFFER     33
+#define DOP_SHADOW_BEGIN    34
+#define DOP_SHADOW_END      35

trunk/thune/gl/gx.h

@@ -120 +120 @@
 
 
+typedef struct
+{
+    float* vals;
+    int    count;
+    GLint  loc;
+}
+GrVertexAttribute;
+
+
 struct GrRenderState
 {
@@ -133 +142 @@
     UCell*  colorVals;
     float*  uvVals;
+
+    GrVertexAttribute attr[2];
 };
 

trunk/thune/gl/gx.t

@@ -128 +128 @@
     normals
     uvs
+    attrib
 
     points