disabled clipping code again; it is getting stuck in loops

darcs-hash:20060311110615-5007d-83933b18bac38ebd65c0cdb26419faf118fbbc12.gz

diff --git a/src/org/ibex/core/Box.java b/src/org/ibex/core/Box.java
index 595e101..396a2b6 100644 (file)
--- a/src/org/ibex/core/Box.java
+++ b/src/org/ibex/core/Box.java
@@ -247,10 +247,13 @@ public final class Box extends JS.Obj implements Callable, Mesh.Chain {
             return;
         }
 
             return;
         }
 

+        // FIXME: mesh clipping code has been getting stuck in loops; to see this,
+        //        uncomment the next two lines and swap the order of the last two lines.
+

         //if (clipFrom != null) clipFrom.subtract(mesh, clipa);
         //if (clipFrom != null) clipFrom.subtract(mesh, clipa);

-        Mesh mesh = treeSize() > 0 ? this.mesh.copy() : this.mesh;
-        for(Box b = getChild(0); b != null; b = b.nextSibling()) b.render(buf, a, mesh, Affine.identity());
+        //Mesh mesh = treeSize() > 0 ? this.mesh.copy() : this.mesh;

         mesh.fill(buf, a, null, fillcolor, true);
         mesh.fill(buf, a, null, fillcolor, true);

+        for(Box b = getChild(0); b != null; b = b.nextSibling()) b.render(buf, a, mesh, Affine.identity());

     }
     
     // Methods to implement org.ibex.js.JS //////////////////////////////////////
     }
     
     // Methods to implement org.ibex.js.JS //////////////////////////////////////

diff --git a/src/org/ibex/graphics/Surface.java b/src/org/ibex/graphics/Surface.java
index b27fa61..0799267 100644 (file)
--- a/src/org/ibex/graphics/Surface.java
+++ b/src/org/ibex/graphics/Surface.java
@@ -291,7 +291,7 @@ public abstract class Surface implements Callable {
             if (w <= 0 || h <= 0) continue;
         */
             // FIXME: set clip to -- x, y, x + w, y + h, 
             if (w <= 0 || h <= 0) continue;
         */
             // 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);
             root.render(this.getPixelBuffer(), identity, null);
             /*
             //getPixelBuffer().drawPicture(scarImage, 0, root.height - scarImage.height, x, y, x+w, y+h);