Commit Graph

129 Commits

Author SHA1 Message Date
Michael Bayne 6ab0215ea3 Created a prefs repository for the cast stuff; use a runtime adjustment to
obtain our cache size.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2151 542714f4-19e9-0310-aa3c-eee0fc999fb1
2003-01-15 02:36:59 +00:00
Michael Bayne 4e796ad5b1 Go back to having BundleUtil return null rather than throwing FNF.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2132 542714f4-19e9-0310-aa3c-eee0fc999fb1
2003-01-14 00:36:14 +00:00
Michael Bayne d88a358f39 We need to composite our action frames because it's possible that during
our tick we'll do something that invalidates our existing frames and we
need to composite the new ones in paint().


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2127 542714f4-19e9-0310-aa3c-eee0fc999fb1
2003-01-13 23:54:19 +00:00
Michael Bayne a34a0eb1a5 Use bitmask transparency for composited character sprites.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2125 542714f4-19e9-0310-aa3c-eee0fc999fb1
2003-01-13 23:53:04 +00:00
Michael Bayne 5c055d21a6 Revamped to support new media architecture. Added tunability to in-memory
action cache.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2118 542714f4-19e9-0310-aa3c-eee0fc999fb1
2003-01-13 22:53:04 +00:00
Michael Bayne 1ce6951cb6 Repackaged a few things in media: sounds stuff went into media.sound and
image stuff went into media.image.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2100 542714f4-19e9-0310-aa3c-eee0fc999fb1
2003-01-08 04:09:03 +00:00
Michael Bayne ab915c9633 Close our input stream when we're done with it.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2099 542714f4-19e9-0310-aa3c-eee0fc999fb1
2003-01-07 07:55:58 +00:00
Michael Bayne 6bde1765d1 Don't rebuild our component bundles if they're not out of date.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2097 542714f4-19e9-0310-aa3c-eee0fc999fb1
2003-01-07 00:59:21 +00:00
Michael Bayne a8fc75ca27 Freak out in an orderly and informative manner rather than NPEing if we go
to composite a set of action frames and one of the character components
has no individual action frames for the requested action.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2090 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-12-23 20:33:19 +00:00
Michael Bayne 2fe2311e06 We override serialVersionUID in ComponentClass so we may as well do it in
PriorityOverride as well.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2074 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-12-19 21:44:12 +00:00
Michael Bayne 6b273dbf0a Finished up custom render order support.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2070 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-12-16 03:08:39 +00:00
Walter Korman acaf39b070 Estimate memory usage in bytes rather than pixel area, assuming an int per
pixel for now.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2034 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-12-07 02:04:32 +00:00
Walter Korman ea545bcb66 Log the size of the cache along with its efficiency.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2033 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-12-07 01:10:25 +00:00
Michael Bayne 1558a6ec57 Throttle our action cache performance reports to once every 30 seconds.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2030 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-12-07 00:49:36 +00:00
Walter Korman 6552b5bd8b Include the timestamp associated with sprite events in the event.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2020 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-12-04 02:45:09 +00:00
Michael Bayne b7b3e02260 Beginnings of support for render order overrides. I'll get back to working
on this some day.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1969 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-11-20 02:21:10 +00:00
Michael Bayne 7f71748537 Added support for "decorations" which are painted in addition to the
character image when painting a character sprite.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1961 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-11-19 00:23:46 +00:00
Walter Korman 5d7123caab Deal gracefully with having no component classes or actions.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1817 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-10-18 23:47:27 +00:00
Ray Greenwell c69bfc2ca3 use our LRU cache, report stats in debug.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1815 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-10-18 01:32:23 +00:00
Ray Greenwell be2bc4205b Anally removed Comparator.equals() implementations that overrode
Object.equals() with equivalent functionality.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1799 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-10-15 21:01:39 +00:00
Michael Bayne 6fe29a85af Allow colorizations to be modified in a character descriptor.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1785 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-10-07 23:58:29 +00:00
Michael Bayne 59c522aae5 Updated deprecated references to project.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1759 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-09-27 19:02:15 +00:00
Michael Bayne 3ed25c9bce Sort the damned component map prior to writing it out so that additions
are easy to see in a CVS diff.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1755 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-09-26 02:05:59 +00:00
Michael Bayne 82cd152a6f Modified map file serialization to store things in text so that we can
easily see what the mappings are and properly diff mappings that are
checked into CVS.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1739 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-09-23 18:53:01 +00:00
Michael Bayne 7f64ab9007 Report Java serialization leg-not-feely business.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1700 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-09-17 21:05:35 +00:00
Michael Bayne 380fa50610 Moved MultiFrameImage and friends from media.sprite into media.util
because they'll be used for both sprites and animations.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1692 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-09-17 19:11:13 +00:00
Michael Bayne 84cc48b2a0 Report the bundle we're generating (still not excellent progress
reporting, but better than none at all).


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1674 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-09-12 21:11:16 +00:00
Michael Bayne 442e9b26bd Not to freak out completely if we encounter an error trimming a tileset
image.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1671 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-09-11 19:31:40 +00:00
Michael Bayne 11d84452bb Whoops. Need the right modifiers.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1651 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-08-19 22:58:15 +00:00
Michael Bayne 4cbd454b24 Added serialVersionUID to the various classes we serialize for
configuration reasons to avoid annoying "recompile and nothing works"
phenomenon. We'll opt for the "make incompatible class change and nothing
works" scenario instead.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1650 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-08-19 22:28:05 +00:00
Walter Korman 60594e5499 Demoted log message to debug.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1640 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-08-13 23:09:25 +00:00
Michael Bayne 22b001eb73 Added support for falling back to a "default" action image for components
that do not have an image specificly for a particular action sequence. In
the future, I'd like to at least provide a mechanism for specifying on a
per action sequence basis which action sequence to fall back to in the
event that a component is missing imagery for that sequence. Then the
default mecahism could be used without forcing all action sequences for a
particular class of components to be exactly alike.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1614 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-07-24 22:24:05 +00:00
Michael Bayne be8b5ea243 Make the default orientation SOUTHWEST since that's orientation zero and
if we have no other orientations then to request anything but orientation
zero causes things to freak out. (This will be fixed but it's going to
require a fair bit of work that I don't have time to do right now.)


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1613 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-07-24 22:19:50 +00:00
Michael Bayne e75ae89f22 Various and sundry modifications to clean up orientation handling and add
support for 16 orientations in situations where it is merited.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1548 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-06-26 23:53:07 +00:00
Michael Bayne 4357c047f3 Trimmed tileset takes care of setting up its name, but the image path must
be set by the caller.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1525 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-06-21 18:44:28 +00:00
Michael Bayne c3c08a03b3 Refactored the tileset trimming code so that it can more easily be reused
to trim object tilesets.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1524 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-06-21 18:09:37 +00:00
Michael Bayne 1f80cf9805 Cleaned up some sprite business: better documented various things, changed
local member names to reflect their actual functionality, flipped the sign
of the origin offset so that it's an offset rather than a negative offset.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1512 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-06-20 21:42:53 +00:00
Michael Bayne 29cd8ec051 Sanity check the sources we're passed for compositing.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1511 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-06-20 18:31:03 +00:00
Michael Bayne 0ddf11ab57 Major revampage to support composited actions that create images that are
exactly big enough to accomodate all of their trimmed components and no
bigger.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1501 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-06-19 23:31:57 +00:00
Michael Bayne 5a98d450a1 Cleaned up; don't attempt to edit classes with no components; no need to
use the FrameManager and MediaPanel for displaying sprites since we're not
doing things properly anyway (properly meaning using a sprite manager and
all the associated business).


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1497 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-06-19 23:24:04 +00:00
Michael Bayne 33158f5e8a Component bundling process now automatically generates trimmed tilesets
and images from the untrimmed source tilesets and images.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1490 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-06-19 08:33:14 +00:00
Walter Korman 1f32380f62 Descriptors are inequal if one has colorizations and the other doesn't.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1471 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-06-18 04:55:44 +00:00
Walter Korman 830364c48d Increased the frame action cache size to 30 for now. We'll likely want to
allow setting this externally in the near future, but we'll iron that out
later when we get around to scrutinizing all of the caching business more
closely.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1462 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-06-14 21:15:31 +00:00
Ray Greenwell 7ffa3087e1 Don't switch to a rest action if null is returned by getRestingAction()
(used now in YoCharacterSprite)


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1444 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-06-12 07:00:49 +00:00
Michael Bayne ccbc47a7de Separated path code from sprite code so that we can have other things
follow a path (specifically, I want to allow the media panel to be
"scrolled" along a path).


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1409 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-05-31 03:38:03 +00:00
Michael Bayne 7c4f86e63a pathBeginning() and pathCompleted() need to be public so that we can
create paths outside the media.sprite package.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1407 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-05-29 23:27:14 +00:00
Michael Bayne a52d62d532 Modified ActionFrames because having it implement MultiFrameImage and just
"remember" which orientation it should be doing was not working out
because multiple sprites can share the same action frames and they would
step on one anothers' toes.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1360 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-05-15 23:54:05 +00:00
Michael Bayne 181fa3269d Only update ourselves in halt() if we actually stopped something.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1342 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-05-06 23:24:15 +00:00
Michael Bayne 99c4330646 The vast and the sweeping. Modified the tile framework such that tiles no
longer provide access to their underlying image (they actually still do,
but not in the normal course of affairs). This will allow us to use
"trimmed" tiles which are trimmed to the smallest rectangle that contains
the non-transparent pixels in a tile image, which will shrink up our
components and other tiles a great deal.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1339 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-05-06 18:08:32 +00:00
Michael Bayne 37a1167fb5 Revamped component action animation support so that we're not passing
around arrays of multi-frame images but instead pass around one object
that knows how to render any action frame in any orientation. This
apparently fixed some horrible bug that we had introduced in doing JITC
and now the whole thing is super fast, just like I always thought it would
be. Once we introduce trimmed images, it will blaze!


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1336 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-05-04 19:38:14 +00:00