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

TileImage: make some properties final

Browse source
This commit is contained in:
Jason Long 2014-08-09 14:39:11 -04:00
parent a3afcde7bb
commit d95ad15b99
2 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -310,9 +310,10 @@ public class MakeTiles
for (String layerStr : layerStrings) { for (String layerStr : layerStrings) {
TileImageLayer rv = new TileImageLayer(); TileImageLayer rv = new TileImageLayer(
rv.below = result; result,
rv.above = parseLayerSpec(layerStr); parseLayerSpec(layerStr)
);
result = rv; result = rv;
} }
@ -554,9 +555,10 @@ public class MakeTiles
String tagName = in.getLocalName(); String tagName = in.getLocalName();
if (tagName.equals("image")) { if (tagName.equals("image")) {
TileImageLayer rv = new TileImageLayer(); TileImageLayer rv = new TileImageLayer(
rv.below = result; result, //below
rv.above = parseImageXml(in); parseImageXml(in) //above
);
result = rv; result = rv;
skipToEndElement(in); skipToEndElement(in);

10
src/micropolisj/graphics/TileImage.java
View file

@ -22,8 +22,14 @@ public abstract class TileImage
public static class TileImageLayer extends TileImage public static class TileImageLayer extends TileImage
{ {
public TileImageLayer below; public final TileImageLayer below;
public TileImage above; public final TileImage above;
public TileImageLayer(TileImageLayer below, TileImage above)
{
this.below = below;
this.above = above;
}
@Override @Override
public void drawWithTimeTo(Graphics2D gr, int time, int destX, int destY, int srcX, int srcY) public void drawWithTimeTo(Graphics2D gr, int time, int destX, int destY, int srcX, int srcY)