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

drawing-area: fix where sprites are drawn when zoom level is not 16px

Browse source 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@765 d9718cc8-9f43-0410-858b-315f434eb58c
This commit is contained in:
jason@long.name 2013-07-21 15:34:51 +00:00
parent 4a38afc40f
commit 1429407d9f
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/micropolisj/gui/MicropolisDrawingArea.java
View file

@ -105,15 +105,20 @@ public class MicropolisDrawingArea extends JComponent
{ {
assert sprite.isVisible(); assert sprite.isVisible();
Point p = new Point(
sprite.x * TILE_WIDTH / 16,
sprite.y * TILE_HEIGHT / 16
);
Image img = tileImages.getSpriteImage(sprite.kind, sprite.frame-1); Image img = tileImages.getSpriteImage(sprite.kind, sprite.frame-1);
if (img != null) { if (img != null) {
gr.drawImage(img, sprite.x + sprite.offx, sprite.y + sprite.offy, null); gr.drawImage(img, p.x + sprite.offx, p.y + sprite.offy, null);
} }
else { else {
gr.setColor(Color.RED); gr.setColor(Color.RED);
gr.fillRect(sprite.x, sprite.y, 16, 16); gr.fillRect(p.x, p.y, 16, 16);
gr.setColor(Color.WHITE); gr.setColor(Color.WHITE);
gr.drawString(Integer.toString(sprite.frame-1),sprite.x,sprite.y); gr.drawString(Integer.toString(sprite.frame-1),p.x,p.y);
} }
} }
@ -307,7 +312,10 @@ public class MicropolisDrawingArea extends JComponent
private Rectangle getSpriteBounds(Sprite sprite, int x, int y) private Rectangle getSpriteBounds(Sprite sprite, int x, int y)
{ {
return new Rectangle(x+sprite.offx, y+sprite.offy, sprite.width, sprite.height); return new Rectangle(
x*TILE_WIDTH/16+sprite.offx,
y*TILE_HEIGHT/16+sprite.offy,
sprite.width, sprite.height);
} }
public Rectangle getTileBounds(int xpos, int ypos) public Rectangle getTileBounds(int xpos, int ypos)