Commit Graph

513 Commits

Author SHA1 Message Date
Walter Korman 1e1b5e1d4a Rejiggered the iso scene rendering yet again to address objects in the
scene that may partition two items, and to address the lack of a proper
total ordering of dirty items in the non-partitioned comparison case.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@792 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-12-16 05:42:16 +00:00
Michael Bayne 37b9ff1d20 Added getScreenCoords(), invalidateRect().
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@785 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-12-15 04:20:55 +00:00
Walter Korman b00fdc6ab5 Use String.valueOf(int) to convert int to string.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@782 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-12-14 23:31:04 +00:00
Michael Bayne 54b02ad1ff Not to freak out if we have no scene.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@760 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-12-12 19:53:11 +00:00
Michael Bayne 3af0d8b1ee Added support for cloning scene models (we love doing multiple inheritance
by hand!).


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@754 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-12-12 02:47:17 +00:00
Michael Bayne f1b92df3d1 Disected and reassembled things so that a miso scene can be constructed
without a tile manager, which can be provided later, at which point all of
the tiles will be resolved. Also made it possible to replace the model in
a partially constructed scene. How's that for a turn of phrase: partially
constructed scene. Wheee!


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@743 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-12-05 07:29:06 +00:00
Michael Bayne 7d108a256f Serialization jockeying.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@720 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-11-30 21:54:34 +00:00
Michael Bayne e3c84e212f Ok. Now we've *really* got the x,y vs. col,row business sorted out.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@715 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-11-29 23:35:59 +00:00
Michael Bayne 7ce8846420 If we're showing coordinates, also outline the tiles.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@714 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-11-29 23:35:37 +00:00
Michael Bayne d2dff11867 Fixed x,y vs. col,row thing once and for all. Also cleaned up object tile
footprint setting.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@711 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-11-29 23:08:28 +00:00
Michael Bayne fbc7d15066 Tileset validation stuff.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@701 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-11-29 21:58:49 +00:00
Michael Bayne 2c8dae0570 Wrote a simple miso scene parser.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@690 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-11-29 20:34:13 +00:00
Michael Bayne e5c3967f9a Changed _scenemodel to _viewmodel.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@688 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-11-29 20:33:16 +00:00
Michael Bayne baf655620e Made setPrefix() and ditched constructor.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@678 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-11-29 19:31:12 +00:00
Michael Bayne 455062779d Was populating the display scene from the model incorrectly.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@677 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-11-29 19:30:51 +00:00
Michael Bayne 6bbce232b4 Implemented and/or cleaned up the XML scene writers.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@675 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-11-29 06:36:29 +00:00
Michael Bayne 04be7dafec Yet more MisoUtil pruning.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@670 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-11-29 00:19:03 +00:00
Michael Bayne e693afa130 Made the ruleset actually do the right thing.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@669 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-11-29 00:18:33 +00:00
Michael Bayne d666b38394 Changed getModel() to getMisoSceneModel() to jive with similar methods in
other model classes; was passing tile coordinates backwards to tile layer
objects.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@668 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-11-29 00:18:15 +00:00
Michael Bayne 538bd697a5 Was using old method signature; added toString().
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@667 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-11-29 00:17:32 +00:00
Michael Bayne b94c5d691c Added toString() and a means by which to create a blank miso scene model.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@666 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-11-29 00:17:14 +00:00
Michael Bayne 0a5f5794e8 Fixed packages.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@655 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-11-28 01:13:13 +00:00
Michael Bayne 2ad3f03a34 Changed MisoTile to BaseTile.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@654 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-11-27 22:17:42 +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 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 d35f2894c1 Phase one of the scene refactoring (which will set the stage for all
manner of happiness and joy).


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@615 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-11-12 20:56:56 +00:00
Michael Bayne 6278a8fd1f No longer need the _root directory.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@612 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-11-08 18:36:56 +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 bd998aff3d Added getImageManager() to the miso context.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@586 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-11-02 03:09:10 +00:00
Walter Korman 1a3ed6e45a Renamed XMLFile* classes to just XML*.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@585 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-11-02 02:52:16 +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 3ea91cdfdd More work on character components.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@579 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-10-30 16:16:01 +00:00
Walter Korman 933a427b68 Render scene tile layers inclusive of the fringe layer.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@578 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-10-27 01:37:37 +00:00
Michael Bayne b632510cb1 Javadoc edits.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@576 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-10-26 01:40:22 +00:00
Walter Korman d102a47f13 Abstracted character-sprite-related activity to the cast package in
preparation for character component compositing and other
character-related antics.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@575 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-10-26 01:17:22 +00:00
Walter Korman 95d6896ef7 Altered character animations to separate standing image from walking
animation images.  Created and made use of basic single- and
multi-image implementations of the MultiFrameImage interface.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@559 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-10-25 18:06:17 +00:00
Walter Korman 4b58a696ca Added the ability to specify one portal in a scene as the "default
entrance."  The default entrance is specially highlighted in the scene
and can be read from and written to XML scene description files.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@558 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-10-25 16:36:43 +00:00
Walter Korman 63a822862d Explicitly check to make sure two dirty items occupying the same tile
are sprites since that's what we're actually expecting.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@557 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-10-25 16:35:45 +00:00
Walter Korman c9535eca02 Simplified dirty item render sorting. General clean-up and comments.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@554 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-10-25 01:42:49 +00:00
Walter Korman 092d96509e We can't merge dirty rectangles for each dirty item when rendering
into a single rectangle, since doing so may cause new areas to be
dirtied that impact portions of other sprites or objects that won't
get properly redrawn.  Sigh.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@550 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-10-24 01:33:47 +00:00
Walter Korman c839b61548 More polishing work on scene rendering.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@543 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-10-24 00:55:08 +00:00
Walter Korman 64ed794d3d Removed unnecessary clipping.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@526 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-10-23 02:04:07 +00:00
Michael Bayne dc0df5bdf8 Javadoc updates.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@520 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-10-22 23:56:01 +00:00
Walter Korman c6a2a488d4 Don't allow diagonal steps that are impeded by an impassable tile.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@518 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-10-22 21:32:13 +00:00
Walter Korman c7d26cea8e Fixed scene rendering issues and improved performance.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@517 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-10-22 18:21:42 +00:00
Walter Korman ef97b42acd Revamped iso scene rendering yet again to remove unnecessary dirty
rectangle propagation and to only render the dirty portions of dirty
objects and sprites.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@509 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-10-19 23:26:31 +00:00
Walter Korman 69dd36f101 Created iso scene view model listener to handle modifications to the
scene view model more elegantly.  Updated editor and scene view panel
to make use of said listener.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@499 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-10-18 21:01:44 +00:00
Walter Korman bcae50aa08 Render the placing tile to facilitate proper tile placement. Fixed up
tile highlighting accordingly on tile deletion and location actions.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@495 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-10-18 20:25:46 +00:00