Fixed up image loading to use the now-non-static ImageManager class.

Modified TileManager to store the height of a tile in the Tile
object's member data when the tile is initially created since we
would like to be able to reference it speedily.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@63 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Walter Korman
2001-07-18 22:45:35 +00:00
parent c4654e2a11
commit f91e1b41d1
11 changed files with 84 additions and 54 deletions
@@ -1,5 +1,5 @@
//
// $Id: TileSet.java,v 1.7 2001/07/18 21:45:42 shaper Exp $
// $Id: TileSet.java,v 1.8 2001/07/18 22:45:35 shaper Exp $
package com.threerings.miso.tile;
@@ -62,11 +62,11 @@ public class TileSet
* Return the image corresponding to the specified tile id within
* this tile set.
*/
public BufferedImage getTileImage (int tid)
public Image getTileImage (ImageManager imgr, int tid)
{
// load the full tile image if we don't already have it
if (_imgTiles == null) {
if ((_imgTiles = ImageManager.getImage(_imgFile)) == null) {
if ((_imgTiles = imgr.getImage(_imgFile)) == null) {
Log.warning("Failed to retrieve full tileset image " +
"[file=" + _imgFile + "].");
return null;
@@ -89,8 +89,8 @@ public class TileSet
// ", ty=" + ty + "].");
// crop the tile-sized image chunk from the full image
return ImageManager.getImageCropped(_imgTiles, tx, ty,
Tile.WIDTH, _rowHeight[ridx]);
return imgr.getImageCropped(_imgTiles, tx, ty,
Tile.WIDTH, _rowHeight[ridx]);
}
/**