AfflictionNetworks/narya
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed tile count computation.

Browse Source 
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@643 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Michael Bayne
2001-11-27 08:41:01 +00:00
parent 36e3b8ff7f
commit c1d2c5ab10
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/media/tile/SwissArmyTileSet.java
+8 -7
View File
@@ -1,5 +1,5 @@
// //
// $Id: SwissArmyTileSet.java,v 1.2 2001/11/18 04:09:21 mdb Exp $ // $Id: SwissArmyTileSet.java,v 1.3 2001/11/27 08:41:01 mdb Exp $
package com.threerings.media.tile; package com.threerings.media.tile;
@@ -50,6 +50,7 @@ public class SwissArmyTileSet extends TileSet
protected void computeTileCount () protected void computeTileCount ()
{ {
// compute our number of tiles // compute our number of tiles
_numTiles = 0;
for (int i = 0; i < _tileCounts.length; i++) { for (int i = 0; i < _tileCounts.length; i++) {
_numTiles += _tileCounts[i]; _numTiles += _tileCounts[i];
} }
@@ -104,7 +105,7 @@ public class SwissArmyTileSet extends TileSet
} }
// documentation inherited // documentation inherited
protected Image extractTileImage (int tileId) protected Image extractTileImage (int tileIndex)
{ {
BufferedImage tsimg = getTilesetImage(); BufferedImage tsimg = getTilesetImage();
if (tsimg == null) { if (tsimg == null) {
@@ -119,20 +120,20 @@ public class SwissArmyTileSet extends TileSet
tx = _offsetPos.x; tx = _offsetPos.x;
ty = _offsetPos.y; ty = _offsetPos.y;
while ((tcount += _tileCounts[ridx]) < tileId + 1) { while ((tcount += _tileCounts[ridx]) < tileIndex + 1) {
// increment tile image position by row height and gap distance // increment tile image position by row height and gap distance
ty += (_heights[ridx++] + _gapSize.height); ty += (_heights[ridx++] + _gapSize.height);
} }
// determine the horizontal index of this tile in the row // determine the horizontal index of this tile in the row
int xidx = tileId - (tcount - _tileCounts[ridx]); int xidx = tileIndex - (tcount - _tileCounts[ridx]);
// final image x-position is based on tile width and gap distance // final image x-position is based on tile width and gap distance
tx += (xidx * (_widths[ridx] + _gapSize.width)); tx += (xidx * (_widths[ridx] + _gapSize.width));
// Log.info("Retrieving tile image [tileId=" + tileId + ", ridx=" + // Log.info("Retrieving tile image [tileIndex=" + tileIndex +
// ridx + ", xidx=" + xidx + ", tx=" + tx + // ", ridx=" + ridx + ", xidx=" + xidx +
// ", ty=" + ty + "]."); // ", tx=" + tx + ", ty=" + ty + "].");
// crop the tile-sized image chunk from the full image // crop the tile-sized image chunk from the full image
return tsimg.getSubimage(tx, ty, _widths[ridx], _heights[ridx]); return tsimg.getSubimage(tx, ty, _widths[ridx], _heights[ridx]);