Changeset 54 for trunk/orca/gl/dlist.c

Timestamp:

02/17/06 15:30:01 (3 years ago)

Author:

krobillard

Message:

Now using orDecimal() & orInt() where appropriate.

Files:

• trunk/orca/gl/dlist.c (modified) (8 diffs)

trunk/orca/gl/dlist.c

@@ -113 +113 @@
 {
     if( val->type == OT_DECIMAL )
-        return (GLfloat) val->num.decimal;
+        return (GLfloat) orDecimal(val);
     else if( val->type == OT_INTEGER )
-        return (GLfloat) val->integer;
+        return (GLfloat) orInt(val);
     return 0.0f;
 }
@@ -132 +132 @@
     else if( val->type == OT_DECIMAL )
     {
-        GLfloat f = (GLfloat) val->num.decimal;
+        GLfloat f = (GLfloat) orDecimal(val);
         pc[0].f = pc[1].f = pc[2].f = f;
     }
     else if( val->type == OT_INTEGER )
     {
-        GLfloat f = (GLfloat) val->integer;
+        GLfloat f = (GLfloat) orInt(val);
         pc[0].f = pc[1].f = pc[2].f = f;
     }
@@ -238 +238 @@
         pc = ((RenderWord*) prog->buf) + prog->used;
 
-        switch( match->integer )
+        switch( orInt(match) )
         {
             case DLP_CALL_INT:
@@ -508 +508 @@
             return;
         }
-        key = a1->integer;
+        key = orInt(a1);
     }
     else
@@ -573 +573 @@
             {
                 case PRIM_KEY_VERTEX:
-                    vindex = idx->integer * 3;
+                    vindex = orInt(idx) * 3;
                     getVector( 3, gEnv.state.vertVals + vindex, vec );
                     glVertex3dv( vec );
@@ -580 +580 @@
 
                 case PRIM_KEY_NORMAL:
-                    vindex = idx->integer * 3;
+                    vindex = orInt(idx) * 3;
                     getVector( 3, gEnv.state.normVals + vindex, vec );
                     glNormal3dv( vec );
@@ -588 +588 @@
                 case PRIM_KEY_COLOR:
                 {
-                    OValue* cval = gEnv.state.colorVals + idx->integer;
+                    OValue* cval = gEnv.state.colorVals + orInt(idx);
                     if( orIs(cval, OT_TUPLE) )
                     {
@@ -600 +600 @@
 
                 case PRIM_KEY_UV0:
-                    vindex = idx->integer * 2;
+                    vindex = orInt(idx) * 2;
                     getVector( 2, gEnv.state.uvVals + vindex, vec );
                     //printf( "KR UV0 %g %g\n", vec[0], vec[1] );