X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Forg%2Fxwt%2FPixelBuffer.java;h=065b027ca753265203348c9cca787386c9c61c04;hb=1019725cfa88d9ad5dfabaf178e87da79c9c3e17;hp=3d6e09a0987dd8708e03dcc1df5421ad0c05aa1d;hpb=a40c19a25bdb601346eb6876c99ec200b89d2449;p=org.ibex.core.git diff --git a/src/org/xwt/PixelBuffer.java b/src/org/xwt/PixelBuffer.java index 3d6e09a..065b027 100644 --- a/src/org/xwt/PixelBuffer.java +++ b/src/org/xwt/PixelBuffer.java @@ -3,8 +3,7 @@ package org.xwt; /** *

- * A block of pixels which can be drawn on and rapidly copied to the - * screen. + * A block of pixels which can be drawn on. *

* *

@@ -13,19 +12,80 @@ package org.xwt; * method. These implementations may choose to use off-screen video * ram for this purpose (for example, a Pixmap on X11). *

+ * + *

+ * Many of these functions come in pairs, one that uses ints and one + * that uses floats. The int functions are intended for situations + * in which the CTM is the identity transform. + *

*/ public abstract class PixelBuffer { - /** Draw the region of source within s onto the region d on this PixelBuffer, scaling as needed */ - public abstract void drawPicture(Picture source, int dx1, int dy1, int dx2, int dy2, int sx1, int sy1, int sx2, int sy2); - - /** Fill the region (x1, y1, x2, y2) with color (AARRGGBB format); the alpha channel component is ignored */ - public abstract void fillRect(int x1, int y1, int x2, int y2, int color); - + // FIXME: try to remove /** returns the height of the PixelBuffer */ public abstract int getHeight(); + // FIXME: try to remove /** returns the width of the PixelBuffer */ public abstract int getWidth(); + + + /** Draw the region of source within s onto the region d on this PixelBuffer, scaling as needed */ + public abstract void drawPicture(Picture source, int dx1, int dy1, int dx2, int dy2, int sx1, int sy1, int sx2, int sy2); + + /** fill a trapezoid whose top and bottom edges are horizontal */ + public abstract void fillTrapezoid(int x1, int x2, int y1, int x3, int x4, int y2, int color); + + // FIXME: we want floats (inter-pixel spacing) for antialiasing, but this hoses the fastpath line drawing... argh! + /** draws a line of width w; note that the coordinates here are post-transform */ + public void drawLine(int x1, int y1, int x2, int y2, int w, int color, boolean capped) { + + if (y1 > y2) { int t = x1; x1 = x2; x2 = t; t = y1; y1 = y2; y2 = t; } + + if (x1 == x2) { + fillTrapezoid(x1 - w / 2, x2 + w / 2, y1 - (capped ? w / 2 : 0), x1 - w / 2, x2 + w / 2, y2 + (capped ? w / 2 : 0), color); + return; + } + + // fastpath for single-pixel width lines + if (w == 1) { + float slope = (float)(y2 - y1) / (float)(x2 - x1); + int last_x = x1; + for(int y=y1; y<=y2; y++) { + int new_x = (int)((float)(y - y1) / slope) + x1; + if (slope >= 0) fillTrapezoid(last_x + 1, y != y2 ? new_x + 1 : new_x, y, + last_x + 1, y != y2 ? new_x + 1 : new_x, y + 1, color); + else fillTrapezoid(y != y2 ? new_x : new_x + 1, last_x, y, + y != y2 ? new_x : new_x + 1, last_x, y + 1, color); + last_x = new_x; + } + return; + } + + // actually half-width + float width = (float)w / 2; + float phi = (float)Math.atan((y2 - y1) / (x2 - x1)); + if (phi < 0.0) phi += (float)Math.PI * 2; + float theta = (float)Math.PI / 2 - phi; + + // dx and dy are the x and y distance between each endpoint and the corner of the stroke + int dx = (int)(width * Math.cos(theta)); + int dy = (int)(width * Math.sin(theta)); + + // slice is the longest possible length of a horizontal line across the stroke + int slice = (int)(2 * width / Math.cos(theta)); + + if (capped) { + x1 -= width * Math.cos(phi); + x2 += width * Math.cos(phi); + y1 -= width * Math.sin(phi); + y2 += width * Math.sin(phi); + } + + fillTrapezoid(x1 + dx, x1 + dx, y1 - dy, x1 - dx, x1 - dx + slice, y1 + dy, color); // top corner + fillTrapezoid(x2 + dx - slice, x2 + dx, y2 - dy, x2 - dx, x2 - dx, y2 + dy, color); // bottom corner + fillTrapezoid(x1 - dx, x1 - dx + slice, y1 + dy, x2 + dx - slice, x2 + dx, y2 - dy, color); // middle + } + }