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

More progress toward arbitrarily scrollable scenes. The IsoSceneView still

Browse Source 
requests all objects in God's green earth, but we now have the necessary
structures for it to request new objects as they scroll (nearly) into view
and for it to abandon objects as they scroll (way) out of view.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1742 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Michael Bayne
2002-09-23 21:54:50 +00:00
parent 552d73de59
commit 92c8748c7c
6 changed files with 112 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/miso/tools/EditableMisoScene.java
+10 -19
View File
@@ -1,5 +1,5 @@
//
// $Id: EditableMisoScene.java,v 1.17 2002/09/18 02:32:57 mdb Exp $
// $Id: EditableMisoScene.java,v 1.18 2002/09/23 21:54:50 mdb Exp $
package com.threerings.miso.scene.tools;
@@ -9,10 +9,11 @@ import com.threerings.media.tile.ObjectTile;
import com.threerings.media.tile.Tile;
import com.threerings.media.tile.TileUtil;
import com.threerings.miso.tile.BaseTile;
import com.threerings.miso.tile.BaseTileSet;
import com.threerings.miso.scene.DisplayMisoScene;
import com.threerings.miso.scene.MisoSceneModel;
import com.threerings.miso.scene.SceneObject;
import com.threerings.miso.tile.BaseTile;
import com.threerings.miso.tile.BaseTileSet;
/**
* The editable Miso scene interface is used in the offline scene building
@@ -59,7 +60,7 @@ public interface EditableMisoScene
public void setBaseTiles (Rectangle r, BaseTileSet set, int setId);
/**
* Addds an object tile to this scene.
* Adds an object to this scene.
*
* @param x the object's origin x-coordinate.
* @param y the object's origin y-coordinate.
@@ -67,14 +68,10 @@ public interface EditableMisoScene
* @param fqTileId the fully-qualified tile id (@see
* TileUtil#getFQTileId}) of the new default base tile.
*
* @return the new object's index in the object list.
* @return the new scene object instance.
*/
public int addObjectTile (ObjectTile tile, int x, int y, int fqTileId);
/**
* Sets the action string for the specified object tile.
*/
public void setObjectAction (int index, String action);
public SceneObject addSceneObject (
ObjectTile tile, int x, int y, int fqTileId);
/**
* Clears out the tile at the specified location in the base layer.
@@ -82,15 +79,9 @@ public interface EditableMisoScene
public void clearBaseTile (int x, int y);
/**
* Clears out the specified object tile at the specified coordinates
* from the object list.
* Removes the specified object from the scene.
*/
public void removeObjectTile (int index);
/**
* Clears the action string for the specified object tile.
*/
public void clearObjectAction (int index);
public boolean removeSceneObject (SceneObject scobj);
/**
* Returns a reference to the miso scene model that reflects the
src/java/com/threerings/miso/tools/EditableMisoSceneImpl.java
+38 -40
View File
@@ -1,5 +1,5 @@
//
// $Id: EditableMisoSceneImpl.java,v 1.22 2002/09/18 02:32:57 mdb Exp $
// $Id: EditableMisoSceneImpl.java,v 1.23 2002/09/23 21:54:50 mdb Exp $
package com.threerings.miso.scene.tools;
@@ -23,6 +23,7 @@ import com.threerings.miso.tile.MisoTileManager;
import com.threerings.miso.scene.DisplayMisoSceneImpl;
import com.threerings.miso.scene.MisoSceneModel;
import com.threerings.miso.scene.SceneObject;
import com.threerings.miso.scene.util.IsoUtil;
/**
@@ -110,26 +111,21 @@ public class EditableMisoSceneImpl
}
// documentation inherited
public int addObjectTile (ObjectTile tile, int x, int y, int fqTileId)
public SceneObject addSceneObject (
ObjectTile tile, int x, int y, int fqTileId)
{
// create an object info record and add it to the list
EditableObjectInfo info = (EditableObjectInfo)createObjectInfo();
info.object = tile;
info.coords = new Point(x, y);
info.fqTileId = fqTileId;
_objects.add(info);
// create a scene object record and add it to the list
EditableSceneObject scobj = (EditableSceneObject)
createSceneObject(x, y, tile);
scobj.fqTileId = fqTileId;
scobj.index = _objects.size();
_objects.add(scobj);
// toggle the "covered" flag on in all base tiles below this
// object tile
setObjectTileFootprint(tile, x, y, true);
return _objects.size()-1;
}
// documentation inherited from interface
public void setObjectAction (int index, String action)
{
((ObjectInfo)_objects.get(index)).action = action;
return scobj;
}
// documentation inherited
@@ -141,20 +137,16 @@ public class EditableMisoSceneImpl
}
// documentation inherited
public void removeObjectTile (int index)
public boolean removeSceneObject (SceneObject scobj)
{
ObjectInfo info = (ObjectInfo)_objects.remove(index);
// toggle the "covered" flag off on the base tiles in this object
// tile's footprint
setObjectTileFootprint(
info.object, info.coords.x, info.coords.y, false);
}
// documentation inherited from interface
public void clearObjectAction (int index)
{
((ObjectInfo)_objects.get(index)).action = null;
if (_objects.remove(scobj)) {
// toggle the "covered" flag off on the base tiles in this object
// tile's footprint
setObjectTileFootprint(scobj.tile, scobj.x, scobj.y, false);
return true;
} else {
return false;
}
}
// documentation inherited
@@ -170,11 +162,12 @@ public class EditableMisoSceneImpl
String[] actions = new String[ocount];
for (int ii = 0; ii < ocount; ii++) {
EditableObjectInfo info = (EditableObjectInfo)_objects.get(ii);
otids[3*ii] = info.coords.x;
otids[3*ii+1] = info.coords.y;
otids[3*ii+2] = info.fqTileId;
actions[ii] = info.action;
EditableSceneObject scobj = (EditableSceneObject)
_objects.get(ii);
otids[3*ii] = scobj.x;
otids[3*ii+1] = scobj.y;
otids[3*ii+2] = scobj.fqTileId;
actions[ii] = scobj.action;
}
// stuff the new arrays into the model
@@ -187,31 +180,36 @@ public class EditableMisoSceneImpl
}
// documentation inherited
protected ObjectInfo createObjectInfo ()
protected SceneObject createSceneObject (int x, int y, ObjectTile tile)
{
return new EditableObjectInfo();
return new EditableSceneObject(x, y, tile);
}
// documentation inherited
protected ObjectInfo expandObject (
protected SceneObject expandObject (
int col, int row, int tsid, int tid, int fqTid, String action)
throws NoSuchTileException, NoSuchTileSetException
{
// do the actual object creation
EditableObjectInfo info = (EditableObjectInfo)
EditableSceneObject scobj = (EditableSceneObject)
super.expandObject(col, row, tsid, tid, fqTid, action);
// we need this to track object layer mods
info.fqTileId = fqTid;
scobj.fqTileId = fqTid;
// pass on the objecty goodness
return info;
return scobj;
}
/** Used to report information on objects in this scene. */
protected static class EditableObjectInfo extends ObjectInfo
protected static class EditableSceneObject extends SceneObject
{
public int fqTileId;
public EditableSceneObject (int x, int y, ObjectTile tile)
{
super(x, y, tile);
}
}
/** The default tileset with which to fill the base layer. */