Commit Graph

513 Commits

Author SHA1 Message Date
Walter Korman 511f2e13ee Fixed bug in checking whether two objects overlap horizontally.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@494 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-10-18 20:24:05 +00:00
Walter Korman bed0a2facb Invalidate objects, and any tiles, sprites or objects impacted by an
object's dirty rectangle, when invalidating dirty rectangles.
Commented out verbose logging.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@484 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-10-17 23:39:06 +00:00
Walter Korman 1a1eda672d Store and make available the parent object associated with the shadow
tile.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@480 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-10-17 22:22:03 +00:00
Walter Korman 2ecd879692 More work on object placement, removal, and rendering within scenes.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@479 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-10-17 22:21:22 +00:00
Walter Korman b0a8f3b6fc Write the default scene tile in lieu of shadow tiles since shadow
tiles will be re-generated when the object footprint is stamped on
scene un-serialization.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@478 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-10-17 22:18:22 +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 3773da79a6 More work on object tiles. Revamped isometric scene rendering to
gather dirty sprites and objects and render after base and fringe tile
layers.  Add shadow tiles in the footprint of objects to make them
impassable.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@460 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-10-13 01:08:59 +00:00
Walter Korman ccc182e6f7 Modified to account for generic List objects returned by the
TileSetParser interface.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@451 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-10-12 16:38:59 +00:00
Walter Korman 15eca5d163 Made MisoTileSet an interface.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@449 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-10-12 00:43:04 +00:00
Walter Korman 6638380a4d More work on object tiles.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@448 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-10-12 00:42:08 +00:00
Walter Korman 915e13ca12 Make sure screen coordinates that are converted to tile and full
coordinates when editing a scene are valid before forging ahead with
scene modifications.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@436 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-10-11 16:21:09 +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 09ef3cd972 Decoupled MISO from Whirled. They now exist in a form that can be easily
combined in a game that wishes to use both of them, but MISO no longer
extends Whirled's Scene interfaces.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@400 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-10-05 23:58:36 +00:00
Michael Bayne e5849ab0b6 Added ability to set scene id and version to EditableScene.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@356 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-09-28 01:46:10 +00:00
Michael Bayne cdaea4bbab Waffle waffle. Changed MisoScene back to returning lists rather than
arrays for locations, portals and clusters.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@355 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-09-28 01:31:32 +00:00
Michael Bayne b567223419 Added an id member which will be used to track the location's unique
identifier. (We'll need to be able to look locations up by id.)


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@354 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-09-28 01:25:26 +00:00
Michael Bayne b22ccb7b71 Return a List rather than an ArrayList.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@353 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-09-28 01:24:54 +00:00
Michael Bayne 2fb833fd5b Serious scene surgery.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@344 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-09-21 02:30:35 +00:00
Michael Bayne 7c96663f44 Minor scene changes.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@342 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-09-21 00:21:40 +00:00
Michael Bayne 780e39d4e9 Modified animation manager to provide a timestamp with every tick.
Modified sprite and path code to make use of these timestamps to determine
a sprite's progress along the path. Abstracted the path stuff so that
paths other than line segment paths can be cleanly implemented.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@337 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-09-13 19:10:26 +00:00
Walter Korman 87de9dc3ea Renamed method for retrieving images associated with ambulatory
sprites for increased specificity and modified comment accordingly.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@328 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-09-05 00:44:37 +00:00
Walter Korman 379b9f6e4c Created SelectableButton to allow highlighting a JButton when selected
without having to create a selected icon.  Changed editor and scene
map panel toolbars to make use of SelectableButton.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@322 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-08-30 01:15:19 +00:00
Walter Korman 528e32b22e Removed now-unnecessary scene view model accessors and simplified
set-up and precalculating of view model data.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@320 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-08-29 20:07:54 +00:00
Walter Korman a7c639ffe0 Modified MisoScene and related classes to obtain the scene tile
dimensions from the scene view data model.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@319 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-08-29 19:50:46 +00:00
Walter Korman 8c7efb79fe Made iso scene view configuration part of the miso properties file.
Standardized config key member data names to match those used in the
cocktail code.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@318 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-08-29 18:41:46 +00:00
Walter Korman 19b05150db Use a unique node identifier rather than hashCode() so that paths are
deterministic.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@312 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-08-23 00:55:30 +00:00
Walter Korman f15738ca20 Modified the animation manager to monitor the ancestor events
associated with the animated view's component so that the refresh
interval can be registered and unregistered based on component
visibility.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@311 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-08-23 00:23:58 +00:00
Michael Bayne c2fd4ed6c3 Modified sprite management so that if in the course of processing its
dirty rectangles, an animated view has to expand the dirty region, it can
call back to the sprite manager to determine whether this new, expanded
dirty region includes sprites that weren't previously considered to be
dirty. If so, those sprites' rendered bounds are added to the dirty
rectangle list being processed so that they will be properly redrawn
(which may trigger more sprites to be included and so on).

Also modified sprite internals in a cleany uppy sort of way.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@309 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-08-22 02:14:57 +00:00
Michael Bayne 8aed4795e1 Modified sprite to use iterator rather than enumerator. Made x and y
members protected and provided accessors. Added toString() to Path.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@300 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-08-21 21:18:42 +00:00
Michael Bayne 7f49cfb35a Removed vestigal code.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@299 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-08-21 21:18:21 +00:00
Michael Bayne eb13ed5cc1 Modified the animation interface not to take a target component and an
animated view, but to combine those so that the animated view provides the
necessary means by which to invalidate and paint. Now the SceneViewPanel
rather than the SceneView is what the animation manager talks to. It then
passes the necessary information on to the SceneView.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@297 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-08-21 20:02:39 +00:00
Walter Korman 56c48c011f Fixed minor bugs in failed attempts to resolve portal bindings. Check
and report errors when attempting to bind entrance portal.
Sanity-check portals in all scenes in the group after bindings are
resolved and report warnings for any still-unbound portals.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@286 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-08-21 01:15:16 +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 5780e57dcf More work on loading scene groups.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@272 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-08-16 22:05:01 +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 a99829818f Changed exit to portal. Limit tile bounds to something reasonable
when invalidating the scene view.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@270 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-08-16 18:05:17 +00:00
Walter Korman cff9a1fbef Renamed IsoSceneModel to IsoSceneViewModel to reflect reality.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@261 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-08-15 22:16:43 +00:00
Walter Korman affc3e82b7 Fixed up path-finding, path-following, and tile coordinate drawing.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@260 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-08-15 22:06:21 +00:00
Walter Korman c701da25e4 Fixed initial minor bugs in path-finding.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@256 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-08-15 03:13: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
Michael Bayne ce7869c279 Change the way we instantiate the resource manager.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@254 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-08-15 02:13:51 +00:00
Michael Bayne a84eadb351 Use File.separator rather than fetching the system property ourself.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@253 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-08-15 02:13:36 +00:00
Michael Bayne 2cbed37cac Whirled Scene ids are ints. Need to bust the upgrade from shorts.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@250 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-08-15 01:10:09 +00:00
Michael Bayne a07f5d4d13 Changed Scene to MisoScene. Made MisoScene implement Whirled's Scene
interface.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@249 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-08-15 01:08:49 +00:00
Michael Bayne 8d017e268f Because only the editor and viewer even care about the scene repository,
we're eliminating the concept entirely from the MISO runtime stuff and
having the editor and viewer just talk directly to the XML file scene
repository.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@247 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-08-15 00:10:59 +00:00
Michael Bayne d26dc0372e Helped the scene manager to depart from the scene. The viewer and editor
applications really need to deal directly with the scene repository. The
display part of the MISO code doesn't need a scene manager, per se,
because it is simply told to visualize a particular scene and scene
management happens entirely externally. This is in preparation for making
the MISO code work and place nicely with the Whirled code.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@246 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-08-15 00:00:52 +00:00
Michael Bayne 3eea4dcaad Moved sprite stuff into media package, removed coupling between miso stuff
and sprite stuff by added some interfaces in the sprite stuff and
implementing them with the miso stuff.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@245 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-08-14 23:35:22 +00:00
Walter Korman 1502dcaa06 Moved scene util classes into a separate package.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@243 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-08-14 21:29:40 +00:00