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

MakeTiles: change meaning of offsetY

Browse source
This commit is contained in:
Jason Long 2014-07-31 20:34:01 -04:00
parent 7415edeb9e
commit fbd3a0dc94
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -186,7 +186,7 @@ public class MakeTiles
for (Animation.Frame f : ani.frames) { for (Animation.Frame f : ani.frames) {
TileImageSprite s = (TileImageSprite) f.frame; TileImageSprite s = (TileImageSprite) f.frame;
out.writeStartElement("frame"); out.writeStartElement("frame");
out.writeAttribute("offsetY", Integer.toString(s.offsetY / TILE_SIZE)); out.writeAttribute("offsetY", Integer.toString(s.offsetY));
out.writeEndElement(); out.writeEndElement();
} }
out.writeEndElement(); out.writeEndElement();
@ -195,7 +195,7 @@ public class MakeTiles
TileImageSprite s = (TileImageSprite ) m.dest; TileImageSprite s = (TileImageSprite ) m.dest;
out.writeStartElement("image"); out.writeStartElement("image");
out.writeAttribute("offsetY", Integer.toString(s.offsetY / TILE_SIZE)); out.writeAttribute("offsetY", Integer.toString(s.offsetY));
out.writeEndElement(); out.writeEndElement();
} }

18
src/micropolisj/gui/TileImages.java
View file

@ -35,7 +35,7 @@ public class TileImages
static class SimpleTileImage extends TileImage static class SimpleTileImage extends TileImage
{ {
BufferedImage srcImage; BufferedImage srcImage;
int imageNumber; int offsetY;
} }
static class AnimatedTile extends TileImage static class AnimatedTile extends TileImage
@ -80,7 +80,7 @@ public class TileImages
img.srcImage = ctx.getDefaultImage(); img.srcImage = ctx.getDefaultImage();
} }
String tmp = in.getAttributeValue(null, "offsetY"); String tmp = in.getAttributeValue(null, "offsetY");
img.imageNumber = tmp != null ? Integer.parseInt(tmp) : 0; img.offsetY = tmp != null ? Integer.parseInt(tmp) : 0;
return img; return img;
} }
@ -211,12 +211,12 @@ public class TileImages
public class ImageInfo public class ImageInfo
{ {
BufferedImage srcImage; BufferedImage srcImage;
int imageNumber; int offsetY;
boolean animated; boolean animated;
ImageInfo(BufferedImage srcImage, int imageNumber, boolean animated) { ImageInfo(BufferedImage srcImage, int offsetY, boolean animated) {
this.srcImage = srcImage; this.srcImage = srcImage;
this.imageNumber = imageNumber; this.offsetY = offsetY;
this.animated = animated; this.animated = animated;
} }
@ -236,7 +236,7 @@ public class TileImages
for (int xx = 0; xx < TILE_WIDTH; xx++) for (int xx = 0; xx < TILE_WIDTH; xx++)
{ {
img.setRGB(x+xx,y+yy, img.setRGB(x+xx,y+yy,
srcImage.getRGB(xx,imageNumber*TILE_HEIGHT+yy)); srcImage.getRGB(xx,offsetY+yy));
} }
} }
} }
@ -244,7 +244,7 @@ public class TileImages
public Image getImage() public Image getImage()
{ {
return srcImage.getSubimage( return srcImage.getSubimage(
0, imageNumber*TILE_HEIGHT, 0, offsetY,
TILE_WIDTH, TILE_HEIGHT TILE_WIDTH, TILE_HEIGHT
); );
} }
@ -264,13 +264,13 @@ public class TileImages
if (ti instanceof SimpleTileImage) { if (ti instanceof SimpleTileImage) {
final SimpleTileImage sti = (SimpleTileImage) ti; final SimpleTileImage sti = (SimpleTileImage) ti;
return new ImageInfo(sti.srcImage, sti.imageNumber, false); return new ImageInfo(sti.srcImage, sti.offsetY, false);
} }
else if (ti instanceof AnimatedTile) { else if (ti instanceof AnimatedTile) {
final AnimatedTile anim = (AnimatedTile) ti; final AnimatedTile anim = (AnimatedTile) ti;
final SimpleTileImage sti = anim.getFrameByTime(acycle); final SimpleTileImage sti = anim.getFrameByTime(acycle);
return new ImageInfo(sti.srcImage, sti.imageNumber, true); return new ImageInfo(sti.srcImage, sti.offsetY, true);
} }
else { else {
throw new Error("no image for tile "+tileNumber); throw new Error("no image for tile "+tileNumber);