Fetch things via the resource manager. Modified code to create resource

manager and then create image manager as well where appropriate.


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

tests/rsrc/config/miso/viewer.properties

@@ -1,7 +1,7 @@
 #
-# $Id: viewer.properties,v 1.2 2001/08/09 00:01:57 shaper Exp $
+# $Id: viewer.properties,v 1.3 2001/11/08 02:58:23 mdb Exp $
 #
 # Miso scene viewer application config values.
 #
 
-default_scene = default.xml
+default_scene = scenes/default.xml

tests/src/java/com/threerings/cast/builder/TestApp.java

@@ -1,5 +1,5 @@
 //
-// $Id: TestApp.java,v 1.3 2001/11/08 02:07:36 mdb Exp $
+// $Id: TestApp.java,v 1.4 2001/11/08 02:58:23 mdb Exp $
 
 package com.threerings.cast.builder;
 
@@ -9,6 +9,7 @@ import javax.swing.JFrame;
 import com.samskivert.util.Config;
 import com.samskivert.swing.util.SwingUtil;
 
+import com.threerings.resource.ResourceManager;
 import com.threerings.media.ImageManager;
 
 import com.threerings.cast.Log;
@@ -26,7 +27,9 @@ public class TestApp
 
         // create the handles on our various services
         _config = MisoUtil.createConfig();
-	_imgmgr = MisoUtil.createImageManager(_frame);
+
+        ResourceManager rsrcmgr = new ResourceManager("rsrc");
+	_imgmgr = new ImageManager(rsrcmgr, _frame);
 
         CharacterManager charmgr =
             MisoUtil.createCharacterManager(_config, _imgmgr);

tests/src/java/com/threerings/miso/viewer/ViewerApp.java

@@ -1,5 +1,5 @@
 //
-// $Id: ViewerApp.java,v 1.13 2001/11/02 03:09:10 shaper Exp $
+// $Id: ViewerApp.java,v 1.14 2001/11/08 02:58:24 mdb Exp $
 
 package com.threerings.miso.viewer;
 
@@ -9,6 +9,8 @@ import java.io.IOException;
 import com.samskivert.swing.util.SwingUtil;
 import com.samskivert.util.Config;
 
+import com.threerings.resource.ResourceManager;
+
 import com.threerings.media.ImageManager;
 import com.threerings.media.tile.TileManager;
 
@@ -37,7 +39,8 @@ public class ViewerApp
 	_config = MisoUtil.createConfig(
             ViewerModel.CONFIG_KEY, "rsrc/config/miso/viewer");
 	_model = createModel(_config, args);
-        _imgmgr = MisoUtil.createImageManager(_frame);
+        _rsrcmgr = new ResourceManager("rsrc");
+        _imgmgr = new ImageManager(_rsrcmgr, _frame);
 	_tilemgr = MisoUtil.createTileManager(_config, _imgmgr);
 	_screpo = MisoUtil.createSceneRepository(_config, _tilemgr);
 
@@ -79,6 +82,11 @@ public class ViewerApp
 	    return _tilemgr;
 	}
 
+        public ResourceManager getResourceManager ()
+        {
+            return _rsrcmgr;
+        }
+
         public XMLSceneRepository getSceneRepository ()
         {
             return _screpo;
@@ -115,6 +123,9 @@ public class ViewerApp
     /** The config object. */
     protected Config _config;
 
+    /** The resource manager. */
+    protected ResourceManager _rsrcmgr;
+
     /** The scene repository. */
     protected XMLSceneRepository _screpo;
 

tests/src/java/com/threerings/miso/viewer/ViewerSceneViewPanel.java

@@ -1,11 +1,12 @@
 //
-// $Id: ViewerSceneViewPanel.java,v 1.29 2001/11/02 15:28:20 shaper Exp $
+// $Id: ViewerSceneViewPanel.java,v 1.30 2001/11/08 02:58:24 mdb Exp $
 
 package com.threerings.miso.viewer;
 
 import java.awt.*;
 import java.awt.event.*;
 import java.io.IOException;
+import java.io.InputStream;
 import javax.swing.JPanel;
 
 import com.samskivert.util.Config;
@@ -112,7 +113,9 @@ public class ViewerSceneViewPanel extends SceneViewPanel
 	ViewerModel model = _ctx.getViewerModel();
         try {
 	    XMLSceneRepository screpo = _ctx.getSceneRepository();
-            _view.setScene(screpo.loadScene(model.scenefile));
+            InputStream scin = _ctx.getResourceManager().
+                getResource(model.scenefile);
+            _view.setScene(screpo.loadScene(scin));
 
         } catch (IOException ioe) {
             Log.warning("Exception loading scene [fname=" + model.scenefile +

tests/src/java/com/threerings/miso/viewer/util/ViewerContext.java

@@ -1,10 +1,12 @@
 //
-// $Id: ViewerContext.java,v 1.5 2001/11/02 02:52:16 shaper Exp $
+// $Id: ViewerContext.java,v 1.6 2001/11/08 02:58:24 mdb Exp $
 
 package com.threerings.miso.viewer.util;
 
 import com.samskivert.util.Context;
 
+import com.threerings.resource.ResourceManager;
+
 import com.threerings.miso.scene.xml.XMLSceneRepository;
 import com.threerings.miso.util.MisoContext;
 import com.threerings.miso.viewer.ViewerModel;
@@ -15,6 +17,11 @@ import com.threerings.miso.viewer.ViewerModel;
  */
 public interface ViewerContext extends MisoContext, Context
 {
+    /**
+     * Returns the resource manager via which we can load resources.
+     */
+    public ResourceManager getResourceManager ();
+
     /**
      * Returns the scene repository that we can use to get scenes.
      */