Changeset 492

Timestamp:

10/21/07 03:27:30 (12 months ago)

Author:

krobillard

Message:

Draw list primitive ops now accept an int! count argument.

Location:

trunk/thune/gl

Files:

• draw_list.c (modified) (3 diffs)
• scripts/view.t (modified) (2 diffs)

trunk/thune/gl/draw_list.c

@@ -856 +856 @@
 
 
+typedef struct
+{
+    const char* key;
+    const char* ki;
+    int ti;
+    int ai;
+}
+PrimAttrIt;
+
+
+static void _primAttr( /*UThread* ut,*/ PrimAttrIt* pa, int i )
+{
+    switch( *pa->ki )
+    {
+        case 'a':
+        {
+            GrVertexAttribute* attr = _state.attr + pa->ai;
+            ++pa->ai;
+            switch( attr->count )
+            {
+            case 1:
+                glVertexAttrib1fv( attr->loc, attr->vals + i );
+                break;
+            case 2:
+                glVertexAttrib2fv( attr->loc, attr->vals + i * 2 );
+                break;
+            case 3:
+                glVertexAttrib3fv( attr->loc, attr->vals + i * 3 );
+                break;
+            case 4:
+                glVertexAttrib4fv( attr->loc, attr->vals + i * 4 );
+                break;
+            }
+        }
+            break;
+
+        case 'c':
+        {
+            UCell* col = _state.colorVals + i;
+            if( ur_is(col, UT_COORD) )
+            {
+                glColor3ub( col->coord.elem[0],
+                            col->coord.elem[1],
+                            col->coord.elem[2] );
+            }
+            else if( ur_is(col, UT_VEC3) )
+            {
+                glColor3fv( col->vec3.xyz );
+            }
+        }
+            break;
+
+        case 'n':
+            //_getVectord( 3, _state.normVals + *it * 3, vec );
+            //glNormal3dv( vec );
+            glNormal3fv( _state.normVals + i * 3 );
+            break;
+
+        case 'v':
+            //_getVectord( 3, _state.vertVals + *it * 3, vec );
+            //glVertex3dv( vec );
+            glVertex3fv( _state.vertVals + i * 3 );
+            break;
+
+        case 't':
+        {
+            float* uv = _state.uvVals + i * 2;
+            //glMultiTexCoord2fv( GL_TEXTURE0, uv );
+            glMultiTexCoord2f( GL_TEXTURE0 + pa->ti, uv[0], 1.0f - uv[1] );
+            ++pa->ti;
+        }
+            break;
+    }
+
+    ++pa->ki;
+    if( *pa->ki == '\0' )
+    {
+        pa->ki = pa->key;
+        pa->ti = 0;
+        pa->ai = 0;
+    }
+}
+
+
 /*
-   icell is an int array!
+   icell is an array! of int.
 */
 static void _drawPrims( UThread* ut, UCell* icell, const char* key )
 {
-    //GLdouble vec[3];
-    const char* ki;
-    int ti, ai;
-    UCell* col;
+    PrimAttrIt pa;
     int32_t* it;
     int32_t* end;
@@ -872 +953 @@
     end = arr->ptr.i + arr->used;
 
-    ki = key;
-    ti = 0;
-    ai = 0;
+    pa.key = key;
+    pa.ki  = key;
+    pa.ti  = 0;
+    pa.ai  = 0;
 
     while( it != end )
-    {
-        switch( *ki )
-        {
-            case 'a':
-            {
-                GrVertexAttribute* attr = _state.attr + ai;
-                ++ai;
-                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':
-                col = _state.colorVals + *it;
-                if( ur_is(col, UT_COORD) )
-                {
-                    glColor3ub( col->coord.elem[0],
-                                col->coord.elem[1],
-                                col->coord.elem[2] );
-                }
-                else if( ur_is(col, UT_VEC3) )
-                {
-                    glColor3fv( col->vec3.xyz );
-                }
-                break;
-
-            case 'n':
-                //_getVectord( 3, _state.normVals + *it * 3, vec );
-                //glNormal3dv( vec );
-                glNormal3fv( _state.normVals + *it * 3 );
-                break;
-
-            case 'v':
-                //_getVectord( 3, _state.vertVals + *it * 3, vec );
-                //glVertex3dv( vec );
-                glVertex3fv( _state.vertVals + *it * 3 );
-                break;
-
-            case 't':
-            {
-                float* uv = _state.uvVals + *it * 2;
-                //glMultiTexCoord2fv( GL_TEXTURE0, uv );
-                glMultiTexCoord2f( GL_TEXTURE0 + ti, uv[0], 1.0f - uv[1] );
-                ++ti;
-            }
-                break;
-        }
-
-        ++ki;
-        if( *ki == '\0' )
-        {
-            ki = key;
-            ti = 0;
-            ai = 0;
-        }
-
-        ++it;
+        _primAttr( &pa, *it++ );
+}
+
+
+static void _drawPrimsN( const char* key, int keyLen,
+                         int primType, int primCount )
+{
+    PrimAttrIt pa;
+    int i;
+    int ac;
+
+    pa.key = key;
+    pa.ki  = key;
+    pa.ti  = 0;
+    pa.ai  = 0;
+
+    // Convert primCount to vertex count.
+    switch( primType )
+    {
+        case GL_POINTS:          break;
+        case GL_LINES:           primCount *= 2; break;
+        case GL_LINE_STRIP:      primCount += 1; break;
+        case GL_TRIANGLES:       primCount *= 3; break;
+        case GL_TRIANGLE_STRIP:  primCount += 2; break;
+        case GL_TRIANGLE_FAN:    primCount += 2; break;
+        case GL_QUADS:           primCount *= 4; break;
+        case GL_QUAD_STRIP:      primCount  = primCount * 2 + 2; break;
+        default: return;
+    }
+
+    for( i = 0; i < primCount; ++i )
+    {
+        for( ac = 0; ac < keyLen; ++ac )
+            _primAttr( &pa, i );
     }
 }
@@ -1378 +1424 @@
             case DOP_QUAD_STRIP:
                 pc += 2;
-                if( ur_is(pc-1, UT_WORD) &&
-                    ur_is(pc, UT_VECTOR) && (ur_vectorDT(pc) == UT_INT) &&
-                    _state.vertVals )
-                {
-                    glBegin( _primBegin[ ur_opcode(pc-2) - DOP_POINTS ] );
-                    _drawPrims( ut, pc, ur_atomCStr( ur_atom(pc-1), 0 ) );
-                    glEnd();
+                if( ur_is(pc-1, UT_WORD) && _state.vertVals )
+                {
+                    if( ur_is(pc, UT_VECTOR) && (ur_vectorDT(pc) == UT_INT) )
+                    {
+                        glBegin( _primBegin[ ur_opcode(pc-2) - DOP_POINTS ] );
+                        _drawPrims( ut, pc, ur_atomCStr( ur_atom(pc-1), 0 ) );
+                        glEnd();
+                    }
+                    else if( ur_is(pc, UT_INT) )
+                    {
+                        int ptype;
+                        int keyLen;
+                        const char* astr;
+
+                        ptype = _primBegin[ ur_opcode(pc-2) - DOP_POINTS ];
+                        glBegin( ptype );
+                        astr = ur_atomCStr( ur_atom(pc-1), &keyLen );
+                        _drawPrimsN( astr, keyLen, ptype, ur_int(pc) );
+                        glEnd();
+                    }
                 }
                 break;

trunk/thune/gl/scripts/view.t

@@ -66 +66 @@
             samples-begin
             shader sun-sh
-            points v #[0]
+            points v 1
         ][
             ;dup .
@@ -80 +80 @@
         disable/d
         shader flare
-        points tcv #[0 0 0]
+        points tcv 1
         particle/off
     ]