Removed the last vestiges of the object "layer". Scenes now simply have a

list of objects, they can overlap (I think that objects added to a scene
later will be rendered before objects added earlier which ends up feeling
natural in the editor); no longer are objects ignored when their footprint
lies outside the scene bounds.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1302 542714f4-19e9-0310-aa3c-eee0fc999fb1

src/java/com/threerings/miso/tools/EditableMisoScene.java

@@ -1,5 +1,5 @@
 //
-// $Id: EditableMisoScene.java,v 1.14 2002/04/09 18:06:37 ray Exp $
+// $Id: EditableMisoScene.java,v 1.15 2002/04/27 18:41:14 mdb Exp $
 
 package com.threerings.miso.scene.tools;
 
@@ -7,6 +7,7 @@ import java.awt.Rectangle;
 
 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;
@@ -35,8 +36,7 @@ public interface EditableMisoScene
      *
      * @param defaultBaseTile the new default base tile.
      * @param fqTileId the fully-qualified tile id (@see
-     * com.threerings.media.tile.TileUtil#getFQTileId}) of the new default
-     * base tile.
+     * TileUtil#getFQTileId}) of the new default base tile.
      */
     public void setDefaultBaseTileSet (BaseTileSet defaultBaseTileSet,
                                        int setId);
@@ -48,8 +48,7 @@ public interface EditableMisoScene
      * @param y the y-coordinate of the tile to set.
      * @param tile the tile to set.
      * @param fqTileId the fully-qualified tile id (@see
-     * com.threerings.media.tile.TileUtil#getFQTileId}) of the new default
-     * base tile.
+     * TileUtil#getFQTileId}) of the new default base tile.
      */
     public void setBaseTile (int x, int y, BaseTile tile, int fqTileId);
 
@@ -66,34 +65,25 @@ public interface EditableMisoScene
      * @param y the y-coordinate of the tile to set.
      * @param tile the tile to set.
      * @param fqTileId the fully-qualified tile id (@see
-     * com.threerings.media.tile.TileUtil#getFQTileId}) of the new default
-     * base tile.
+     * TileUtil#getFQTileId}) of the new default base tile.
      */
     public void setFringeTile (int x, int y, Tile tile, int fqTileId);
 
     /**
-     * Updates the tile at the specified location in the object layer. Any
-     * previous object tile at that location should be cleared out by the
-     * implementation of this method before the new tile is set to ensure
-     * that footprint tiles associated with the old object are properly
-     * disposed of.
+     * Addds an object tile to this scene.
      *
-     * @param x the x-coordinate of the tile to set.
-     * @param y the y-coordinate of the tile to set.
+     * @param x the object's origin x-coordinate.
+     * @param y the object's origin y-coordinate.
      * @param tile the tile to set.
      * @param fqTileId the fully-qualified tile id (@see
-     * com.threerings.media.tile.TileUtil#getFQTileId}) of the new default
-     * base tile.
+     * TileUtil#getFQTileId}) of the new default base tile.
      */
-    public void setObjectTile (int x, int y, ObjectTile tile, int fqTileId);
+    public void addObjectTile (ObjectTile tile, int x, int y, int fqTileId);
 
     /**
-     * Sets the action string for the object tile at the specified
-     * coordinates. It may be assumed by the implementation that an object
-     * tile exists in the scene at the specified coordinates, thus callers
-     * should be sure only to call this method accordingly.
+     * Sets the action string for the specified object tile.
      */
-    public void setObjectAction (int x, int y, String action);
+    public void setObjectAction (ObjectTile tile, String action);
 
     /**
      * Clears out the tile at the specified location in the base layer.
@@ -106,17 +96,14 @@ public interface EditableMisoScene
     public void clearFringeTile (int x, int y);
 
     /**
-     * Clears out the tile at the specified location in the object layer.
+     * Clears out the specified tile from the object list.
      */
-    public void clearObjectTile (int x, int y);
+    public void removeObjectTile (ObjectTile tile);
 
     /**
-     * Clears the action string for the object tile at the specified
-     * coordinates. It may be assumed by the implementation that an object
-     * tile exists in the scene at the specified coordinates, thus callers
-     * should be sure only to call this method accordingly.
+     * Clears the action string for the specified object tile.
      */
-    public void clearObjectAction (int x, int y);
+    public void clearObjectAction (ObjectTile tile);
 
     /**
      * Returns a reference to the miso scene model that reflects the