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

TileImage: s/drawTo/drawFragment

Browse source
This commit is contained in:
Jason Long 2015-01-09 22:46:59 -05:00
parent 28be533163
commit 9a285f18ab
3 changed files with 19 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -86,9 +86,9 @@ class Animation extends TileImage
}
@Override
public void drawTo(Graphics2D gr, int destX, int destY, int srcX, int srcY)
public void drawFragment(Graphics2D gr, int destX, int destY, int srcX, int srcY)
{
// Warning: drawing without considering the animation
getDefaultImage().drawTo(gr, destX, destY, srcX, srcY);
getDefaultImage().drawFragment(gr, destX, destY, srcX, srcY);
}
}

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

@ -112,7 +112,7 @@ public class MakeTiles
}
@Override
public void drawTo(Graphics2D gr, int destX, int destY, int srcX, int srcY) { throw new UnsupportedOperationException(); }
public void drawFragment(Graphics2D gr, int destX, int destY, int srcX, int srcY) { throw new UnsupportedOperationException(); }
}
static class Composer
@ -239,7 +239,7 @@ public class MakeTiles
assert dest instanceof ComposeFrame;
ComposeFrame f = (ComposeFrame) dest;
f.refImage.drawTo(c.getGr(f), f.offsetX, f.offsetY, 0, 0);
f.refImage.drawTo(c.getGr(f), f.offsetX, f.offsetY);
}
}

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

@ -7,7 +7,15 @@ public abstract class TileImage
{
public static final int STD_SIZE = 16;
public abstract void drawTo(Graphics2D gr, int destX, int destY, int srcX, int srcY);
/**
* Draws a part of this tile image to the given graphics context.
*/
public abstract void drawFragment(Graphics2D gr, int destX, int destY, int srcX, int srcY);
public final void drawTo(Graphics2D gr, int destX, int destY)
{
this.drawFragment(gr, destX, destY, 0, 0);
}
public static class TileImageLayer extends TileImage
{
@ -21,12 +29,12 @@ public abstract class TileImage
}
@Override
public void drawTo(Graphics2D gr, int destX, int destY, int srcX, int srcY)
public void drawFragment(Graphics2D gr, int destX, int destY, int srcX, int srcY)
{
if (below != null) {
below.drawTo(gr, destX, destY, srcX, srcY);
below.drawFragment(gr, destX, destY, srcX, srcY);
}
above.drawTo(gr, destX, destY, srcX, srcY);
above.drawFragment(gr, destX, destY, srcX, srcY);
}
}
@ -42,9 +50,9 @@ public abstract class TileImage
}
@Override
public void drawTo(Graphics2D gr, int destX, int destY, int srcX, int srcY)
public void drawFragment(Graphics2D gr, int destX, int destY, int srcX, int srcY)
{
source.drawTo(gr, destX, destY, srcX+offsetX, srcY+offsetY);
source.drawFragment(gr, destX, destY, srcX+offsetX, srcY+offsetY);
}
}
@ -65,7 +73,7 @@ public abstract class TileImage
}
@Override
public void drawTo(Graphics2D gr, int destX, int destY, int srcX, int srcY)
public void drawFragment(Graphics2D gr, int destX, int destY, int srcX, int srcY)
{
srcX = srcX * basisSize / STD_SIZE;
srcY = srcY * basisSize / STD_SIZE;