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

Timestamp:

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

Author:

krobillard

Message:

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

Files:

• trunk/orca/gl/gx.c (modified) (13 diffs)

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) )