From 09ef3cd972b21b93ca74497858bb93522f095804 Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@threerings.net>
Date: Fri, 5 Oct 2001 23:58:36 +0000
Subject: [PATCH] Decoupled MISO from Whirled. They now exist in a form that
 can be easily combined in a game that wishes to use both of them, but MISO no
 longer extends Whirled's Scene interfaces.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@400 542714f4-19e9-0310-aa3c-eee0fc999fb1
---
 .../com/threerings/miso/client/MisoScene.java  | 18 +++++++++++++++---
 .../miso/tools/EditableMisoScene.java          | 16 ++++++++++++----
 2 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/src/java/com/threerings/miso/client/MisoScene.java b/src/java/com/threerings/miso/client/MisoScene.java
index 23975a63f..cb735efd9 100644
--- a/src/java/com/threerings/miso/client/MisoScene.java
+++ b/src/java/com/threerings/miso/client/MisoScene.java
@@ -1,20 +1,22 @@
 //
-// $Id: MisoScene.java,v 1.2 2001/09/28 01:31:32 mdb Exp $
+// $Id: MisoScene.java,v 1.3 2001/10/05 23:58:36 mdb Exp $
 
 package com.threerings.miso.scene;
 
 import java.util.List;
 
 import com.threerings.media.tile.Tile;
-import com.threerings.whirled.data.Scene;
 
 /**
  * A scene object represents the data model corresponding to a single
  * screen for game play. For instance, one scene might display a portion
  * of a street with several buildings scattered about on the periphery.
  */
-public interface MisoScene extends Scene
+public interface MisoScene
 {
+    /** Scene id to denote an unset or otherwise invalid scene id. */
+    public static final int SID_INVALID = -1;
+
     /** The total number of layers. */
     public static final int NUM_LAYERS = 3;
 
@@ -27,6 +29,16 @@ public interface MisoScene extends Scene
     /** The object layer id. */
     public static final int LAYER_OBJECT = 2;
 
+    /**
+     * Returns the scene's unique identifier.
+     */
+    public int getId ();
+
+    /**
+     * Returns the scene's name. Every scene has a descriptive name.
+     */
+    public String getName ();
+
     /**
      * Return the tiles that comprise this scene.
      */
diff --git a/src/java/com/threerings/miso/tools/EditableMisoScene.java b/src/java/com/threerings/miso/tools/EditableMisoScene.java
index 41f821919..d77272b8d 100644
--- a/src/java/com/threerings/miso/tools/EditableMisoScene.java
+++ b/src/java/com/threerings/miso/tools/EditableMisoScene.java
@@ -1,10 +1,8 @@
 //
-// $Id: EditableMisoScene.java,v 1.1 2001/09/21 02:30:35 mdb Exp $
+// $Id: EditableMisoScene.java,v 1.2 2001/10/05 23:58:36 mdb Exp $
 
 package com.threerings.miso.scene;
 
-import com.threerings.whirled.data.EditableScene;
-
 /**
  * The editable Miso scene interface provides the means for modifying a
  * Miso scene which is needed by things like the scene editor. This is
@@ -13,8 +11,18 @@ import com.threerings.whirled.data.EditableScene;
  * fact it should only be done under special circumstances.
  */
 public interface EditableMisoScene
-    extends EditableScene, MisoScene
+    extends MisoScene
 {
+    /**
+     * Updates the scene's unique identifier.
+     */
+    public void setId (int sceneId);
+
+    /**
+     * Updates the scene's name.
+     */
+    public void setName (String name);
+
     /**
      * Set the default entrance portal for this scene.
      *