Oh the vast sweeping changes, and they're not even close to complete, but

things compile and most things run so this is a good time to checkpoint.
Let me recall:

- Refactored the whole scene deal.
- Revamped the XML parser stuff (now uses Digester).
- Rethought the tile management.
- Started tile bundle stuff.
- Wrote some tests.
- Did a bit of Mike-ification.

Onward and moreward.


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

src/java/com/threerings/media/tile/bundle/TileSetBundle.java

@@ -0,0 +1,98 @@
+//
+// $Id: TileSetBundle.java,v 1.1 2001/11/18 04:09:21 mdb Exp $
+
+package com.threerings.media.tile.bundle;
+
+import java.awt.image.BufferedImage;
+import javax.imageio.ImageIO;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+
+import java.util.Iterator;
+import java.util.jar.JarEntry;
+import java.util.jar.JarFile;
+
+import com.samskivert.util.HashIntMap;
+
+import com.threerings.media.tile.TileSet;
+import com.threerings.media.tile.ImageProvider;
+
+/**
+ * A tileset bundle is used to load up tilesets by id from a persistent
+ * bundle of tilesets stored on the local filesystem.
+ */
+public class TileSetBundle
+    extends HashIntMap
+    implements Serializable, ImageProvider
+{
+    /**
+     * Initializes this resource bundle with a reference to the jarfile
+     * from which it was loaded and from which it can load image data.
+     */
+    public void init (JarFile bundle)
+    {
+        _bundle = bundle;
+    }
+
+    /**
+     * Adds a tileset to this tileset bundle.
+     */
+    public final void addTileSet (int tileSetId, TileSet set)
+    {
+        put(tileSetId, set);
+    }
+
+    /**
+     * Retrieves a tileset from this tileset bundle.
+     */
+    public final TileSet getTileSet (int tileSetId)
+    {
+        return (TileSet)get(tileSetId);
+    }
+
+    // documentation inherited
+    public BufferedImage loadImage (String path)
+        throws IOException
+    {
+        // obtain the image data from our jarfile
+        JarEntry entry = _bundle.getJarEntry(path);
+        if (entry == null) {
+            String errmsg = "Cannot load image resource from bundle " +
+                "[bundle=" + _bundle + ", path=" + path + "].";
+            throw new FileNotFoundException(errmsg);
+        }
+        return ImageIO.read(_bundle.getInputStream(entry));
+    }
+
+    private void writeObject (ObjectOutputStream out)
+        throws IOException
+    {
+        out.writeInt(size());
+
+        Iterator entries = entrySet().iterator();
+        while (entries.hasNext()) {
+            Entry entry = (Entry)entries.next();
+            out.writeInt(((Integer)entry.getKey()).intValue());
+            out.writeObject(entry.getValue());
+        }
+    }        
+
+    private void readObject (ObjectInputStream in)
+        throws IOException, ClassNotFoundException
+    {
+        int count = in.readInt();
+
+        for (int i = 0; i < count; i++) {
+            int tileSetId = in.readInt();
+            TileSet set = (TileSet)in.readObject();
+            put(tileSetId, set);
+        }
+    }
+
+    /** Our resource bundle. */
+    protected JarFile _bundle;
+ }