Commit Graph

212 Commits

Author SHA1 Message Date
Michael Bayne 50012b1cd1 Only rewrite out the tileset map if it has changed.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1180 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-04-03 22:42:22 +00:00
Michael Bayne 5d55a29da4 Generate the name of the bundle.jar file from the bundle description file
so that we can generate a whole set of bundles in a directory tree in one
fell swoop.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1177 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-04-03 22:21:35 +00:00
Michael Bayne f495557624 Report the file on which we choked when we choke.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1176 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-04-03 22:20:50 +00:00
Michael Bayne 507920843d Added method for checking to see if a tileset is mapped to an id.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1175 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-04-03 22:03:23 +00:00
Michael Bayne 4110fb82c4 Validate gapSize and offsetPos arrays before trying to use them.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1170 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-04-01 22:53:39 +00:00
Michael Bayne 4afaa186eb Track some repackaging in the Jakarta libs.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1168 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-04-01 16:49:26 +00:00
Michael Bayne bf9a2ca151 Added methods to allow parsing from a file or directly from an input
stream.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1165 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-03-28 00:56:20 +00:00
Michael Bayne be1ef2c1a2 Allow specification of fps in floating point.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1162 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-03-27 21:51:15 +00:00
Ray Greenwell 1a53da6727 Formatting changes:
- removed tabs
- explicitly specify imports
- I made each comment a complete and punctuated sentance.
- other minor convention changes


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1155 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-03-26 23:35:02 +00:00
Ray Greenwell aca95b8540 Store object tiles in HashIntMaps instead of in arrays because they may
have coordinates outside of the normal scene coordinates.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1150 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-03-26 20:17:51 +00:00
Ray Greenwell 5f42e8d304 Color utility methods.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1149 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-03-26 20:09:43 +00:00
Walter Korman 76cff072be Split Sprite into Sprite and ImageSprite. Added LabelSprite. Cleaned up
directional constant usage.  Added ability to render sprites in two
distinct layers.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1132 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-03-16 03:15:06 +00:00
Walter Korman 8e93dbfc79 Added convenience constructor and cleaned up constant usage.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1131 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-03-16 03:12:12 +00:00
Walter Korman b3eebe2081 Added ability to render animations in two distinct layers; added mechanism
whereby animations can clean up after themselves.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1130 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-03-16 03:11:23 +00:00
Walter Korman 9c54e55fde Fixed typo that broke the build. Egads!
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1120 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-03-14 21:09:01 +00:00
Walter Korman 84c0bd70cd Add a copy of the bounds rectangle when invalidated since it may be
destructively modified by the animation manager.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1118 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-03-12 22:54:16 +00:00
Michael Bayne 2b70821be2 Use integer ids rather than names.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1114 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-03-10 22:30:46 +00:00
Michael Bayne d5c89b3822 Provide a mechanism for getting the root color adjusted by the
colorization offsets.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1109 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-03-08 21:16:07 +00:00
Michael Bayne 78f6342dbd Revamped the recoloration code such that it is much more efficient.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1108 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-03-08 21:05:01 +00:00
Michael Bayne eee84b9a84 Added loadImage(InputStream).
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1104 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-03-08 09:34:42 +00:00
Michael Bayne 782bd9b7d9 Added support for colorization to the character manager. It is yet
untested.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1102 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-03-08 07:50:32 +00:00
Michael Bayne 87c4c756e4 Pass a color rather than an integer to the recoloration routine.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1100 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-03-08 01:38:12 +00:00
Michael Bayne ad5a5c4e6d Added (and commented out) some handy debug logging.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1099 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-03-08 01:37:51 +00:00
Michael Bayne 22d0839b72 Not to freak out if we have no frames.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1083 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-03-04 22:47:06 +00:00
Michael Bayne 3dbf935e3a Render all sprites that intersect the repaint bounds, not just the ones
that are contained within the bounds.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1081 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-02-28 23:25:15 +00:00
Michael Bayne 7729f290be Wrote a handy little tool for fiddling with the image recoloring routines.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1071 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-02-25 07:28:34 +00:00
Michael Bayne dc1969ec84 Added a method for recoloring images. It requires that the images be
indexed color and it converts colors that are close to a target color in
the HSV color space (with specifiable bounds on difference in hue,
saturation and value) to new colors (with specifiable offsets for hue,
saturation and value). Initial testing shows great promise for articles of
clothing and even reasonable results on skin tones.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1069 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-02-25 07:14:56 +00:00
Michael Bayne 9e5937ffea Added mechanism for loading images directly, without converting them to a
format optimized for display.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1068 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-02-24 19:26:26 +00:00
Michael Bayne 4641d00583 Moved ImageUtil into media.util with the rest of the util classes.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1067 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-02-24 02:20:44 +00:00
Michael Bayne 137e9e9ea8 Revampola! Moved the code that handles viewport offset into the animated
panel; restructured things so everyone deals with "view" coordinates
rather than screen coordinates and the animated panel takes care of doing
the final translation before rendering.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1065 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-02-21 06:01:29 +00:00
Michael Bayne 2e6c813bd6 Pass the current time stamp to viewWillScroll().
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1063 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-02-21 00:20:22 +00:00
Michael Bayne fec59f61a8 Dirty the old frame bounds and the new frame bounds when our frame image
is replaced.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1061 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-02-20 03:13:57 +00:00
Michael Bayne d869e1168e Let our sprite manager know when we scroll; modified the rendering such
that scrolled views are copied to the display in their entirety instead of
just updating the dirtied regions (because we can't scroll the visible
screen buffer and then paint on top of it because the user will see things
in an intermediate stage).


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1046 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-02-19 19:56:49 +00:00
Michael Bayne ee3532f6f1 Added mechanism by which the sprite manager can be informed that the view
on which its sprites are rendered was scrolled so that it can generate the
appropriate dirty rectangles or update its sprite's positions.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1045 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-02-19 19:55:14 +00:00
Michael Bayne 958cb213d5 Blarg. Have to tell the sprite manager about the viewport offset when
we're using it to render sprites into a view that is being displayed in a
viewport that is smaller than the actual size of the view. Oh the
jockeying.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1041 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-02-19 07:41:36 +00:00
Michael Bayne 3e68fd8994 Clear out our back buffer when we're validated (as we probably changed
sizes).


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1037 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-02-19 07:19:04 +00:00
Michael Bayne 7db44c5ee3 Let the animated panel handle invalidating the regions exposed by
scrolling so that it can do so with the actual dimensions of the panel
(the scene view only knows how big its model wants to be). Changed
scrollView to viewWillScroll to more accurately reflect what's going on.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1036 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-02-19 05:03:17 +00:00
Michael Bayne f2f6407c1e Need to account for negative scrolling deltas.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1034 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-02-19 04:45:14 +00:00
Michael Bayne fc58eec429 Whoops, missed a change.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1032 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-02-19 03:58:37 +00:00
Michael Bayne 9b9211de16 Use a SortableArrayList instead of going for object creation mania every
time we sort the sprite list.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1031 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-02-19 03:57:53 +00:00
Michael Bayne a6f63ee873 Need to set the absolute value of the velocity.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1030 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-02-19 03:57:30 +00:00
Michael Bayne 3125782a15 Modifications to get scrolling working again. It's a bit smoother, but
we can do better.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1026 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-02-19 01:42:28 +00:00
Michael Bayne 63a32a6332 Modified rendering to use a hand managed volatile image as a back buffer
instead of using a buffer strategy. This will shortly be extended to
support more efficient scrolling as well.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1021 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-02-19 01:23:56 +00:00
Michael Bayne 06f9ac0c31 Disable scrolling when speed is set to zero mspp.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1019 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-02-18 06:05:59 +00:00
Michael Bayne fbc39605e7 Enhancements to support scrolling.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1011 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-02-17 23:40:43 +00:00
Michael Bayne b1109c8370 The animated view is now passed its invalid rect count in
paintImmediately() so that it can figure out if it's being painted solely
to facilitate scrolling or because there are dirty regions.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1010 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-02-17 23:39:32 +00:00
Michael Bayne 7c5e5dbce9 Added support for animated views that scroll. The animation manager
attempts to tune its refresh interval to one that allows the animated view
to scroll in even pixel counts each time through the render loop.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1009 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-02-17 23:38:18 +00:00
Michael Bayne 8db0bce2a7 Removed warning message because this is a normal occurrence.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1003 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-02-17 07:13:59 +00:00
Michael Bayne a00e7e5214 Automatically create a SpriteManager unless otherwise instructed; added
methods for starting and stopping the animation manager associated with an
animated panel.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@995 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-02-13 18:48:56 +00:00
Michael Bayne 0f47b72787 Repackaging! Changed a bunch of foo.tools.bar to foo.bar.tools and brought
some other things up to date with changes that had been made to that
effect previously. I love the vast sweeping changes that come along with a
change of mind.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@933 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-02-05 20:29:10 +00:00