X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=blobdiff_plain;f=src%2Forg%2Fibex%2Fgraphics%2FSurface.java;fp=src%2Forg%2Fibex%2Fgraphics%2FSurface.java;h=f891b29160c63d70864a55dd7357de976e09e7f7;hp=165207f0b73a461f81435f0153f9a6fbca5a71bc;hb=098f2fd17df6500e8dad466c162c2e0589cc7df5;hpb=53b81e839d264d8cecdaf11bf9fae5579cc50e2c diff --git a/src/org/ibex/graphics/Surface.java b/src/org/ibex/graphics/Surface.java index 165207f..f891b29 100644 --- a/src/org/ibex/graphics/Surface.java +++ b/src/org/ibex/graphics/Surface.java @@ -290,8 +290,9 @@ public abstract class Surface implements Callable { if (y+h > root.height) h = root.height - y; if (w <= 0 || h <= 0) continue; - root.render(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, + root.render(this.getPixelBuffer(), identity); + //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 @@ -360,16 +361,25 @@ 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) { // FIXME }