Changeset 25 for trunk/orca/gl

Timestamp:

02/06/06 23:30:15 (3 years ago)

Author:

krobillard

Message:

series which/index renamed to n/it.

Location:

trunk/orca/gl

Files:

• dlist.c (modified) (12 diffs)
• gx.c (modified) (8 diffs)
• project.r (modified) (1 diff)

trunk/orca/gl/dlist.c

@@ -313 +313 @@
             case DLP_TEXT_STR:
                 // TODO: Hold string.
-                RP_ADD_ARG( ROP_TEXT, 0, cbp.values[1].series.index );
+                RP_ADD_ARG( ROP_TEXT, 0, cbp.values[1].series.it );
                 pc->list = cbp.values[1].index;
                 RP_INC;
@@ -327 +327 @@
             case DLP_VERTS:
                 // TODO: Hold block.
-                RP_ADD_ARG( ROP_VERTS, 0, cbp.values[1].series.index );
+                RP_ADD_ARG( ROP_VERTS, 0, cbp.values[1].series.it );
                 pc->list = cbp.values[1].index;
                 RP_INC;
@@ -334 +334 @@
             case DLP_NORMALS:
                 // TODO: Hold block.
-                RP_ADD_ARG( ROP_NORMALS, 0, cbp.values[1].series.index );
+                RP_ADD_ARG( ROP_NORMALS, 0, cbp.values[1].series.it );
                 pc->list = cbp.values[1].index;
                 RP_INC;
@@ -341 +341 @@
             case DLP_COLORS:
                 // TODO: Hold block.
-                RP_ADD_ARG( ROP_COLORS, 0, cbp.values[1].series.index );
+                RP_ADD_ARG( ROP_COLORS, 0, cbp.values[1].series.it );
                 pc->list = cbp.values[1].index;
                 RP_INC;
@@ -348 +348 @@
             case DLP_UVS:
                 // TODO: Hold block.
-                RP_ADD_ARG( ROP_UVS, 0, cbp.values[1].series.index );
+                RP_ADD_ARG( ROP_UVS, 0, cbp.values[1].series.it );
                 pc->list = cbp.values[1].index;
                 RP_INC;
@@ -355 +355 @@
             case DLP_QUADS:
                 // TODO: Hold block.
-                RP_ADD_ARG( ROP_QUADS, 0, cbp.values[2].series.index );
+                RP_ADD_ARG( ROP_QUADS, 0, cbp.values[2].series.it );
                 pc->list = cbp.values[2].index;
                 RP_INC;
@@ -364 +364 @@
             case DLP_TRIS:
                 // TODO: Hold block.
-                RP_ADD_ARG( ROP_TRIS, 0, cbp.values[2].series.index );
+                RP_ADD_ARG( ROP_TRIS, 0, cbp.values[2].series.it );
                 pc->list = cbp.values[2].index;
                 RP_INC;
@@ -373 +373 @@
             case DLP_STRIP:
                 // TODO: Hold block.
-                RP_ADD_ARG( ROP_TRISTRIP, 0, cbp.values[2].series.index );
+                RP_ADD_ARG( ROP_TRISTRIP, 0, cbp.values[2].series.it );
                 pc->list = cbp.values[2].index;
                 RP_INC;
@@ -382 +382 @@
             case DLP_FAN:
                 // TODO: Hold block.
-                RP_ADD_ARG( ROP_TRIFAN, 0, cbp.values[2].series.index );
+                RP_ADD_ARG( ROP_TRIFAN, 0, cbp.values[2].series.it );
                 pc->list = cbp.values[2].index;
                 RP_INC;
@@ -391 +391 @@
             case DLP_POINTS:
                 // TODO: Hold block.
-                RP_ADD_ARG( ROP_POINTS, 0, cbp.values[2].series.index );
+                RP_ADD_ARG( ROP_POINTS, 0, cbp.values[2].series.it );
                 pc->list = cbp.values[2].index;
                 RP_INC;
@@ -400 +400 @@
             case DLP_LINES:
                 // TODO: Hold block.
-                RP_ADD_ARG( ROP_LINES, 0, cbp.values[2].series.index );
+                RP_ADD_ARG( ROP_LINES, 0, cbp.values[2].series.it );
                 pc->list = cbp.values[2].index;
                 RP_INC;
@@ -510 +510 @@
     orArrayInit( &prog, sizeof(RenderWord), orSeriesLen(blk,a2) );
 
-    error = compileProg( blk->values + a2->series.index,
+    error = compileProg( blk->values + a2->series.it,
                          blk->values + blk->used, &prog );
     if( error )

trunk/orca/gl/gx.c

@@ -197 +197 @@
                 iv[ INPUT_MY ].integer   = gView->height - event->y - 1;
 
-                orEvalBlock( orBLOCKS + blkV->index, blkV->series.index );
+                orEvalBlock( orBLOCKS + blkV->index, blkV->series.it );
                 gxHandleError();
             }
@@ -214 +214 @@
                 iv[ INPUT_MY ].integer   = gView->height - event->y - 1;
 
-                orEvalBlock( orBLOCKS + blkV->index, blkV->series.index );
+                orEvalBlock( orBLOCKS + blkV->index, blkV->series.it );
                 gxHandleError();
             }
@@ -244 +244 @@
                 }
 
-                orEvalBlock( orBLOCKS + blkV->index, blkV->series.index );
+                orEvalBlock( orBLOCKS + blkV->index, blkV->series.it );
                 gxHandleError();
             }
@@ -262 +262 @@
                 iv[ INPUT_DY ].integer = event->y;
 
-                orEvalBlock( orBLOCKS + blkV->index, blkV->series.index );
+                orEvalBlock( orBLOCKS + blkV->index, blkV->series.it );
                 gxHandleError();
             }
@@ -276 +276 @@
                 if( hval )
                 {
-                    orEvalBlock( orBLOCKS + hval->index, hval->series.index );
+                    orEvalBlock( orBLOCKS + hval->index, hval->series.it );
                     gxHandleError();
                 }
@@ -291 +291 @@
                 if( hval )
                 {
-                    orEvalBlock( orBLOCKS + hval->index, hval->series.index );
+                    orEvalBlock( orBLOCKS + hval->index, hval->series.it );
                     gxHandleError();
                 }
@@ -662 +662 @@
     orArrayInit( &prog, sizeof(RenderWord), blk->used );
 
-    error = compileProg( blk->values + a1->series.index,
+    error = compileProg( blk->values + a1->series.it,
                          blk->values + blk->used, &prog );
     if( error )
@@ -1480 +1480 @@
 void keyHandlerNative( OValue* a1 )
 {
-    if( validKeyHandlerBlock( a1->index, a1->series.index ) )
-    {
-        OBlock* blk2 = orCopyBlock( a1->index, a1->series.index, 0 );
+    if( validKeyHandlerBlock( a1->index, a1->series.it ) )
+    {
+        OBlock* blk2 = orCopyBlock( a1->index, a1->series.it, 0 );
         mapKeyAtoms( blk2 );
         orSetSeries( a1, orBlockN(blk2), 0 );

trunk/orca/gl/project.r

@@ -11 +11 @@
     include_from %..
     include_from %../util
-    libs_from %.. %orca
+    libs_from %.. %orca0
 
     macx [