public void drawString(String font, String text, int x, int y, int color) {
//System.out.println("drawString(): " + text);
}
-
- //public native void drawPictureAlphaOnly(Picture source, int dx1, int dy1, int dx2, int dy2,
- //int sx1, int sy1, int sx2, int sy2, int rgb);
- public void drawPictureAlphaOnly(Picture source, int dx1, int dy1, int dx2, int dy2, int sx1, int sy1, int sx2, int sy2, int rgb) {
- drawPicture_(source,dx1,dy1,dx2,dy2,sx1,sy1,sx2,sy2,rgb);
+
+ public void drawPictureAlphaOnly(Picture source, int dx, int dy, int cx1, int cy1, int cx2, int cy2, int rgb) {
+ drawPicture_(source, dx, dy, cx1, cy1, cx2, cy2, rgb);
}
- public void drawPicture(Picture source, int dx1, int dy1, int dx2, int dy2,int sx1, int sy1, int sx2, int sy2) {
- drawPicture_(source,dx1,dy1,dx2,dy2,sx1,sy1,sx2,sy2,0xffffffff);
+ public void drawPicture(Picture source, int dx, int dy, int cx1, int cy1, int cx2, int cy2) {
+ drawPicture_(source, dx, dy, cx1, cy1, cx2, cy2, 0xffffffff);
}
- private void drawPicture_(Picture source, int dx1, int dy1, int dx2, int dy2,int sx1, int sy1, int sx2, int sy2, int color) {
+ private void drawPicture_(Picture source, int dx, int dy, int cx1, int cy1, int cx2, int cy2, int color) {
activateContext();
setColor(color);
GLPicture p = (GLPicture) source;
- p.draw(dx1,dy1,dx2,dy2,sx1,sy1,sx2,sy2);
+ p.draw(dx,dy,cx1,cy1,cx2,cy2);
}
}
this.height = h;
}
- public abstract void draw(int dx1, int dy1, int dx2, int dy2,int sx1, int sy1, int sx2, int sy2);
+ public abstract void draw(int dx, int dy, int cx1, int cy1, int cx2, int cy2);
protected abstract void finalize();
}
natInit(data,alphaOnly);
}
- public native void draw(int dx1, int dy1, int dx2, int dy2,int sx1, int sy1, int sx2, int sy2);
+ public native void draw(int dx, int dy, int cx1, int cy1, int cx2, int cy2);
protected void finalize() { gl.deleteTexture(textureName); }
}
natInit(data,alphaOnly);
}
- public native void draw(int dx1, int dy1, int dx2, int dy2,int sx1, int sy1, int sx2, int sy2);
+ public native void draw(int dx, int dy, int cx1, int cy1, int cx2, int cy2);
protected void finalize() { gl.deleteTexture(textureName); }
}
private static final int max(int a, int b) { return a > b ? a : b; }
private static final int min(int a, int b) { return a < b ? a : b; }
- public void draw(int dx1, int dy1, int dx2, int dy2,int sx1, int sy1, int sx2, int sy2) {
- double xscale = (double)(dx2-dx1)/(double)(sx2-sx1);
- double yscale = (double)(dy2-dy1)/(double)(sy2-sy1);
+ public void draw(int dx, int dy, int cx1, int cy1, int cx2, int cy2) {
int totalWidth = width;
int totalHeight = height;
// *{x,y}{1,2} key: d=dest s=src, p=bounds of this picture, i=intersection of s and p, pd = dest of this pic
- //System.out.println("Starting draw..." + sx1 + "," + sy1 + " " + sx2 + "," + sy2 + " to " + dx1 +"," + dy1 + " " + dx2 + "," + dy2);
for(int i=0;i<pics.length;i++) {
for(int j=0;j<pics[i].length;j++) {
- int px1 = j*psize;
- int py1 = i*psize;
- int px2 = min(px1+psize,totalWidth);
- int py2 = min(py1+psize,totalHeight);
- int ix1 = max(px1,sx1);
- int iy1 = max(py1,sy1);
- int ix2 = min(px2,sx2);
- int iy2 = min(py2,sy2);
- if(ix1 >= ix2 || iy1 >= iy2) continue; // no intersection
-
- int pdx1 = dx1 + (int) (xscale*(ix1-sx1));
- int pdy1 = dy1 + (int) (yscale*(iy1-sy1));
- int pdx2 = dx2 - (int) (xscale*(sx2-ix2));
- int pdy2 = dy2 - (int) (yscale*(sy2-iy2));
-
- //System.out.println("" + i + "," + j + " is good... drawing from " + (ix1-px1) + "," + (iy1-py1) + " " + (ix2-px1) + "," + (iy2-py1) + " to " + pdx1 + "," + pdy1 + " to " + pdx2 + "," + pdy2);
-
- pics[i][j].draw(pdx1,pdy1,pdx2,pdy2,ix1-px1,iy1-py1,ix2-px1,iy2-py1);
+ int px1 = j*psize + dx;
+ int py1 = i*psize + dy;
+ pics[i][j].draw(px1, py1, cx1, cy1, cx2, cy2);
}
}
}