Commit Graph

137 Commits

Author SHA1 Message Date
Michael Bayne cb9daa9f41 More serialization fun! Happy happy joy joy!
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2158 542714f4-19e9-0310-aa3c-eee0fc999fb1
2003-01-15 09:28:43 +00:00
Michael Bayne 8c831a0f9f Oh how I love to fiddle with the serialVersionUID.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2157 542714f4-19e9-0310-aa3c-eee0fc999fb1
2003-01-15 09:11:37 +00:00
Michael Bayne 01a3630493 Use the adjustment directly rather than going through the prefs.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2150 542714f4-19e9-0310-aa3c-eee0fc999fb1
2003-01-15 02:36:18 +00:00
Michael Bayne 43bc29afd8 Static variables go above static constants.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2149 542714f4-19e9-0310-aa3c-eee0fc999fb1
2003-01-15 02:31:50 +00:00
Michael Bayne 60a60d49ec Use runtime adjustments for our image and tile cache size.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2145 542714f4-19e9-0310-aa3c-eee0fc999fb1
2003-01-15 00:47:09 +00:00
Michael Bayne e38c4aaf80 Allow tilesets to be loaded in the background.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2139 542714f4-19e9-0310-aa3c-eee0fc999fb1
2003-01-14 02:52:04 +00:00
Michael Bayne 5a51f58bdd Go ahead and support primitive mirage loading so that the editor test tile
loader will work.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2131 542714f4-19e9-0310-aa3c-eee0fc999fb1
2003-01-14 00:23:19 +00:00
Michael Bayne 100aa3ace3 Major media subsystem revamp:
- All images are loaded through the image manager
- Architected to allow the use of prepared or unprepared images (and
  volatile images when the day comes that they support alpha)
- Tunable caches for images and tiles
- Resource manager caches unpacked resources on the filesystem
- Various and sundry other cleanups


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2116 542714f4-19e9-0310-aa3c-eee0fc999fb1
2003-01-13 22:49:47 +00:00
Walter Korman 4956ed66ae Added and commented out debug logging.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2110 542714f4-19e9-0310-aa3c-eee0fc999fb1
2003-01-12 01:19:58 +00:00
Walter Korman 3bf267fc26 Fixed javadoc typo.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2109 542714f4-19e9-0310-aa3c-eee0fc999fb1
2003-01-12 01:19:33 +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 14a313486b Documentation repairs.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1842 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-10-27 18:49:51 +00:00
Michael Bayne 3ec6f9301c Added a method for creating a uniform tileset that loads its source image
from a resource bundle.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1813 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-10-17 17:42:53 +00:00
Walter Korman efe514eb3b Not to use a double-semicolon.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1809 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-10-16 23:23:32 +00:00
Michael Bayne bb44fedab2 Have to force serialVersionUID to avoid DashO fuckage.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1792 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-10-09 00:23:51 +00:00
Michael Bayne 38000b062b These guys shouldn't be serialized.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1788 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-10-08 21:59:09 +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 4e9acda18d Sort the mappings prior to writing the map file to enhance map file
stability wrt diffing.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1756 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-09-26 02:08:47 +00:00
Michael Bayne f7e383d667 Terser toString().
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1740 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-09-23 21:52:43 +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 4d94555e09 Added a means for looking up tilesets by name (though you should know
which bundle they are in to avoid scanning the whole goddamned lot).


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1738 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-09-23 18:19:57 +00:00
Michael Bayne 234d7d6971 Removed crack pipe, inserted call to super.clone().
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1702 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-09-17 21:29:26 +00:00
Michael Bayne 80ac8a280f Whoops, need to be a bit more careful with the tile cache.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1701 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-09-17 21:17:15 +00:00
Michael Bayne a5bba441be An MFI implementation that obtains its source frames from a tileset.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1699 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-09-17 20:39:03 +00:00
Michael Bayne 3d9eb3edac Cache the tiles that have been fetched from this tileset.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1698 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-09-17 20:38:42 +00:00
Michael Bayne 1c753c5816 Catch and report image decoding errors when obtaining sub-image.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1683 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-09-13 20:27:05 +00:00
Michael Bayne 55e7bfcbb8 Report the bundle source file we're processing as we go.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1672 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-09-11 20:28:05 +00:00
Walter Korman b5fa4d945f Throw an informative exception if we fail to obtain a tile's image.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1670 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-09-11 19:17:55 +00:00
Walter Korman b3feaf0852 Catch and rethrow raster format exceptions to facilitate debugging tileset
trimming problems that are likely the result of a bad image file or
tileset description.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1668 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-09-09 20:26:52 +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 ef41daa34f Updated to reflect changes to resource manager.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1596 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-07-19 20:13:30 +00:00
Michael Bayne b45bfb9ad3 Removed pointless and incorrect hitTest() override.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1537 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-06-25 01:19:08 +00:00
Michael Bayne e2219ca3b0 Removed debug logging.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1529 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-06-21 20:16:34 +00:00
Michael Bayne d756fa50cd Trimmed objects! The weight loss program proceeds apace.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1528 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-06-21 18:53:13 +00:00
Michael Bayne 53ca4a30ce Whoops, -1 is not a good value for "invalid offset" because object tiles
may well have a -1 origin offset. We use Integer.MIN_VALUE now which is
definitely not going to be a valid value.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1527 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-06-21 18:52:36 +00:00
Michael Bayne 9ff74211d4 Obsolete.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1526 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-06-21 18:44:50 +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 73ee48bc3f Provide access to our trimmed bounds.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1499 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-06-19 23:28:14 +00:00
Michael Bayne fcc65fc4d9 A utility class for generating a trimmed tileset (and associated trimmed
image) from some other (presumably non-trimmed) tileset.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1489 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-06-19 08:29:59 +00:00
Michael Bayne 2c50a44608 Formatting fix.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1488 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-06-19 08:28:55 +00:00
Michael Bayne 38584bb12e Switch to using a subimage instead of clipping because clipping creates
too much garbage.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1487 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-06-19 08:28:25 +00:00
Michael Bayne 1b6811d221 Tileset -> TileSet.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1486 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-06-19 08:27:35 +00:00
Michael Bayne 5214d15ac6 Tileset => TileSet; made getTileSetImage() public so that the trimming
code can get to the underlying tileset image.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1485 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-06-19 08:27:06 +00:00
Michael Bayne 2c9be83574 Moved subimage creation into overridable method.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1484 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-06-19 08:26:22 +00:00
Michael Bayne e91b6420b1 Go ahead and return our cached subimage since we have it.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1479 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-06-19 00:20:49 +00:00
Michael Bayne 4b29f806df We've discovered that setting the clipping rectangle generates a crapload
of rectangle objects. Thus rendering hundreds of tiles each frame has an
"undesirable" impact on garbage collection. I think Walter and I were
seeing something like 400k per second of garbage. So we're back to
extracting a subimage, which we're pretty sure doesn't copy the image
data, but simply draws the cropped image data directly from the original
rasters without creating shitloads of garbage.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1474 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-06-18 22:19:56 +00:00
Michael Bayne 1b3b5bb794 Wrote tools to ease the process of renaming tilesets.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1421 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-06-04 02:50:02 +00:00
Ray Greenwell 9a55ae3989 oops: removed leftover debugging
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1363 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-05-16 01:53:36 +00:00