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

Changed MisoTile to BaseTile.

Browse Source 
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@654 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Michael Bayne
2001-11-27 22:17:42 +00:00
parent 6dccfe70ed
commit 2ad3f03a34
13 changed files with 70 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/miso/client/DisplayMisoScene.java
+3 -3
View File
@@ -1,11 +1,11 @@
//
// $Id: DisplayMisoScene.java,v 1.1 2001/11/18 04:09:22 mdb Exp $
// $Id: DisplayMisoScene.java,v 1.2 2001/11/27 22:17:42 mdb Exp $
package com.threerings.miso.scene;
import com.threerings.media.tile.ObjectTileLayer;
import com.threerings.media.tile.TileLayer;
import com.threerings.miso.tile.MisoTileLayer;
import com.threerings.miso.tile.BaseTileLayer;
/**
* Makes available the information from the {@link MisoSceneModel} in a
@@ -19,7 +19,7 @@ public interface DisplayMisoScene
* Returns the tiles that comprise the base layer of this scene. This
* layer is read-only and not to be modified.
*/
public MisoTileLayer getBaseLayer ();
public BaseTileLayer getBaseLayer ();
/**
* Returns the tiles that comprise the fringe layer of this scene.
src/java/com/threerings/miso/client/DisplayMisoSceneImpl.java
+10 -10
View File
@@ -1,5 +1,5 @@
//
// $Id: DisplayMisoSceneImpl.java,v 1.44 2001/11/18 04:09:22 mdb Exp $
// $Id: DisplayMisoSceneImpl.java,v 1.45 2001/11/27 22:17:42 mdb Exp $
package com.threerings.miso.scene;
@@ -12,8 +12,8 @@ import com.threerings.media.tile.TileLayer;
import com.threerings.media.tile.TileManager;
import com.threerings.miso.Log;
import com.threerings.miso.tile.MisoTile;
import com.threerings.miso.tile.MisoTileLayer;
import com.threerings.miso.tile.BaseTile;
import com.threerings.miso.tile.BaseTileLayer;
import com.threerings.miso.tile.ShadowTile;
/**
@@ -40,7 +40,7 @@ public class DisplayMisoSceneImpl
int shei = model.height;
// create the individual tile layer objects
_base = new MisoTileLayer(new MisoTile[swid*shei], swid, shei);
_base = new BaseTileLayer(new BaseTile[swid*shei], swid, shei);
_fringe = new TileLayer(new Tile[swid*shei], swid, shei);
_object = new ObjectTileLayer(new ObjectTile[swid*shei], swid, shei);
@@ -55,10 +55,10 @@ public class DisplayMisoSceneImpl
// this is a bit magical, but the tile manager will
// fetch tiles from the tileset repository and the
// tile set id from which we request this tile must
// map to a miso tile as provided by the repository,
// so we just cast it to a miso tile and know that all
// map to a base tile as provided by the repository,
// so we just cast it to a base tile and know that all
// is well
MisoTile mtile = (MisoTile)tmgr.getTile(tsid, tid);
BaseTile mtile = (BaseTile)tmgr.getTile(tsid, tid);
_base.setTile(column, row, mtile);
}
@@ -101,7 +101,7 @@ public class DisplayMisoSceneImpl
}
// documentation inherited
public MisoTileLayer getBaseLayer ()
public BaseTileLayer getBaseLayer ()
{
return _base;
}
@@ -150,7 +150,7 @@ public class DisplayMisoSceneImpl
* @param y the tile y-coordinate.
* @param stamp the tile to place in the object footprint.
*/
protected void setObjectTileFootprint (int x, int y, MisoTile stamp)
protected void setObjectTileFootprint (int x, int y, BaseTile stamp)
{
ObjectTile tile = _object.getTile(y, x);
int endx = Math.max(0, (x - tile.getBaseWidth() + 1));
@@ -164,7 +164,7 @@ public class DisplayMisoSceneImpl
}
/** The base layer of tiles. */
protected MisoTileLayer _base;
protected BaseTileLayer _base;
/** The fringe layer of tiles. */
protected TileLayer _fringe;
src/java/com/threerings/miso/client/IsoSceneView.java
+3 -3
View File
@@ -1,5 +1,5 @@
//
// $Id: IsoSceneView.java,v 1.72 2001/11/18 04:09:22 mdb Exp $
// $Id: IsoSceneView.java,v 1.73 2001/11/27 22:17:42 mdb Exp $
package com.threerings.miso.scene;
@@ -34,7 +34,7 @@ import com.threerings.miso.Log;
import com.threerings.miso.scene.DirtyItemList.DirtyItem;
import com.threerings.miso.scene.util.AStarPathUtil;
import com.threerings.miso.scene.util.IsoUtil;
import com.threerings.miso.tile.MisoTileLayer;
import com.threerings.miso.tile.BaseTileLayer;
/**
* The iso scene view provides an isometric view of a particular
@@ -217,7 +217,7 @@ public class IsoSceneView implements SceneView
*/
protected void renderTiles (Graphics2D gfx)
{
MisoTileLayer base = _scene.getBaseLayer();
BaseTileLayer base = _scene.getBaseLayer();
TileLayer fringe = _scene.getFringeLayer();
// render the base and fringe layers
src/java/com/threerings/miso/client/MisoCharacterSprite.java
+3 -3
View File
@@ -1,11 +1,11 @@
//
// $Id: MisoCharacterSprite.java,v 1.2 2001/11/18 04:09:22 mdb Exp $
// $Id: MisoCharacterSprite.java,v 1.3 2001/11/27 22:17:42 mdb Exp $
package com.threerings.miso.scene;
import com.threerings.cast.CharacterSprite;
import com.threerings.miso.tile.MisoTile;
import com.threerings.miso.tile.BaseTile;
/**
* The miso character sprite extends the basic character sprite to
@@ -21,7 +21,7 @@ public class MisoCharacterSprite
implements Traverser
{
// documentation inherited
public boolean canTraverse (MisoTile tile)
public boolean canTraverse (BaseTile tile)
{
// by default, passability is solely the province of the tile
return tile.isPassable();
src/java/com/threerings/miso/client/Traverser.java
+3 -3
View File
@@ -1,9 +1,9 @@
//
// $Id: Traverser.java,v 1.3 2001/10/08 21:04:25 shaper Exp $
// $Id: Traverser.java,v 1.4 2001/11/27 22:17:42 mdb Exp $
package com.threerings.miso.scene;
import com.threerings.miso.tile.MisoTile;
import com.threerings.miso.tile.BaseTile;
/**
* The <code>Traverser</code> interface should be implemented by
@@ -21,5 +21,5 @@ public interface Traverser
*
* @return whether the tile is traversable.
*/
public boolean canTraverse (MisoTile tile);
public boolean canTraverse (BaseTile tile);
}
src/java/com/threerings/miso/client/util/AStarPathUtil.java
+6 -6
View File
@@ -1,5 +1,5 @@
//
// $Id: AStarPathUtil.java,v 1.8 2001/11/18 04:09:22 mdb Exp $
// $Id: AStarPathUtil.java,v 1.9 2001/11/27 22:17:42 mdb Exp $
package com.threerings.miso.scene.util;
@@ -10,8 +10,8 @@ import com.threerings.media.util.MathUtil;
import com.threerings.miso.Log;
import com.threerings.miso.scene.Traverser;
import com.threerings.miso.tile.MisoTile;
import com.threerings.miso.tile.MisoTileLayer;
import com.threerings.miso.tile.BaseTile;
import com.threerings.miso.tile.BaseTileLayer;
/**
* The <code>AStarPathUtil</code> class provides a facility for
@@ -44,7 +44,7 @@ public class AStarPathUtil
* @return the list of points in the path.
*/
public static List getPath (
MisoTileLayer tiles, int tilewid, int tilehei, Traverser trav,
BaseTileLayer tiles, int tilewid, int tilehei, Traverser trav,
int ax, int ay, int bx, int by)
{
AStarInfo info = new AStarInfo(tiles, tilewid, tilehei, trav, bx, by);
@@ -254,7 +254,7 @@ public class AStarPathUtil
class AStarInfo
{
/** The tile layer being traversed. */
public MisoTileLayer tiles;
public BaseTileLayer tiles;
/** The tile array dimensions. */
public int tilewid, tilehei;
@@ -275,7 +275,7 @@ class AStarInfo
public int destx, desty;
public AStarInfo (
MisoTileLayer tiles, int tilewid, int tilehei, Traverser trav,
BaseTileLayer tiles, int tilewid, int tilehei, Traverser trav,
int destx, int desty)
{
// save off references