Revamped image loading such that the ResourceManager handles loading images

given a resource path so that it can be smart about loading from files versus
streams depending on what works based based on where the resources are coming
from. Also moved FastImageIO into com.threerings.resource to avoid a dependence
on com.threerings.media in resource.


git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@310 ed5b42cb-e716-0410-a449-f6a68f950b19

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

@@ -29,12 +29,9 @@ import java.io.ObjectOutputStream;
 import java.io.Serializable;
 import java.util.Iterator;
 
-import javax.imageio.ImageIO;
-
 import com.samskivert.util.HashIntMap;
 import com.threerings.resource.ResourceBundle;
 
-import com.threerings.media.image.FastImageIO;
 import com.threerings.media.image.ImageDataProvider;
 import com.threerings.media.tile.TileSet;
 
@@ -105,11 +102,7 @@ public class TileSetBundle extends HashIntMap
     public BufferedImage loadImage (String path)
         throws IOException
     {
-        if (path.endsWith(FastImageIO.FILE_SUFFIX)) {
-            return FastImageIO.read(_bundle.getResourceFile(path));
-        } else {
-            return ImageIO.read(_bundle.getResourceFile(path));
-        }
+        return _bundle.getImageResource(path);
     }
 
     // custom serialization process

src/java/com/threerings/media/tile/bundle/tools/TileSetBundler.java

@@ -44,8 +44,8 @@ import org.xml.sax.SAXException;
 import com.samskivert.io.PersistenceException;
 
 import com.threerings.media.Log;
-import com.threerings.media.image.FastImageIO;
 import com.threerings.media.image.ImageUtil;
+import com.threerings.resource.FastImageIO;
 
 import com.threerings.media.tile.ImageProvider;
 import com.threerings.media.tile.ObjectTileSet;