X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=blobdiff_plain;f=src%2Forg%2Fibex%2Fgraphics%2FSurface.java;h=b27fa615b9f39e5800684fdbd41e860d60044f32;hp=0f29914fe1621e1cd1430a6a4b07621696227941;hb=51935331706d01844ed596f0c7a77e2ff86d381e;hpb=890000a10a0ccdc49f62946bddf1c0b840495a94

diff --git a/src/org/ibex/graphics/Surface.java b/src/org/ibex/graphics/Surface.java
index 0f29914..b27fa61 100644
--- a/src/org/ibex/graphics/Surface.java
+++ b/src/org/ibex/graphics/Surface.java
@@ -173,14 +173,15 @@ public abstract class Surface implements Callable {
         pendingHeight = height;
         syncRootBoxToSurface = true;
         abort = true;
-        Platform.Scheduler.renderAll();
+        Refresh();
     }
 
     // FEATURE: can we avoid creating objects here?
     protected final void PosChange(final int x, final int y) {
         Platform.Scheduler.add(new Callable() { public Object run(Object o) throws JSExn {
-            root.x = x;
-            root.y = y;
+            // FIXME
+            //root.x = x;
+            //root.y = y;
             root.putAndTriggerTrapsAndCatchExceptions(JSU.S("PosChange"), T);
             return null;
         }});
@@ -258,7 +259,6 @@ public abstract class Surface implements Callable {
         // make sure the root is properly sized
         do {
             abort = false;
-            root.pack();
             if (syncRootBoxToSurface) {
                 root.setWidth(root.minwidth, pendingWidth);
                 root.setHeight(root.minheight, pendingHeight);
@@ -280,6 +280,7 @@ public abstract class Surface implements Callable {
         } while(abort);
 
         int[][] dirt = dirtyRegions.flush();
+        /*
         for(int i = 0; dirt != null && i < dirt.length; i++) {
             if (dirt[i] == null) continue;
             int x = dirt[i][0], y = dirt[i][1], w = dirt[i][2], h = dirt[i][3];
@@ -288,9 +289,12 @@ public abstract class Surface implements Callable {
             if (x+w > root.width) w = root.width - x;
             if (y+h > root.height) h = root.height - y;
             if (w <= 0 || h <= 0) continue;
-
-            root.render(0, 0, x, y, x + w, y + h, this.getPixelBuffer(), identity);
-            getPixelBuffer().drawPicture(scarImage, 0, root.height - scarImage.height, x, y, x+w, y+h);
+        */
+            // FIXME: set clip to -- x, y, x + w, y + h, 
+            System.out.println("paint");
+            root.render(this.getPixelBuffer(), identity, null);
+            /*
+            //getPixelBuffer().drawPicture(scarImage, 0, root.height - scarImage.height, x, y, x+w, y+h);
             
             if (abort) {
                 // x,y,w,h is only partially reconstructed, so we must be careful not to re-blit it
@@ -302,6 +306,7 @@ public abstract class Surface implements Callable {
                 return;
             }
         }
+            */
 
         unrendered = false;
     }
@@ -359,21 +364,30 @@ public abstract class Surface implements Callable {
         DirtyList screenDirtyRegions = new DirtyList();
 
         public PixelBuffer getPixelBuffer() { return this; }
+        public void fillTriangle(int x1, int y1, int x2, int y2, int x3, int y3, int argb) {
+            backbuffer.fillTriangle(x1, y1, x2, y2, x3, y3, argb);
+        }
+        public void drawPicture(Picture p, Affine a, Mesh h) {
+            throw new Error("drawPicture() not implemented");
+        }
+        public void drawGlyph(Font.Glyph source,Affine a,Mesh h,int rgb,int bg) {
+            //screenDirtyRegions.dirty(cx1, cy1, cx2 - cx1, cy2 - cy1);
+            backbuffer.drawGlyph(source, a, h, rgb, bg);
+        }
+        /*
         public void drawPicture(Picture source, int dx, int dy, int cx1, int cy1, int cx2, int cy2) {
             screenDirtyRegions.dirty(cx1, cy1, cx2 - cx1, cy2 - cy1);
             backbuffer.drawPicture(source, dx, dy, cx1, cy1, cx2, cy2);
         }
 
         public void drawGlyph(Font.Glyph source, int dx, int dy, int cx1, int cy1, int cx2, int cy2, int argb, int bc) {
-            screenDirtyRegions.dirty(cx1, cy1, cx2 - cx1, cy2 - cy1);
-            backbuffer.drawGlyph(source, dx, dy, cx1, cy1, cx2, cy2, argb, bc);
         }
-
-        public void stroke(Polygon p, int color) {
+        */
+        public void stroke(Mesh p, int color) {
             // FIXME
         }
         
-        public void fill(Polygon p, Paint paint) {
+        public void fill(Mesh p, Paint paint) {
             // FIXME
         }
 
@@ -412,8 +426,9 @@ public abstract class Surface implements Callable {
 
         // This is how subclasses signal a 'shallow dirty', indicating that although the backbuffer is valid, the screen is not
         public final void Dirty(int x, int y, int w, int h) {
-            screenDirtyRegions.dirty(x, y, w, h);
-            Platform.Scheduler.renderAll();
+            //screenDirtyRegions.dirty(x, y, w, h);
+            //Refresh();
+            blit(x,y,w,h);
         }
 
         public void dirty(int x, int y, int w, int h) {