Objects now have explicit render priorities rather than relying on the

order in which they were added to the scene (that information is no longer
available as objects are reordered arbitrarily once loaded).

Also removed old-school scene conversion.


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

src/java/com/threerings/miso/data/MisoSceneModel.java

@@ -1,5 +1,5 @@
 //
-// $Id: MisoSceneModel.java,v 1.9 2002/07/23 05:54:52 mdb Exp $
+// $Id: MisoSceneModel.java,v 1.10 2002/09/23 23:07:11 mdb Exp $
 
 package com.threerings.miso.scene;
 
@@ -44,6 +44,10 @@ public class MisoSceneModel extends SimpleStreamableObject
      * empty string during serialization. */
     public String[] objectActions;
 
+    /** Render priorities for each object tile in the scene, which are
+     * used to resolve overlapped object render order conflicts. */
+    public byte[] objectPrios;
+
     /**
      * Get the fully-qualified tile id of the base tile at the specified
      * row and column.
@@ -119,34 +123,6 @@ public class MisoSceneModel extends SimpleStreamableObject
         }
     }
 
-    /**
-     * Convert an old school model to the new-style, baby.
-     * TODO: Remove this method someday after we've converted all
-     * our old scenes.
-     */
-    public void convertOldSchool (int vwidth, int vheight)
-    {
-        // sanity check
-        if (baseTileIds.length != (width * height)) {
-            Log.warning("This isn't an old-school scene model!");
-            return;
-        }
-
-        this.vwidth = vwidth;
-        this.vheight = vheight;
-
-        // make a copy of the oldschool base tile ids
-        int[] oldschool = baseTileIds;
-        allocateBaseTileArray();
-
-        int idx = 0;
-        for (int yy=0; yy < height; yy++) {
-            for (int xx=0; xx < width; xx++) {
-                setBaseTile(xx, yy, oldschool[idx++]);
-            }
-        }
-    }
-
     /**
      * Allocate the base tile array.
      */
@@ -165,6 +141,7 @@ public class MisoSceneModel extends SimpleStreamableObject
         model.baseTileIds = (int[])baseTileIds.clone();
         model.objectTileIds = (int[])objectTileIds.clone();
         model.objectActions = (String[])objectActions.clone();
+        model.objectPrios = (byte[])objectPrios.clone();
         return model;
     }
 
@@ -204,5 +181,6 @@ public class MisoSceneModel extends SimpleStreamableObject
         model.allocateBaseTileArray();
         model.objectTileIds = new int[0];
         model.objectActions = new String[0];
+        model.objectPrios = new byte[0];
     }
 }