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

MakeTiles: prepare to abstract composition functionality

Browse source
This commit is contained in:
Jason Long 2014-08-02 11:52:38 -04:00
parent cdcb63124a
commit 0fd637cc95
1 changed files with 43 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -59,6 +59,19 @@ public class MakeTiles
} }
} }
static class Composer
{
int nextOffsetY = 0;
TileImageSprite prepareTile(int size)
{
TileImageSprite s = new TileImageSprite();
s.offsetY = nextOffsetY;
nextOffsetY += size;
return s;
}
}
static void generateFromRecipe(File recipeFile, File outputDir) static void generateFromRecipe(File recipeFile, File outputDir)
throws IOException throws IOException
{ {
@ -74,7 +87,7 @@ public class MakeTiles
int ntiles = COUNT_TILES == -1 ? tileNames.length : COUNT_TILES; int ntiles = COUNT_TILES == -1 ? tileNames.length : COUNT_TILES;
// prepare mapping data // prepare mapping data
int nextOffsetY = 0; Composer c = new Composer();
ArrayList<TileMapping> mappings = new ArrayList<TileMapping>(); ArrayList<TileMapping> mappings = new ArrayList<TileMapping>();
for (int i = 0; i < ntiles; i++) { for (int i = 0; i < ntiles; i++) {
@ -102,10 +115,7 @@ public class MakeTiles
int t = 0; int t = 0;
int n = ref.getFrameEndTime(t); int n = ref.getFrameEndTime(t);
while (n > 0) { while (n > 0) {
TileImageSprite s = new TileImageSprite(); TileImageSprite s = c.prepareTile(TILE_SIZE);
s.offsetY = nextOffsetY;
nextOffsetY += TILE_SIZE;
Animation.Frame f = new Animation.Frame(s, n-t); Animation.Frame f = new Animation.Frame(s, n-t);
ani.addFrame(f); ani.addFrame(f);
@ -115,10 +125,8 @@ public class MakeTiles
} }
dest = ani; dest = ani;
} }
else { else {
TileImageSprite s = new TileImageSprite(); TileImageSprite s = c.prepareTile(TILE_SIZE);
s.offsetY = nextOffsetY;
nextOffsetY += TILE_SIZE;
dest = s; dest = s;
} }
@ -127,7 +135,7 @@ public class MakeTiles
} }
// actually assemble the image // actually assemble the image
BufferedImage buf = new BufferedImage(TILE_SIZE,nextOffsetY,BufferedImage.TYPE_INT_RGB); BufferedImage buf = new BufferedImage(TILE_SIZE,c.nextOffsetY,BufferedImage.TYPE_INT_RGB);
Graphics2D gr = buf.createGraphics(); Graphics2D gr = buf.createGraphics();
for (TileMapping m : mappings) { for (TileMapping m : mappings) {
@ -450,6 +458,30 @@ public class MakeTiles
} }
} }
static TileImage parseImageXml(XMLStreamReader in)
throws IOException, XMLStreamException
{
String src = in.getAttributeValue(null, "src");
TileImage img = loadAnimation(src);
String tmp = in.getAttributeValue(null, "at");
if (tmp != null) {
String [] coords = tmp.split(",");
if (coords.length == 2) {
TileImageSprite sprite = new TileImageSprite();
sprite.source = img;
sprite.offsetX = Integer.parseInt(coords[0]);
sprite.offsetY = Integer.parseInt(coords[1]);
img = sprite;
}
else {
throw new IOException("Invalid 'at' syntax");
}
}
return img;
}
static TileImage parseLayeredImageXml(XMLStreamReader in) static TileImage parseLayeredImageXml(XMLStreamReader in)
throws IOException, XMLStreamException throws IOException, XMLStreamException
{ {
@ -461,10 +493,9 @@ public class MakeTiles
String tagName = in.getLocalName(); String tagName = in.getLocalName();
if (tagName.equals("image")) { if (tagName.equals("image")) {
String src = in.getAttributeValue(null, "src");
TileImageLayer rv = new TileImageLayer(); TileImageLayer rv = new TileImageLayer();
rv.below = result; rv.below = result;
rv.above = loadAnimation(src); rv.above = parseImageXml(in);
result = rv; result = rv;
skipToEndElement(in); skipToEndElement(in);