From 8376b6e9fa9b89db9c1630aebc8a0fbe1eeae583 Mon Sep 17 00:00:00 2001 From: Michael Bayne Date: Thu, 16 Aug 2001 23:14:21 +0000 Subject: [PATCH] Extracted tile code from MISO and moved it into it's own package in media because it's general purpose. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@273 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- src/java/com/threerings/cast/CharacterSprite.java | 6 +++--- src/java/com/threerings/media/tile/Tile.java | 4 ++-- src/java/com/threerings/media/tile/TileManager.java | 12 ++++++------ src/java/com/threerings/media/tile/TileSet.java | 6 +++--- .../com/threerings/media/tile/TileSetManager.java | 4 ++-- .../threerings/media/tile/TileSetManagerImpl.java | 4 +++- .../com/threerings/media/tile/TileSetParser.java | 4 ++-- .../com/threerings/media/tile/XMLTileSetParser.java | 6 +++--- .../threerings/miso/client/DisplayMisoSceneImpl.java | 6 +++--- .../com/threerings/miso/client/IsoSceneView.java | 6 +++--- src/java/com/threerings/miso/client/SceneView.java | 4 ++-- .../com/threerings/miso/client/SceneViewPanel.java | 4 ++-- src/java/com/threerings/miso/client/Traverser.java | 6 ++++-- .../threerings/miso/client/util/AStarPathUtil.java | 9 +++++---- .../threerings/miso/tile/EditableTileSetManager.java | 7 +++++-- src/java/com/threerings/miso/tile/TileUtil.java | 4 +++- .../threerings/miso/tools/xml/XMLSceneParser.java | 5 +++-- .../miso/tools/xml/XMLSceneRepository.java | 4 ++-- .../threerings/miso/tools/xml/XMLSceneWriter.java | 5 +++-- src/java/com/threerings/miso/util/MisoContext.java | 4 ++-- src/java/com/threerings/miso/util/MisoUtil.java | 7 ++++--- .../java/com/threerings/miso/viewer/ViewerApp.java | 4 ++-- .../java/com/threerings/miso/viewer/ViewerFrame.java | 4 ++-- 23 files changed, 69 insertions(+), 56 deletions(-) diff --git a/src/java/com/threerings/cast/CharacterSprite.java b/src/java/com/threerings/cast/CharacterSprite.java index 7463a4340..0de2de987 100644 --- a/src/java/com/threerings/cast/CharacterSprite.java +++ b/src/java/com/threerings/cast/CharacterSprite.java @@ -1,12 +1,12 @@ // -// $Id: CharacterSprite.java,v 1.6 2001/08/15 22:06:21 shaper Exp $ +// $Id: CharacterSprite.java,v 1.7 2001/08/16 23:14:21 mdb Exp $ package com.threerings.miso.scene; import com.threerings.media.sprite.*; +import com.threerings.media.tile.Tile; + import com.threerings.miso.Log; -import com.threerings.miso.tile.Tile; -import com.threerings.miso.tile.Traverser; /** * An AmbulatorySprite is a sprite that can face in one of diff --git a/src/java/com/threerings/media/tile/Tile.java b/src/java/com/threerings/media/tile/Tile.java index 78b507e48..13ec45495 100644 --- a/src/java/com/threerings/media/tile/Tile.java +++ b/src/java/com/threerings/media/tile/Tile.java @@ -1,7 +1,7 @@ // -// $Id: Tile.java,v 1.10 2001/08/15 02:30:27 shaper Exp $ +// $Id: Tile.java,v 1.11 2001/08/16 23:14:20 mdb Exp $ -package com.threerings.miso.tile; +package com.threerings.media.tile; import java.awt.Image; diff --git a/src/java/com/threerings/media/tile/TileManager.java b/src/java/com/threerings/media/tile/TileManager.java index 52c8eb3ce..ae8eabdfe 100644 --- a/src/java/com/threerings/media/tile/TileManager.java +++ b/src/java/com/threerings/media/tile/TileManager.java @@ -1,16 +1,16 @@ // -// $Id: TileManager.java,v 1.14 2001/08/13 19:54:39 shaper Exp $ +// $Id: TileManager.java,v 1.15 2001/08/16 23:14:20 mdb Exp $ -package com.threerings.miso.tile; - -import com.threerings.miso.Log; - -import com.samskivert.util.IntMap; +package com.threerings.media.tile; import java.awt.*; import java.awt.image.BufferedImage; import java.util.ArrayList; +import com.samskivert.util.IntMap; + +import com.threerings.media.Log; + /** * The TileManager class provides a simplified interface * for retrieving and caching tiles. diff --git a/src/java/com/threerings/media/tile/TileSet.java b/src/java/com/threerings/media/tile/TileSet.java index aac8684cc..7e967a3be 100644 --- a/src/java/com/threerings/media/tile/TileSet.java +++ b/src/java/com/threerings/media/tile/TileSet.java @@ -1,14 +1,14 @@ // -// $Id: TileSet.java,v 1.13 2001/08/13 19:54:39 shaper Exp $ +// $Id: TileSet.java,v 1.14 2001/08/16 23:14:20 mdb Exp $ -package com.threerings.miso.tile; +package com.threerings.media.tile; import java.awt.Image; import java.awt.Point; import java.awt.image.*; import com.samskivert.util.StringUtil; -import com.threerings.miso.Log; +import com.threerings.media.Log; import com.threerings.media.ImageManager; /** diff --git a/src/java/com/threerings/media/tile/TileSetManager.java b/src/java/com/threerings/media/tile/TileSetManager.java index 121d7ac53..d7cd73607 100644 --- a/src/java/com/threerings/media/tile/TileSetManager.java +++ b/src/java/com/threerings/media/tile/TileSetManager.java @@ -1,7 +1,7 @@ // -// $Id: TileSetManager.java,v 1.11 2001/08/13 19:54:39 shaper Exp $ +// $Id: TileSetManager.java,v 1.12 2001/08/16 23:14:20 mdb Exp $ -package com.threerings.miso.tile; +package com.threerings.media.tile; import com.threerings.media.ImageManager; diff --git a/src/java/com/threerings/media/tile/TileSetManagerImpl.java b/src/java/com/threerings/media/tile/TileSetManagerImpl.java index 541d24df1..450f95247 100644 --- a/src/java/com/threerings/media/tile/TileSetManagerImpl.java +++ b/src/java/com/threerings/media/tile/TileSetManagerImpl.java @@ -1,5 +1,5 @@ // -// $Id: TileSetManagerImpl.java,v 1.9 2001/08/13 19:54:39 shaper Exp $ +// $Id: TileSetManagerImpl.java,v 1.10 2001/08/16 23:14:21 mdb Exp $ package com.threerings.miso.tile; @@ -10,6 +10,8 @@ import java.util.Enumeration; import com.samskivert.util.*; import com.threerings.media.ImageManager; +import com.threerings.media.tile.*; + import com.threerings.miso.Log; public abstract class TileSetManagerImpl implements TileSetManager diff --git a/src/java/com/threerings/media/tile/TileSetParser.java b/src/java/com/threerings/media/tile/TileSetParser.java index bab0142e7..d7063351d 100644 --- a/src/java/com/threerings/media/tile/TileSetParser.java +++ b/src/java/com/threerings/media/tile/TileSetParser.java @@ -1,7 +1,7 @@ // -// $Id: TileSetParser.java,v 1.4 2001/07/23 22:31:48 shaper Exp $ +// $Id: TileSetParser.java,v 1.5 2001/08/16 23:14:20 mdb Exp $ -package com.threerings.miso.tile; +package com.threerings.media.tile; import java.io.IOException; import java.util.ArrayList; diff --git a/src/java/com/threerings/media/tile/XMLTileSetParser.java b/src/java/com/threerings/media/tile/XMLTileSetParser.java index 1b90edc28..f82a84135 100644 --- a/src/java/com/threerings/media/tile/XMLTileSetParser.java +++ b/src/java/com/threerings/media/tile/XMLTileSetParser.java @@ -1,7 +1,7 @@ // -// $Id: XMLTileSetParser.java,v 1.12 2001/08/16 20:14:06 shaper Exp $ +// $Id: XMLTileSetParser.java,v 1.13 2001/08/16 23:14:20 mdb Exp $ -package com.threerings.miso.tile; +package com.threerings.media.tile; import java.awt.Point; import java.io.*; @@ -13,7 +13,7 @@ import org.xml.sax.helpers.DefaultHandler; import com.samskivert.util.*; import com.samskivert.xml.XMLUtil; -import com.threerings.miso.Log; +import com.threerings.media.Log; /** * Parse an XML tileset description file and construct tileset objects diff --git a/src/java/com/threerings/miso/client/DisplayMisoSceneImpl.java b/src/java/com/threerings/miso/client/DisplayMisoSceneImpl.java index 2947f4e77..9c0c0487d 100644 --- a/src/java/com/threerings/miso/client/DisplayMisoSceneImpl.java +++ b/src/java/com/threerings/miso/client/DisplayMisoSceneImpl.java @@ -1,5 +1,5 @@ // -// $Id: DisplayMisoSceneImpl.java,v 1.31 2001/08/16 22:05:01 shaper Exp $ +// $Id: DisplayMisoSceneImpl.java,v 1.32 2001/08/16 23:14:21 mdb Exp $ package com.threerings.miso.scene; @@ -9,11 +9,11 @@ import java.util.ArrayList; import com.samskivert.util.StringUtil; +import com.threerings.media.tile.Tile; +import com.threerings.media.tile.TileManager; import com.threerings.whirled.data.Scene; import com.threerings.miso.Log; -import com.threerings.miso.tile.Tile; -import com.threerings.miso.tile.TileManager; import com.threerings.miso.scene.util.ClusterUtil; /** diff --git a/src/java/com/threerings/miso/client/IsoSceneView.java b/src/java/com/threerings/miso/client/IsoSceneView.java index 894c181e0..7f8e56d28 100644 --- a/src/java/com/threerings/miso/client/IsoSceneView.java +++ b/src/java/com/threerings/miso/client/IsoSceneView.java @@ -1,5 +1,5 @@ // -// $Id: IsoSceneView.java,v 1.49 2001/08/16 18:05:16 shaper Exp $ +// $Id: IsoSceneView.java,v 1.50 2001/08/16 23:14:21 mdb Exp $ package com.threerings.miso.scene; @@ -11,10 +11,10 @@ import java.util.List; import java.util.ArrayList; import com.threerings.media.sprite.*; +import com.threerings.media.tile.Tile; +import com.threerings.media.tile.TileManager; import com.threerings.miso.Log; -import com.threerings.miso.tile.Tile; -import com.threerings.miso.tile.TileManager; import com.threerings.miso.scene.util.AStarPathUtil; import com.threerings.miso.scene.util.IsoUtil; diff --git a/src/java/com/threerings/miso/client/SceneView.java b/src/java/com/threerings/miso/client/SceneView.java index e00d8846e..fd0dd2c45 100644 --- a/src/java/com/threerings/miso/client/SceneView.java +++ b/src/java/com/threerings/miso/client/SceneView.java @@ -1,5 +1,5 @@ // -// $Id: SceneView.java,v 1.12 2001/08/15 02:30:27 shaper Exp $ +// $Id: SceneView.java,v 1.13 2001/08/16 23:14:21 mdb Exp $ package com.threerings.miso.scene; @@ -7,7 +7,7 @@ import java.awt.Component; import java.awt.Graphics; import com.threerings.media.sprite.*; -import com.threerings.miso.tile.Tile; +import com.threerings.media.tile.Tile; /** * The SceneView interface provides an interface to be implemented by diff --git a/src/java/com/threerings/miso/client/SceneViewPanel.java b/src/java/com/threerings/miso/client/SceneViewPanel.java index 3e12ca308..16c740e94 100644 --- a/src/java/com/threerings/miso/client/SceneViewPanel.java +++ b/src/java/com/threerings/miso/client/SceneViewPanel.java @@ -1,5 +1,5 @@ // -// $Id: SceneViewPanel.java,v 1.7 2001/08/15 22:16:43 shaper Exp $ +// $Id: SceneViewPanel.java,v 1.8 2001/08/16 23:14:21 mdb Exp $ package com.threerings.miso.scene; @@ -7,7 +7,7 @@ import java.awt.*; import javax.swing.JPanel; import com.threerings.media.sprite.SpriteManager; -import com.threerings.miso.tile.TileManager; +import com.threerings.media.tile.TileManager; /** * The SceneViewPanel class is responsible for managing a diff --git a/src/java/com/threerings/miso/client/Traverser.java b/src/java/com/threerings/miso/client/Traverser.java index 80f772b94..52bc776bf 100644 --- a/src/java/com/threerings/miso/client/Traverser.java +++ b/src/java/com/threerings/miso/client/Traverser.java @@ -1,7 +1,9 @@ // -// $Id: Traverser.java,v 1.1 2001/08/15 02:30:27 shaper Exp $ +// $Id: Traverser.java,v 1.2 2001/08/16 23:14:21 mdb Exp $ -package com.threerings.miso.tile; +package com.threerings.miso.scene; + +import com.threerings.media.tile.Tile; /** * The Traverser interface should be implemented by diff --git a/src/java/com/threerings/miso/client/util/AStarPathUtil.java b/src/java/com/threerings/miso/client/util/AStarPathUtil.java index 0d1933053..8d5dd2b51 100644 --- a/src/java/com/threerings/miso/client/util/AStarPathUtil.java +++ b/src/java/com/threerings/miso/client/util/AStarPathUtil.java @@ -1,16 +1,17 @@ // -// $Id: AStarPathUtil.java,v 1.2 2001/08/15 22:06:21 shaper Exp $ +// $Id: AStarPathUtil.java,v 1.3 2001/08/16 23:14:21 mdb Exp $ package com.threerings.miso.scene.util; import java.awt.Point; import java.util.*; -import com.threerings.miso.Log; -import com.threerings.miso.tile.Tile; -import com.threerings.miso.tile.Traverser; +import com.threerings.media.tile.Tile; import com.threerings.media.util.MathUtil; +import com.threerings.miso.Log; +import com.threerings.miso.scene.Traverser; + /** * The AStarPathUtil class provides a facility for * finding a reasonable path between two points in a scene using the diff --git a/src/java/com/threerings/miso/tile/EditableTileSetManager.java b/src/java/com/threerings/miso/tile/EditableTileSetManager.java index 806dd296b..59f932d33 100644 --- a/src/java/com/threerings/miso/tile/EditableTileSetManager.java +++ b/src/java/com/threerings/miso/tile/EditableTileSetManager.java @@ -1,5 +1,5 @@ // -// $Id: EditableTileSetManager.java,v 1.8 2001/07/23 22:31:48 shaper Exp $ +// $Id: EditableTileSetManager.java,v 1.9 2001/08/16 23:14:21 mdb Exp $ package com.threerings.miso.tile; @@ -7,8 +7,11 @@ import java.io.IOException; import java.util.ArrayList; import com.samskivert.util.Config; -import com.threerings.miso.Log; + import com.threerings.media.ImageManager; +import com.threerings.media.tile.*; + +import com.threerings.miso.Log; /** * Extends general tileset manager functionality to allow reading diff --git a/src/java/com/threerings/miso/tile/TileUtil.java b/src/java/com/threerings/miso/tile/TileUtil.java index 3a53ef55c..89d6b25df 100644 --- a/src/java/com/threerings/miso/tile/TileUtil.java +++ b/src/java/com/threerings/miso/tile/TileUtil.java @@ -1,5 +1,5 @@ // -// $Id: TileUtil.java,v 1.2 2001/08/15 02:30:27 shaper Exp $ +// $Id: TileUtil.java,v 1.3 2001/08/16 23:14:21 mdb Exp $ package com.threerings.miso.tile; @@ -7,6 +7,8 @@ import java.awt.Image; import com.threerings.media.sprite.MultiFrameImage; import com.threerings.media.sprite.Path; +import com.threerings.media.tile.*; + import com.threerings.miso.scene.AmbulatorySprite; /** diff --git a/src/java/com/threerings/miso/tools/xml/XMLSceneParser.java b/src/java/com/threerings/miso/tools/xml/XMLSceneParser.java index 3ae4a6470..74227b5e9 100644 --- a/src/java/com/threerings/miso/tools/xml/XMLSceneParser.java +++ b/src/java/com/threerings/miso/tools/xml/XMLSceneParser.java @@ -1,5 +1,5 @@ // -// $Id: XMLSceneParser.java,v 1.13 2001/08/16 20:14:06 shaper Exp $ +// $Id: XMLSceneParser.java,v 1.14 2001/08/16 23:14:21 mdb Exp $ package com.threerings.miso.scene.xml; @@ -13,9 +13,10 @@ import org.xml.sax.helpers.DefaultHandler; import com.samskivert.util.*; import com.samskivert.xml.XMLUtil; +import com.threerings.media.tile.*; + import com.threerings.miso.Log; import com.threerings.miso.scene.*; -import com.threerings.miso.tile.*; /** * Parse an XML scene description file and construct a scene object. diff --git a/src/java/com/threerings/miso/tools/xml/XMLSceneRepository.java b/src/java/com/threerings/miso/tools/xml/XMLSceneRepository.java index 1ea182c3a..005006a0e 100644 --- a/src/java/com/threerings/miso/tools/xml/XMLSceneRepository.java +++ b/src/java/com/threerings/miso/tools/xml/XMLSceneRepository.java @@ -1,5 +1,5 @@ // -// $Id: XMLSceneRepository.java,v 1.8 2001/08/15 02:13:36 mdb Exp $ +// $Id: XMLSceneRepository.java,v 1.9 2001/08/16 23:14:21 mdb Exp $ package com.threerings.miso.scene.xml; @@ -8,9 +8,9 @@ import java.io.IOException; import java.util.ArrayList; import com.samskivert.util.Config; +import com.threerings.media.tile.TileManager; import com.threerings.miso.Log; import com.threerings.miso.scene.MisoScene; -import com.threerings.miso.tile.TileManager; /** * The XMLFileSceneRepository provides a mechanism for diff --git a/src/java/com/threerings/miso/tools/xml/XMLSceneWriter.java b/src/java/com/threerings/miso/tools/xml/XMLSceneWriter.java index 158f223cb..abd21fd60 100644 --- a/src/java/com/threerings/miso/tools/xml/XMLSceneWriter.java +++ b/src/java/com/threerings/miso/tools/xml/XMLSceneWriter.java @@ -1,5 +1,5 @@ // -// $Id: XMLSceneWriter.java,v 1.10 2001/08/16 18:05:17 shaper Exp $ +// $Id: XMLSceneWriter.java,v 1.11 2001/08/16 23:14:21 mdb Exp $ package com.threerings.miso.scene.xml; @@ -12,9 +12,10 @@ import org.xml.sax.helpers.AttributesImpl; import com.megginson.sax.DataWriter; +import com.threerings.media.tile.Tile; + import com.threerings.miso.Log; import com.threerings.miso.scene.*; -import com.threerings.miso.tile.Tile; /** * The XMLSceneWriter writes a {@link diff --git a/src/java/com/threerings/miso/util/MisoContext.java b/src/java/com/threerings/miso/util/MisoContext.java index 2a79862ec..8ad4907ce 100644 --- a/src/java/com/threerings/miso/util/MisoContext.java +++ b/src/java/com/threerings/miso/util/MisoContext.java @@ -1,10 +1,10 @@ // -// $Id: MisoContext.java,v 1.3 2001/08/15 00:00:51 mdb Exp $ +// $Id: MisoContext.java,v 1.4 2001/08/16 23:14:21 mdb Exp $ package com.threerings.miso.util; import com.samskivert.util.Context; -import com.threerings.miso.tile.TileManager; +import com.threerings.media.tile.TileManager; public interface MisoContext extends Context { diff --git a/src/java/com/threerings/miso/util/MisoUtil.java b/src/java/com/threerings/miso/util/MisoUtil.java index e86c9b78f..42fad73fd 100644 --- a/src/java/com/threerings/miso/util/MisoUtil.java +++ b/src/java/com/threerings/miso/util/MisoUtil.java @@ -1,5 +1,5 @@ // -// $Id: MisoUtil.java,v 1.7 2001/08/15 02:13:51 mdb Exp $ +// $Id: MisoUtil.java,v 1.8 2001/08/16 23:14:21 mdb Exp $ package com.threerings.miso.util; @@ -9,12 +9,14 @@ import java.net.URL; import java.net.MalformedURLException; import com.samskivert.util.*; +import com.threerings.resource.ResourceManager; import com.threerings.media.ImageManager; +import com.threerings.media.tile.*; + import com.threerings.miso.Log; import com.threerings.miso.scene.*; import com.threerings.miso.scene.xml.XMLFileSceneRepository; import com.threerings.miso.tile.*; -import com.threerings.resource.ResourceManager; /** * MisoUtil provides miscellaneous routines for applications or other @@ -71,7 +73,6 @@ public class MisoUtil ImageManager imgmgr = new ImageManager(rmgr, frame); TileSetManager tilesetmgr = createTileSetManager(config, imgmgr); TileManager tilemgr = new TileManager(tilesetmgr); - return tilemgr; } diff --git a/tests/src/java/com/threerings/miso/viewer/ViewerApp.java b/tests/src/java/com/threerings/miso/viewer/ViewerApp.java index 7d0ac9119..f6ed531d8 100644 --- a/tests/src/java/com/threerings/miso/viewer/ViewerApp.java +++ b/tests/src/java/com/threerings/miso/viewer/ViewerApp.java @@ -1,5 +1,5 @@ // -// $Id: ViewerApp.java,v 1.5 2001/08/15 00:10:58 mdb Exp $ +// $Id: ViewerApp.java,v 1.6 2001/08/16 23:14:21 mdb Exp $ package com.threerings.miso.viewer; @@ -8,10 +8,10 @@ import java.io.IOException; import com.samskivert.swing.util.SwingUtil; import com.samskivert.util.Config; +import com.threerings.media.tile.TileManager; import com.threerings.miso.Log; import com.threerings.miso.scene.xml.XMLFileSceneRepository; -import com.threerings.miso.tile.TileManager; import com.threerings.miso.util.MisoUtil; import com.threerings.miso.viewer.util.ViewerContext; diff --git a/tests/src/java/com/threerings/miso/viewer/ViewerFrame.java b/tests/src/java/com/threerings/miso/viewer/ViewerFrame.java index cd614cfa3..665eeb677 100644 --- a/tests/src/java/com/threerings/miso/viewer/ViewerFrame.java +++ b/tests/src/java/com/threerings/miso/viewer/ViewerFrame.java @@ -1,5 +1,5 @@ // -// $Id: ViewerFrame.java,v 1.14 2001/08/16 18:05:17 shaper Exp $ +// $Id: ViewerFrame.java,v 1.15 2001/08/16 23:14:21 mdb Exp $ package com.threerings.miso.viewer; @@ -11,10 +11,10 @@ import javax.swing.*; import com.samskivert.swing.*; import com.threerings.media.sprite.*; +import com.threerings.media.tile.TileManager; import com.threerings.miso.Log; import com.threerings.miso.scene.AmbulatorySprite; -import com.threerings.miso.tile.TileManager; import com.threerings.miso.tile.TileUtil; import com.threerings.miso.viewer.util.ViewerContext;