archives/citylimitsj
Archived
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

MakeTiles: allow tiles recipe to be more size-agnostic

Browse source 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@735 d9718cc8-9f43-0410-858b-315f434eb58c
This commit is contained in:
jason@long.name 2013-07-17 20:30:39 +00:00
parent 4c623c92c3
commit c334cfd9f0
1 changed files with 43 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
src/micropolisj/build_tool/MakeTiles.java
View file

@ -12,7 +12,7 @@ import javax.swing.ImageIcon;
public class MakeTiles public class MakeTiles
{ {
static HashMap<String,String> tileData = new HashMap<String,String>(); static HashMap<String,String> tileData = new HashMap<String,String>();
static HashMap<String,Image> loadedImages = new HashMap<String,Image>(); static HashMap<String,SourceImage> loadedImages = new HashMap<String,SourceImage>();
static final Charset UTF8 = Charset.forName("UTF-8"); static final Charset UTF8 = Charset.forName("UTF-8");
static final int NTILES = 960; static final int NTILES = 960;
@ -48,14 +48,14 @@ public class MakeTiles
assert rawSpec != null; assert rawSpec != null;
TileSpec tileSpec = TileSpec.parse(i, rawSpec); TileSpec tileSpec = TileSpec.parse(i, rawSpec);
ImageSpec ref = parseImageSpec(tileSpec); FrameSpec ref = parseFrameSpec(tileSpec);
drawTo(ref, gr, 0, TILE_SIZE*i); drawTo(ref, gr, 0, TILE_SIZE*i);
} }
ImageIO.write(buf, "png", outputFile); ImageIO.write(buf, "png", outputFile);
} }
static void drawTo(ImageSpec ref, Graphics2D gr, int destX, int destY) static void drawTo(FrameSpec ref, Graphics2D gr, int destX, int destY)
throws IOException throws IOException
{ {
if (ref.background != null) { if (ref.background != null) {
@ -67,23 +67,33 @@ public class MakeTiles
loadImage(ref.fileName)); loadImage(ref.fileName));
} }
Image sourceImg = loadedImages.get(ref.fileName); SourceImage sourceImg = loadedImages.get(ref.fileName);
int srcWidth = sourceImg.getWidth(null);
int srcHeight = sourceImg.getHeight(null);
gr.drawImage( gr.drawImage(
sourceImg, sourceImg.image,
destX, destY, destX, destY,
destX+TILE_SIZE, destY+TILE_SIZE, destX+TILE_SIZE, destY+TILE_SIZE,
ref.offsetX, ref.offsetY, ref.offsetX * sourceImg.basisSize / 16,
ref.offsetX + (ref.width != 0 ? ref.width : srcWidth), ref.offsetY * sourceImg.basisSize / 16,
ref.offsetY + (ref.height != 0 ? ref.height : srcHeight), (ref.offsetX + (ref.width != 0 ? ref.width : 16)) * sourceImg.basisSize / 16,
(ref.offsetY + (ref.height != 0 ? ref.height : 16)) * sourceImg.basisSize / 16,
null); null);
} }
static class ImageSpec static class SourceImage
{ {
ImageSpec background; Image image;
int basisSize;
SourceImage(Image image, int basisSize) {
this.image = image;
this.basisSize = basisSize;
}
}
static class FrameSpec
{
FrameSpec background;
String fileName; String fileName;
int offsetX; int offsetX;
int offsetY; int offsetY;
@ -91,13 +101,13 @@ public class MakeTiles
int height; int height;
} }
static ImageSpec parseImageSpec(TileSpec spec) static FrameSpec parseFrameSpec(TileSpec spec)
{ {
ImageSpec result = null; FrameSpec result = null;
for (String layerStr : spec.getImages()) { for (String layerStr : spec.getImages()) {
ImageSpec rv = new ImageSpec(); FrameSpec rv = new FrameSpec();
rv.background = result; rv.background = result;
result = rv; result = rv;
@ -126,10 +136,25 @@ public class MakeTiles
return result; return result;
} }
static Image loadImage(String fileName) static SourceImage loadImage(String fileName)
throws IOException throws IOException
{ {
ImageIcon ii = new ImageIcon(fileName+".png"); File f = new File(fileName+"_"+TILE_SIZE+"x"+TILE_SIZE+".png");
return ii.getImage(); if (f.exists()) {
ImageIcon ii = new ImageIcon(f.toString());
return new SourceImage(
ii.getImage(),
TILE_SIZE);
}
f = new File(fileName+".png");
if (f.exists()) {
ImageIcon ii = new ImageIcon(f.toString());
return new SourceImage(
ii.getImage(),
16);
}
throw new IOException("File not found: "+fileName+".png");
} }
} }