Commit Graph

57 Commits

Author SHA1 Message Date
Michael Bayne 46b71392aa Moved some stuff into BundleUtil. Added code to support post-parsing
tileset validation.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@700 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-11-29 21:58:15 +00:00
Michael Bayne be5428a2f7 Moved some bundle stuff into BundleUtil. Added methods to support
post-parsing tileset validation.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@699 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-11-29 21:57:31 +00:00
Michael Bayne 4f6e0f7542 Documentation fixes.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@693 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-11-29 20:39:37 +00:00
Michael Bayne 075ea5e9fe Created a persistent tileset name to id broker implementation; wrote an
ANT task for creating tileset bundles.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@659 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-11-29 00:14:11 +00:00
Michael Bayne b7312882f4 Added enumerateTileSetIds().
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@658 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-11-29 00:13:42 +00:00
Michael Bayne 80072f7048 Added methods that take File instances in addition to those that take
String paths.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@657 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-11-29 00:13:20 +00:00
Michael Bayne 38a538a446 Implemented enumerateTileSetIds(); also added sanity check when scanning
the resource bundles at construct time.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@656 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-11-29 00:12:42 +00:00
Michael Bayne 73b952913a Removed some vestigal code.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@652 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-11-27 22:06:39 +00:00
Michael Bayne 629e8cbf74 Added code to parse gapSize and offsetPos.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@651 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-11-27 22:06:19 +00:00
Michael Bayne c1d2c5ab10 Fixed tile count computation.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@643 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-11-27 08:41:01 +00:00
Michael Bayne 36e3b8ff7f checkedGet() need not throw NoSuchTileException.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@642 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-11-27 08:40:34 +00:00
Michael Bayne 7ad2acca11 Bundles! Got all the tileset bundle stuff working and wrote some tests to
inrease my confidence in the use of the word "working".


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@635 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-11-21 02:42:16 +00:00
Michael Bayne 6c1051abed Repackaging now that I know what we want to do with the tools package.
Here's the policy:

Every top-level package has a tools package under which all subpackages
exist with their tools additions. For example:

com.threerings.media.tile.TileSet
com.threerings.media.tools.tile.XMLTileSetRuleSet
com.threerings.miso.scene.MisoScene
com.threerings.miso.tools.scene.EditableMisoScene


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@630 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-11-20 04:15:44 +00:00
Michael Bayne 233b7aca22 Modified TileSetBundle to load resources from a ResourceBundle instead of
a JarFile.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@629 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-11-20 03:48:41 +00:00
Michael Bayne 8ac5e7c9bb Created tileset repository that loads tiles from tileset bundles. It
obtains the bundles from the resource manager using the new resource set
facilities. Oh, it's all so resourceful.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@628 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-11-20 03:47:38 +00:00
Michael Bayne cc21ad8679 Javadoc fixes and cleanups.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@623 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-11-18 04:27:56 +00:00
Michael Bayne ae1052a371 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
2001-11-18 04:09:23 +00:00
Michael Bayne 42eb80a104 Tile coordinate calculations were booched.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@611 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-11-08 06:58:57 +00:00
Michael Bayne feb2a2633e A bunch of intertwingled changes:
Refactored TileSet into TileSet, UniformTileSet, SwissArmyTileSet and
ObjectTileSet.

Removed dependence on the "root" system property from the
XMLSceneRepository (things either pass in full paths now or input streams
fetched via the resource manager).

Removed MisoUtil.createImageManager() because everyone does that by hand
now (which is good because some non-Miso things were using MisoUtil for
that).

I think that's it, but if there was something else, don't blame me. Blame
the monkeys.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@608 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-11-08 03:04:45 +00:00
Walter Korman 39966726aa More work on character components. Revamped tile sets to allow them
to be constructed and used directly.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@581 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-11-01 01:40:43 +00:00
Walter Korman 9b3af10abe Renamed getPoint() for posterity.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@512 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-10-22 18:11:59 +00:00
Walter Korman 97940360dc Removed image from toString().
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@511 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-10-22 18:11:25 +00:00
Walter Korman 00d57dfb92 Added character manager and character descriptions. Allow tile sets
that have no specified layer.  Made the scene editor gracefully handle
the case where there are no valid tile sets for use with the selected
scene layer.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@461 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-10-15 23:53:43 +00:00
Walter Korman 9fc38238a6 Tile sets that are specified as object tile sets now always produce
object tiles.  If no dimensions are specified for an object, it
defaults to 1x1 unit tile units.  The media package supports
specification of tilesets as object tile sets via the "layer"
attribute.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@450 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-10-12 16:36:58 +00:00
Walter Korman e8d41b9592 More work on object tiles. Simplified tile set manager as the editor
will now obtain tile set information directly from the tile sets.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@446 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-10-12 00:38:15 +00:00
Walter Korman ad7b64d4a1 Initial work on support for objects whose images span multiple tiles.
Made TileSet an interface.  Throw exceptions for unknown tile or tile
set requests.  General clean-up and documentation.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@427 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-10-11 00:41:27 +00:00
Walter Korman 95ba5ef9cf Separate the notion of tile passability from tile objects since
passability is specific to the miso layer.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@405 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-10-08 21:04:26 +00:00
Michael Bayne c69e46be21 Added getTileId() which returns the fully qualified tile id.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@352 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-09-28 01:24:27 +00:00
Walter Korman da1484a019 Don't attempt to put a tile in the tile cache if we didn't retrieve it
from the tileset manager successfully.  Cleaned up comments.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@350 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-09-28 00:44:31 +00:00
Walter Korman 56238e7820 Read tileset id and name from attributes of the tileset tag.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@347 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-09-27 18:43:08 +00:00
Michael Bayne ec1cf5c667 Changed IntMap to HashIntMap.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@339 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-09-17 05:18:21 +00:00
Walter Korman 6d5a41d834 Return a null tile if a non-existent tile id is requested.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@321 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-08-30 01:13:08 +00:00
Michael Bayne d89f7ed454 Moved TileSetManagerImpl into the media.tile package because it's useful
for any derived class implementing TileSetManager.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@274 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-08-16 23:17:46 +00:00
Michael Bayne 8376b6e9fa 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
2001-08-16 23:14:21 +00:00
Walter Korman 722073eca6 Cleaned up XML parsing to store temporary info more cleanly. Initial
work on scene group parser.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@271 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-08-16 20:14:06 +00:00
Walter Korman 0616f0f464 Moved AmbulatorySprite around and made it implement the Traverser
interface.  Initial version of AStarPathUtil and hooked it in to
SceneView.getPath().  Not yet tested.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@255 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-08-15 02:30:28 +00:00
Walter Korman 18e6b0b95b Added passability to tile objects. Changed TileSetManager to retrieve
tiles in their entirety from their TileSet.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@231 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-08-13 19:54:39 +00:00
Walter Korman d54d562992 Updated comments.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@230 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-08-13 15:00:24 +00:00
Walter Korman 6b423cd53a Modified to save element contents on endElement() rather than when
character data is read since character data may come in chunks.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@193 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-08-08 00:33:54 +00:00
Walter Korman f39087cfc3 Removed verbose logging.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@131 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-07-28 01:35:06 +00:00
Walter Korman 92e46c6eae Added row-based tile width, image offset, and image row/column gap
distance parameters to tile sets.  Removed constant tile width/height
references except, for now, for isometric tile rendering which still
requires tiles that are 32x16.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@130 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-07-28 01:31:51 +00:00
Walter Korman 15bb149600 More work on parsing scene XML files.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@120 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-07-24 22:52:02 +00:00
Walter Korman f02475b4c2 Initial work on reading and writing scenes to XML files.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@113 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-07-23 22:31:48 +00:00
Walter Korman 2572535f95 General updating per initial code review. Created EditableSceneView
to separate scene display from editing functionality.  Load and
initialize managers in a fashion that more appropriately hides the
implementation details.  Tidied comments up a bit.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@103 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-07-23 18:52:51 +00:00
Walter Korman ab7c437a35 Brought into the newly revamped world of contexts. Moved SwingUtil to
samskivert.  Added config values to specify the tileset manager and
scene manager.  Split miso and editor config into two separate
properties files.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@101 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-07-21 01:51:10 +00:00
Walter Korman 1fae8e43b1 Moved XMLUtil to com.samskivert.xml.XMLUtil.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@96 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-07-20 23:41:12 +00:00
Walter Korman db91329aff Moved tile edge length into IsoSceneView since it's specific to
rendering the tiles from an isometric perspective.  Added comments and
minor clean-up.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@88 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-07-20 08:17:10 +00:00
Walter Korman 3e82036691 Created XMLUtil to centralize our XML machinations and allow for
code-sharing between the tileset and scene XML antics.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@87 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-07-20 08:08:59 +00:00
Walter Korman 633eda4cfe Moved TileSetManager-specific methods from TileManager to TSM since
the editor is a special-purpose app and as such can reference the TSM
directly and save us from unnecessary TM -> TSM machinations.
Reference miso.properties in its new miso-specific location.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@83 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-07-20 02:23:34 +00:00
Walter Korman f91e1b41d1 Fixed up image loading to use the now-non-static ImageManager class.
Modified TileManager to store the height of a tile in the Tile
object's member data when the tile is initially created since we
would like to be able to reference it speedily.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@63 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-07-18 22:45:35 +00:00