Create the IsoSceneViewModel and no longer create the sprite manager.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1018 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Michael Bayne
2002-02-18 00:43:24 +00:00
parent c97222993b
commit f497a93541
3 changed files with 10 additions and 12 deletions
@@ -1,5 +1,5 @@
// //
// $Id: ScrollingTestApp.java,v 1.1 2002/02/17 23:48:38 mdb Exp $ // $Id: ScrollingTestApp.java,v 1.2 2002/02/18 00:43:23 mdb Exp $
package com.threerings.miso.scene; package com.threerings.miso.scene;
@@ -20,7 +20,6 @@ import com.threerings.media.tile.TileManager;
import com.threerings.media.tile.bundle.BundledTileSetRepository; import com.threerings.media.tile.bundle.BundledTileSetRepository;
import com.threerings.miso.Log; import com.threerings.miso.Log;
import com.threerings.miso.scene.SceneViewPanel;
import com.threerings.miso.util.MisoContext; import com.threerings.miso.util.MisoContext;
import com.threerings.miso.util.MisoUtil; import com.threerings.miso.util.MisoUtil;
@@ -75,7 +74,7 @@ public class ScrollingTestApp
SpriteManager spritemgr = new SpriteManager(); SpriteManager spritemgr = new SpriteManager();
// create our scene view panel // create our scene view panel
_panel = new SceneViewPanel(_config, spritemgr); _panel = new SceneViewPanel(new IsoSceneViewModel(_config));
_frame.setPanel(_panel); _frame.setPanel(_panel);
// set the scene to our scrolling scene // set the scene to our scrolling scene
@@ -1,5 +1,5 @@
// //
// $Id: ViewerApp.java,v 1.25 2002/02/02 01:09:53 mdb Exp $ // $Id: ViewerApp.java,v 1.26 2002/02/18 00:43:24 mdb Exp $
package com.threerings.miso.viewer; package com.threerings.miso.viewer;
@@ -15,7 +15,6 @@ import com.samskivert.util.Config;
import com.threerings.resource.ResourceManager; import com.threerings.resource.ResourceManager;
import com.threerings.media.ImageManager; import com.threerings.media.ImageManager;
import com.threerings.media.sprite.SpriteManager;
import com.threerings.media.tile.TileManager; import com.threerings.media.tile.TileManager;
import com.threerings.media.tile.bundle.BundledTileSetRepository; import com.threerings.media.tile.bundle.BundledTileSetRepository;
@@ -84,14 +83,13 @@ public class ViewerApp
MisoContext ctx = new ContextImpl(); MisoContext ctx = new ContextImpl();
// create the various managers // create the various managers
SpriteManager spritemgr = new SpriteManager();
BundledComponentRepository crepo = BundledComponentRepository crepo =
new BundledComponentRepository(rmgr, imgr, "components"); new BundledComponentRepository(rmgr, imgr, "components");
CharacterManager charmgr = new CharacterManager(crepo); CharacterManager charmgr = new CharacterManager(crepo);
charmgr.setCharacterClass(MisoCharacterSprite.class); charmgr.setCharacterClass(MisoCharacterSprite.class);
// create our scene view panel // create our scene view panel
_panel = new ViewerSceneViewPanel(ctx, spritemgr, charmgr, crepo); _panel = new ViewerSceneViewPanel(ctx, charmgr, crepo);
_frame.setPanel(_panel); _frame.setPanel(_panel);
// load up the scene specified by the user // load up the scene specified by the user
@@ -1,5 +1,5 @@
// //
// $Id: ViewerSceneViewPanel.java,v 1.40 2002/02/17 23:48:27 mdb Exp $ // $Id: ViewerSceneViewPanel.java,v 1.41 2002/02/18 00:43:24 mdb Exp $
package com.threerings.miso.viewer; package com.threerings.miso.viewer;
@@ -28,6 +28,7 @@ import com.threerings.media.util.PerformanceObserver;
import com.threerings.miso.Log; import com.threerings.miso.Log;
import com.threerings.miso.scene.DisplayMisoScene; import com.threerings.miso.scene.DisplayMisoScene;
import com.threerings.miso.scene.IsoSceneViewModel;
import com.threerings.miso.scene.MisoCharacterSprite; import com.threerings.miso.scene.MisoCharacterSprite;
import com.threerings.miso.scene.SceneViewPanel; import com.threerings.miso.scene.SceneViewPanel;
import com.threerings.miso.scene.util.IsoUtil; import com.threerings.miso.scene.util.IsoUtil;
@@ -39,21 +40,21 @@ public class ViewerSceneViewPanel extends SceneViewPanel
/** /**
* Construct the panel and initialize it with a context. * Construct the panel and initialize it with a context.
*/ */
public ViewerSceneViewPanel (MisoContext ctx, SpriteManager spritemgr, public ViewerSceneViewPanel (MisoContext ctx,
CharacterManager charmgr, CharacterManager charmgr,
ComponentRepository crepo) ComponentRepository crepo)
{ {
super(ctx.getConfig(), spritemgr); super(new IsoSceneViewModel(ctx.getConfig()));
// create the character descriptors // create the character descriptors
_descUser = CastUtil.getRandomDescriptor(crepo); _descUser = CastUtil.getRandomDescriptor(crepo);
_descDecoy = CastUtil.getRandomDescriptor(crepo); _descDecoy = CastUtil.getRandomDescriptor(crepo);
// create the manipulable sprite // create the manipulable sprite
_sprite = createSprite(spritemgr, charmgr, _descUser); _sprite = createSprite(_spritemgr, charmgr, _descUser);
// create the decoy sprites // create the decoy sprites
createDecoys(spritemgr, charmgr); createDecoys(_spritemgr, charmgr);
// listen to the desired events // listen to the desired events
addMouseListener(new MouseAdapter() { addMouseListener(new MouseAdapter() {