Changeset 310 for trunk/thune/make.c

Timestamp:

11/20/06 03:13:29 (2 years ago)

Author:

krobillard

Message:

Thune -

Renamed UBuffer to UResource.
coord! 'make now resolves words.

Thune GL -

Added framebuffer! datatype.
Added 'framebuffer, 'particle, and 'rotate draw list opcodes.
Can now load grayscale PNG with alpha (alpha is ignored).

Files:

• trunk/thune/make.c (modified) (8 diffs)

trunk/thune/make.c

@@ -213 +213 @@
   If retp is non-zero it will be set to the new buffer.
 */
-UIndex ur_makeBuffer( int dataType, int size, UBuffer** retp )
-{
-    UBuffer* buf;
-    UGCArray* gc = &ur_env->buffers;
+UIndex ur_makeResource( int dataType, int size, UResource** retp )
+{
+    UResource* buf;
+    UGCArray* gc = &ur_env->resources;
     UArray* ca = &gc->arr;
 
@@ -224 +224 @@
 #endif
 
-    if( ur_env->buffers.freeCount )
+    if( ur_env->resources.freeCount )
     {
 #ifndef GC_STRESS_TEST
 getFree:
 #endif
-        buf = ((UBuffer*) ca->ptr.v) + gc->freeList;
+        buf = ((UResource*) ca->ptr.v) + gc->freeList;
 
         assert( gc->freeList > -1 );
@@ -244 +244 @@
     {
         ur_recycle( ur_env );
-        if( ur_env->buffers.freeCount )
+        if( ur_env->resources.freeCount )
             goto getFree;
     }
 #endif
 
-    UR_EXPAND_1( UBuffer, ca, buf );
+    UR_EXPAND_1( UResource, ca, buf );
 
 init:
@@ -259 +259 @@
         *retp = buf;
 
-    return buf - ((UBuffer*) ca->ptr.v);
+    return buf - ((UResource*) ca->ptr.v);
 }
 
@@ -374 +374 @@
                               blk->ptr.cells + blk->used,
                               rblk->ptr.cells );
+#if 0
+                // Deep copy
+                it   = rblk->ptr.cells;
+                rend = rblk->ptr.cells + size;
+                while( it != rend )
+                {
+                    ur_clone( it, UR_COPY_ALL, 2 );
+                    ++it;
+                }
+#endif
 
                 // Init new words to none.
@@ -888 +898 @@
 
 
-void ur_makeCoordBlk( UCell* res, UCell* blkCell )
+static void ur_makeCoordBlk( UThread* ur_thread, UCell* res, UCell* blkCell )
 {
     int len;
@@ -905 +915 @@
             if( len == UR_COORD_MAX )
                 break;
+        }
+        else if( ur_isAWord(it) )
+        {
+            UCell* val = ur_wordCell( ur_thread, it );
+            if( ! val )
+                return;
+            if( ur_is(val, UT_INT) || ur_is(val, UT_CHAR) )
+            {
+                res->coord.elem[ len++ ] = ur_int(val);
+                if( len == UR_COORD_MAX )
+                    break;
+            }
         }
         ++it;
@@ -1254 +1276 @@
             else if( ur_is(tos, UT_BLOCK) )
             {
-                ur_makeCoordBlk( res, tos );
+                ur_makeCoordBlk( ur_thread, res, tos );
             }
             else