From d5dbd8dc64749e25d5292674460dc9634801a642 Mon Sep 17 00:00:00 2001 From: Jason Long <jason@long.name> Date: Thu, 19 Jun 2014 13:10:23 -0400 Subject: [PATCH] MakeTiles: track target size when loading a source image --- src/micropolisj/build_tool/MakeTiles.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/micropolisj/build_tool/MakeTiles.java b/src/micropolisj/build_tool/MakeTiles.java index df254c7..aff24cf 100644 --- a/src/micropolisj/build_tool/MakeTiles.java +++ b/src/micropolisj/build_tool/MakeTiles.java @@ -164,10 +164,12 @@ public class MakeTiles { Image image; int basisSize; + int targetSize; - SourceImage(Image image, int basisSize) { + SourceImage(Image image, int basisSize, int targetSize) { this.image = image; this.basisSize = basisSize; + this.targetSize = targetSize; } @Override @@ -179,7 +181,7 @@ public class MakeTiles gr.drawImage( image, destX, destY, - destX+TILE_SIZE, destY+TILE_SIZE, + destX+targetSize, destY+targetSize, srcX, srcY, srcX+basisSize, srcY+basisSize, null); @@ -359,6 +361,7 @@ public class MakeTiles ImageIcon ii = new ImageIcon(pngFile.toString()); return new SourceImage( ii.getImage(), + TILE_SIZE, TILE_SIZE); } @@ -367,6 +370,7 @@ public class MakeTiles ImageIcon ii = new ImageIcon(pngFile.toString()); return new SourceImage( ii.getImage(), + TILE_SIZE, TILE_SIZE); } @@ -375,7 +379,8 @@ public class MakeTiles ImageIcon ii = new ImageIcon(pngFile.toString()); return new SourceImage( ii.getImage(), - STD_SIZE); + STD_SIZE, + TILE_SIZE); } throw new IOException("File not found: "+fileName+".{svg,png}");