Changeset 54 for trunk/orca/gl

Timestamp:

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

Author:

krobillard

Message:

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

Location:

trunk/orca/gl

Files:

• dlist.c (modified) (8 diffs)
• gx.c (modified) (13 diffs)
• joystick.c (modified) (6 diffs)
• ttf_load.c (modified) (2 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] );

trunk/orca/gl/gx.c

@@ -325 +325 @@
     {
         if( val->type == OT_DECIMAL )
-            *vec++ = val->num.decimal;
+            *vec++ = orDecimal(val);
         else if( val->type == OT_INTEGER )
-            *vec++ = (GLdouble) val->integer;
+            *vec++ = (GLdouble) orInt(val);
         else
             *vec++ = 0.0;
@@ -704 +704 @@
     if( a1->type == OT_INTEGER )
     {
-        glCallList( a1->integer );
+        glCallList( orInt(a1) );
     }
     else
     {
-        DrawListResource* res = gxDList( a1->integer );
+        DrawListResource* res = gxDList( orInt(a1) );
         if( res && res->prog )
             gxRunRenderProgram( res->prog );
@@ -736 +736 @@
         else
         {
-            mode.id     = a1->integer;
+            mode.id     = orInt(a1);
             mode.width  = 0;
             mode.height = 0;
@@ -832 +832 @@
         if( it->type == OT_WORD )
         {
-            cp = orAtomCString( it->word.atom );
+            cp = orAtomCString( orAtom(it) );
             strLen = 0;
             while( cp[ strLen ] )
@@ -840 +840 @@
         else if( it->type == OT_CHAR )
         {
-            ch = it->integer;
+            ch = orInt(it);
             if( ! ch )
                 ch = -1;
@@ -1115 +1115 @@
     {
         if( val->type == OT_INTEGER )
-            *dim = (double) val->integer;
+            *dim = (double) orInt(val);
         else if( val->type == OT_DECIMAL )
-            *dim = val->num.decimal;
+            *dim = orDecimal(val);
         else
         {
@@ -1134 +1134 @@
 #define toDecimal(idx,dim) \
     if( val->type == OT_DECIMAL ) \
-        num[idx] = val->num.decimal * dim; \
+        num[idx] = orDecimal(val) * dim; \
     else if( val->type == OT_INTEGER ) \
-        num[idx] = (double) val->integer; \
+        num[idx] = (double) orInt(val); \
     else return 0;
 
@@ -1268 +1268 @@
     if( a1->type == OT_WORD )
     {
-        if( a1->word.atom == gEnv.atom_model )
+        if( orAtom(a1) == gEnv.atom_model )
         {
             gxStateModel();
         }
-        else if( a1->word.atom == gEnv.atom_solid )
+        else if( orAtom(a1) == gEnv.atom_solid )
         {
             gxStateSolid();
@@ -1389 +1389 @@
         {
             if( it->type == OT_DECIMAL )
-                *pf += (float) it->num.decimal;
+                *pf += (float) orDecimal(it);
             else if( it->type == OT_INTEGER )
-                *pf += (float) it->integer;
+                *pf += (float) orInt(it);
 
             ++pf;
@@ -1412 +1412 @@
 
         if( a3->type == OT_DECIMAL )
-            angle = a3->num.decimal;
+            angle = orDecimal(a3);
         else if( a3->type == OT_INTEGER )
-            angle = (double) a3->integer;
+            angle = (double) orInt(a3);
         else
             angle = 0.0;
@@ -1429 +1429 @@
 void keyRepeatNative( OValue* a1 )
 {
-    glv_filterRepeatKeys( gView, a1->integer );
+    glv_filterRepeatKeys( gView, orInt(a1) );
 }
 
@@ -1554 +1554 @@
 
     if( a1->type == OT_INTEGER )
-        key = a1->integer;
+        key = orInt(a1);
     else
         key = gxHashString(a1);
@@ -1579 +1579 @@
 
     if( a1->type == OT_INTEGER )
-        id = a1->integer;
+        id = orInt(a1);
     else if( a1->type == OT_WORD )
-        id = a1->word.atom;
+        id = orAtom(a1);
 
     if( orRefineSet(REF_RG_FREE) )

trunk/orca/gl/joystick.c

@@ -70 +70 @@
         val = cblk->values + JV_FD;
         orSetTF( val, OT_INTEGER );
-        val->integer = fd;
+        orInt(val) = fd;
 
         i = orMakeCString( name, -1 );
@@ -79 +79 @@
         val = cblk->values + JV_AXIS_COUNT;
         orSetTF( val, OT_INTEGER );
-        val->integer = axes;
+        orInt(val) = axes;
 
         val = cblk->values + JV_BTN_COUNT;
         orSetTF( val, OT_INTEGER );
-        val->integer = buttons;
+        orInt(val) = buttons;
 
         blk = orMakeBlock( axes + buttons );
@@ -92 +92 @@
         {
             orSetTF( val, OT_INTEGER );
-            val->integer = 0;
+            orInt(val) = 0;
             ++val;
         }
@@ -119 +119 @@
     if( orIs( val, OT_INTEGER ) )
     {
-        fd = val->integer;
+        fd = orInt(val);
         if( fd > -1 )
         {
@@ -141 +141 @@
     val = vblk->values + JV_FD;
 
-    if( orIs( val, OT_INTEGER ) && (val->integer > -1) )
+    if( orIs( val, OT_INTEGER ) && (orInt(val) > -1) )
     {
         int axes;
@@ -148 +148 @@
         OBlock* blk;
 
-        fd = val->integer;
+        fd = orInt(val);
 
         val = vblk->values + JV_AXIS_COUNT;
-        axes = val->integer;
+        axes = orInt(val);
 
         val = vblk->values + JV_INPUT;

trunk/orca/gl/ttf_load.c

@@ -636 +636 @@
     tf  = &res->tfont;
 
-    psize = (a1 + 2)->integer;
+    psize = orInt(a1 + 2);
     if( psize < 1 )
         psize = 20;
@@ -657 +657 @@
         if( arg->type == OT_INTEGER )
         {
-            tf->tex_width  = arg->integer;
-            tf->tex_height = arg->integer;
+            tf->tex_width  = orInt(arg);
+            tf->tex_height = orInt(arg);
         }
         else