X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fibex%2Fplat%2FJava2.java;h=92c9aa3b09ee6a2545ea68b691aaae9f8a650ef4;hb=refs%2Fheads%2Fmaster;hp=346c2eb0c39d2d5cd82649b58dc42d7aed883b7d;hpb=0576e58bcc481543333aeb0233c04416ddde6a9b;p=org.ibex.core.git

diff --git a/src/org/ibex/plat/Java2.java b/src/org/ibex/plat/Java2.java
index 346c2eb..92c9aa3 100644
--- a/src/org/ibex/plat/Java2.java
+++ b/src/org/ibex/plat/Java2.java
@@ -7,6 +7,7 @@ package org.ibex.plat;
 import java.awt.*;
 import java.awt.event.*;
 import java.awt.image.*;
+import java.awt.geom.*;
 import java.net.*;
 import java.util.*;
 import org.ibex.util.*;
@@ -89,7 +90,7 @@ public class Java2 extends AWT {
 
     public static class Java2Surface extends AWTSurface {
         public Java2Surface(Box root, boolean framed) { super(root, framed); }
-
+        public PixelBuffer getPixelBuffer() { return pb==null?(pb=new Java2PixelBuffer(this)):pb; }
         protected void _setMinimized(boolean b) {
             if (frame == null) Log.info(this, "JDK 1.2 can only minimize frames, not windows");
             else if (b) frame.setState(java.awt.Frame.ICONIFIED);
@@ -112,20 +113,48 @@ public class Java2 extends AWT {
         private SampleModel sm = null;
         private DataBuffer buf = null;
 
+        private static int[] xs = new int[65535];
+        private static int[] ys = new int[65535];
+        private static GeneralPath gp = new GeneralPath();
+
         // this doens't seem to work on Windows
-        public void drawGlyph(org.ibex.graphics.Font.Glyph source, int dx, int dy, int cx1, int cy1, int cx2, int cy2, int rgb) {
-            Image i2 = ((AWTGlyph)source).getImage();
-            Graphics2D g2 = (Graphics2D)i.getGraphics();
-            g2.setComposite(AlphaComposite.DstOut);
-            g2.setClip(cx1, cy1, cx2 - cx1, cy2 - cy1);
-            g2.drawImage(i2, dx, dy, null);
-            g2.setComposite(AlphaComposite.DstOver);
-            g2.setColor(new java.awt.Color((rgb & 0x00FF0000) >> 16, (rgb & 0x0000FF00) >> 8, (rgb & 0x000000FF)));
-            g2.fillRect(dx, dy, cx2 - dx, cy2 - dy);
-            g2.drawImage(i2, 0, 0, null);
-            g2.setClip(0, 0, i.getWidth(null), i.getHeight(null));
+        public void drawGlyph(org.ibex.graphics.Font.Glyph source, Affine a, Mesh h, int rgb, int bg) {
+            Image i = ((AWTGlyph)source).getImage();
+            Image i2 = ((AWTGlyph)source).i2;
+            if (((AWTGlyph)source).i2 == null) {
+                ((AWTGlyph)source).i2 = new BufferedImage(i.getWidth(null), i.getHeight(null), BufferedImage.TYPE_INT_ARGB);
+                i2 = ((AWTGlyph)source).i2;
+                i2.getGraphics().drawImage(i, 0, 0, null);
+            }
+            Graphics2D g = (Graphics2D)((AWTGlyph)source).i2.getGraphics();
+            g.setComposite(AlphaComposite.SrcIn);
+            g.setColor(new java.awt.Color((rgb & 0x00FF0000) >> 16, (rgb & 0x0000FF00) >> 8, (rgb & 0x000000FF)));
+            g.fillRect(0, 0, i2.getWidth(null), i2.getHeight(null));
+            Graphics2D g2 = (Graphics2D)getGraphics();
+            if (a!=null) g2.drawImage(i2, new java.awt.geom.AffineTransform(a.a, a.b, a.c, a.d, a.e, a.f), null);
+            else         g2.drawImage(i2, 0, 0, null);
         }
 
+        public void fill(Mesh p, org.ibex.graphics.Paint paint) { fillStroke(p, paint, true, false); }
+        public void stroke(Mesh p, org.ibex.graphics.Paint paint) { fillStroke(p, paint, false, true); }
+        public void fillStroke(Mesh p, org.ibex.graphics.Paint paint, boolean fill, boolean stroke) {/*
+            if (g == null) g = getGraphics();
+            ((Graphics2D)g).setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF); 
+            int argb = ((org.ibex.graphics.Paint.SingleColorPaint)paint).color;
+            g.setColor(new java.awt.Color((argb & 0x00FF0000) >> 16, (argb & 0x0000FF00) >> 8, (argb & 0x000000FF)));
+            gp.reset();
+            gp.setWindingRule(GeneralPath.WIND_EVEN_ODD);
+            for(int j=0; j<p.numcontours; j++) {
+                if (p.contours[j+1] <= p.contours[j]) continue;
+                gp.moveTo(p.x[p.contours[j]], p.y[p.contours[j]]);
+                for(int i=p.contours[j]+1; i<p.contours[j+1]; i++) gp.lineTo(p.x[i], p.y[i]);
+                gp.closePath();
+            }
+            if (fill) ((Graphics2D)g).fill(gp);
+            if (stroke) ((Graphics2D)g).draw(gp);
+                                                                                                     */}
+
+        public Java2PixelBuffer(Java2Surface s) { super(s); }
         public Java2PixelBuffer(int w, int h) {
             super(w,h);
             sm = cm.createCompatibleSampleModel(w, h);