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

Changed default base tile to default base tileset.

Browse Source 
Clearing a base tile sets it to a random tile from the default tileset.
setBaseTiles() now takes a tileset and fills the rectangular area with
random tiles from that set.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1227 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Ray Greenwell
2002-04-09 18:06:37 +00:00
parent 02dd621601
commit 95017c3ebf
2 changed files with 46 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/miso/tools/EditableMisoScene.java
+8 -5
View File
@@ -1,5 +1,5 @@
//
// $Id: EditableMisoScene.java,v 1.13 2002/04/06 02:08:21 ray Exp $
// $Id: EditableMisoScene.java,v 1.14 2002/04/09 18:06:37 ray Exp $
package com.threerings.miso.scene.tools;
@@ -9,6 +9,7 @@ import com.threerings.media.tile.ObjectTile;
import com.threerings.media.tile.Tile;
import com.threerings.miso.tile.BaseTile;
import com.threerings.miso.tile.BaseTileSet;
import com.threerings.miso.scene.DisplayMisoScene;
import com.threerings.miso.scene.MisoSceneModel;
@@ -27,7 +28,7 @@ public interface EditableMisoScene
/**
* Returns the default base tile.
*/
public BaseTile getDefaultBaseTile ();
public BaseTileSet getDefaultBaseTileSet ();
/**
* Sets the default base tile.
@@ -37,7 +38,8 @@ public interface EditableMisoScene
* com.threerings.media.tile.TileUtil#getFQTileId}) of the new default
* base tile.
*/
public void setDefaultBaseTile (BaseTile defaultBaseTile, int fqTileId);
public void setDefaultBaseTileSet (BaseTileSet defaultBaseTileSet,
int setId);
/**
* Updates the tile at the specified location in the base layer.
@@ -52,9 +54,10 @@ public interface EditableMisoScene
public void setBaseTile (int x, int y, BaseTile tile, int fqTileId);
/**
* Fill a rectangular area with the specified base tile.
* Fill a rectangular area with random tiles from
* the specified base tileset.
*/
public void setBaseTiles (Rectangle r, BaseTile tile, int fqTileId);
public void setBaseTiles (Rectangle r, BaseTileSet set, int setId);
/**
* Updates the tile at the specified location in the fringe layer.
src/java/com/threerings/miso/tools/EditableMisoSceneImpl.java
+38 -17
View File
@@ -1,10 +1,11 @@
//
// $Id: EditableMisoSceneImpl.java,v 1.15 2002/04/09 01:58:37 ray Exp $
// $Id: EditableMisoSceneImpl.java,v 1.16 2002/04/09 18:06:37 ray Exp $
package com.threerings.miso.scene.tools;
import java.awt.Rectangle;
import java.util.Iterator;
import java.util.Random;
import com.samskivert.util.HashIntMap;
@@ -12,11 +13,13 @@ import com.threerings.media.tile.NoSuchTileException;
import com.threerings.media.tile.NoSuchTileSetException;
import com.threerings.media.tile.ObjectTile;
import com.threerings.media.tile.Tile;
import com.threerings.media.tile.TileUtil;
import com.threerings.miso.Log;
import com.threerings.miso.tile.AutoFringer;
import com.threerings.miso.tile.BaseTile;
import com.threerings.miso.tile.BaseTileSet;
import com.threerings.miso.tile.MisoTileManager;
import com.threerings.miso.scene.DisplayMisoSceneImpl;
@@ -70,35 +73,49 @@ public class EditableMisoSceneImpl
}
// documentation inherited
public BaseTile getDefaultBaseTile ()
public BaseTileSet getDefaultBaseTileSet ()
{
return _defaultBaseTile;
return _defaultBaseTileSet;
}
// documentation inherited
public void setDefaultBaseTile (BaseTile defaultBaseTile, int fqTileId)
public void setDefaultBaseTileSet (BaseTileSet defaultBaseTileSet,
int setId)
{
_defaultBaseTile = defaultBaseTile;
_defaultBaseTileId = fqTileId;
_defaultBaseTileSet = defaultBaseTileSet;
_defaultBaseTileSetId = setId;
}
// documentation inherited
public void setBaseTiles (Rectangle r, BaseTile tile, int fqTileId)
public void setBaseTiles (Rectangle r, BaseTileSet set, int setId)
{
int setcount = set.getTileCount();
for (int x = r.x; x < r.x + r.width; x++) {
for (int y = r.y; y < r.y + r.height; y++) {
_base.setTile(x, y, tile);
_model.baseTileIds[_model.width*y + x] = fqTileId;
try {
int index = _rando.nextInt(setcount);
_base.setTile(x, y, (BaseTile) set.getTile(index));
_model.baseTileIds[_model.width*y + x] =
TileUtil.getFQTileId(setId, index);
} catch (NoSuchTileException nste) {
// not going to happen
Log.warning("A tileset is lying to me [error=" + nste +
"].");
}
}
}
_fringer.fringe(_model, _fringe, r);
_fringer.fringe(_model, _fringe, r, _rando);
}
// documentation inherited
public void setBaseTile (int x, int y, BaseTile tile, int fqTileId)
{
setBaseTiles(new Rectangle(x, y, 1, 1), tile, fqTileId);
_base.setTile(x, y, tile);
_model.baseTileIds[_model.width*y + x] = fqTileId;
_fringer.fringe(_model, _fringe, new Rectangle(x, y, 1, 1), _rando);
}
// documentation inherited
@@ -136,8 +153,9 @@ public class EditableMisoSceneImpl
// documentation inherited
public void clearBaseTile (int x, int y)
{
// implemented as a set of the default tile
setBaseTile(x, y, _defaultBaseTile, _defaultBaseTileId);
// implemented as a set of one of the random base tiles
setBaseTiles(new Rectangle(x, y, 1, 1),
_defaultBaseTileSet, _defaultBaseTileSetId);
}
// documentation inherited
@@ -227,12 +245,15 @@ public class EditableMisoSceneImpl
/** where we keep track of object tile ids. */
protected HashIntMap _objectTileIds;
/** The default tile with which to fill the base layer. */
protected BaseTile _defaultBaseTile;
/** The default tileset with which to fill the base layer. */
protected BaseTileSet _defaultBaseTileSet;
/** The fully qualified tile id of the default base tile. */
protected int _defaultBaseTileId;
/** The tileset id of the default base tileset. */
protected int _defaultBaseTileSetId;
/** The autofringer. */
protected AutoFringer _fringer;
/** A random number generator for filling random base tiles and fringes. */
protected Random _rando = new Random();
}