Commit Graph

173 Commits

Author SHA1 Message Date
Michael Bayne 55e84b0ae4 We can use the raw image here because we only use its dimensions.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2532 542714f4-19e9-0310-aa3c-eee0fc999fb1
2003-05-02 23:32:56 +00:00
Michael Bayne 1694881ac2 We can use the raw images here because we're just processing them into
other raw images.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2531 542714f4-19e9-0310-aa3c-eee0fc999fb1
2003-05-02 23:32:37 +00:00
Michael Bayne 77cd7f7efe Renamed the methods that return raw tile images and added fat warnings not
to use these unless you're doing low-level image processing and will
eventually stuff the data into a prepared image.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2530 542714f4-19e9-0310-aa3c-eee0fc999fb1
2003-05-02 23:32:10 +00:00
Michael Bayne 72768a3a9e More synchronization is needed! The dangers of multithreaded programming.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2485 542714f4-19e9-0310-aa3c-eee0fc999fb1
2003-04-28 17:38:06 +00:00
Michael Bayne 5c03adbb72 Added support for temporarily disabling image and tile cache flushing.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2483 542714f4-19e9-0310-aa3c-eee0fc999fb1
2003-04-27 07:33:15 +00:00
Michael Bayne 21889f5a9e Trimmed tilesets are all fast. This should ensure that it's possible to
save the tileset image in fast format before doing so because the set of
formats for which we support trimming is slightly larger than those for
which we support saving in fast format. We don't use such formats
presently, so I'll temporarily punt.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2480 542714f4-19e9-0310-aa3c-eee0fc999fb1
2003-04-27 06:38:15 +00:00
Michael Bayne b84f62e35d If our image has been converted to fast format; load it up fast and propah!
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2478 542714f4-19e9-0310-aa3c-eee0fc999fb1
2003-04-27 06:35:09 +00:00
Michael Bayne cab6cfb131 Convert images to "fast" images if possible. Also fixed a bug where it
wasn't cleaning up properly if it failed to generate a bundle. Plus the
error reporting is all much better.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2477 542714f4-19e9-0310-aa3c-eee0fc999fb1
2003-04-27 06:34:43 +00:00
Michael Bayne 65106d8815 Generate better error messages if we fail.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2476 542714f4-19e9-0310-aa3c-eee0fc999fb1
2003-04-27 06:33:40 +00:00
Michael Bayne 2051770c91 Synchronize access to the tile cache so that we can load tiles on other
threads.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2460 542714f4-19e9-0310-aa3c-eee0fc999fb1
2003-04-25 18:21:49 +00:00
Michael Bayne 34528419a0 We'll be needin' to use them tileset global colorizations if we got 'em.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2377 542714f4-19e9-0310-aa3c-eee0fc999fb1
2003-04-05 01:52:58 +00:00
Michael Bayne ad266a629e Added ability to fetch a tileset with specific colorizations.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2375 542714f4-19e9-0310-aa3c-eee0fc999fb1
2003-04-04 19:36:21 +00:00
Michael Bayne 1abea4cf12 Report the file we actually tried to load from the jar just for kicks.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2371 542714f4-19e9-0310-aa3c-eee0fc999fb1
2003-04-01 19:33:07 +00:00
Michael Bayne 927be852bd Added support for providing colorization assignments when fetching tiles.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2367 542714f4-19e9-0310-aa3c-eee0fc999fb1
2003-04-01 02:16:28 +00:00
Michael Bayne 253079107c Make object base dimensions available without having to instantiate an
object tile.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2328 542714f4-19e9-0310-aa3c-eee0fc999fb1
2003-03-26 00:18:55 +00:00
Ray Greenwell e3e6077e1b Don't complain if a direction for a spot is specified as '-1',
it's intentional.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2295 542714f4-19e9-0310-aa3c-eee0fc999fb1
2003-03-03 20:41:50 +00:00
Michael Bayne 77d0747692 Actually throw a NoSuchTileSetException when we say we're going it.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2293 542714f4-19e9-0310-aa3c-eee0fc999fb1
2003-02-28 02:03:43 +00:00
Michael Bayne efec457ac7 Modified tileset bundler to not rebuild bundles that are demonstrably up
to date (all files involved in the making of the bundle are older than the
built bundle file).


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2292 542714f4-19e9-0310-aa3c-eee0fc999fb1
2003-02-28 00:46:52 +00:00
Michael Bayne 4db9d58cb4 Handle spot information in such a way that we can easily tell if a spot
has been provided for an object tile or not.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2260 542714f4-19e9-0310-aa3c-eee0fc999fb1
2003-02-12 05:33:47 +00:00
Michael Bayne 03573d2a1e Added hasSpot().
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2259 542714f4-19e9-0310-aa3c-eee0fc999fb1
2003-02-12 05:33:18 +00:00
Michael Bayne a6e64a7f28 Added getTile(int fqTileId).
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2258 542714f4-19e9-0310-aa3c-eee0fc999fb1
2003-02-12 05:32:54 +00:00
Michael Bayne e1a8bd2cc9 Added getTileSetId() and getTileIndex().
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2257 542714f4-19e9-0310-aa3c-eee0fc999fb1
2003-02-12 05:32:35 +00:00
Michael Bayne db3790f438 Require spot orientations to be specified by direction string rather than
integer value.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2254 542714f4-19e9-0310-aa3c-eee0fc999fb1
2003-02-11 06:18:59 +00:00
Michael Bayne 9e46af6dce Make the spot information available via the object tile; convert object
tile internals to use dimension and points.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2244 542714f4-19e9-0310-aa3c-eee0fc999fb1
2003-02-06 06:23:05 +00:00
Michael Bayne 6b7f189fc6 Provide access to object tileset info.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2241 542714f4-19e9-0310-aa3c-eee0fc999fb1
2003-02-05 00:22:05 +00:00
Michael Bayne 103fcde490 Include the source tileset in the NoSuchTileException.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2239 542714f4-19e9-0310-aa3c-eee0fc999fb1
2003-02-04 21:38:46 +00:00
Michael Bayne f2f8611028 Pass along the priorities and other business when trimming an object tile
set; also changed some things to be bytes since they are bytes.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2231 542714f4-19e9-0310-aa3c-eee0fc999fb1
2003-02-04 02:59:47 +00:00
Michael Bayne 744421c9ec Added support for specifying colorization classes that should be used to
colorize objects in particular tileset.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2226 542714f4-19e9-0310-aa3c-eee0fc999fb1
2003-01-29 21:53:51 +00:00
Michael Bayne ec49d73391 Added support for default render priorities.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2225 542714f4-19e9-0310-aa3c-eee0fc999fb1
2003-01-29 21:31:37 +00:00
Michael Bayne 347a070e6a Not to freak out if we get to a tileset image that we can't trim because
its hosed. Instead write an error image/tileset to the bundle and keep on
truckin'.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2219 542714f4-19e9-0310-aa3c-eee0fc999fb1
2003-01-24 21:51:26 +00:00
Michael Bayne 14331982f8 Return our image path if we have no name.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2217 542714f4-19e9-0310-aa3c-eee0fc999fb1
2003-01-24 21:42:15 +00:00
Michael Bayne 75f06dfd78 Removed inadvertently checked in debug logging.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2215 542714f4-19e9-0310-aa3c-eee0fc999fb1
2003-01-24 19:34:25 +00:00
Michael Bayne 18d0266055 Throw a sensible error message if we choke trimming a tileset.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2214 542714f4-19e9-0310-aa3c-eee0fc999fb1
2003-01-24 19:32:56 +00:00
Michael Bayne e78c7fad81 Reinstated vessel tileset colorization hack.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2194 542714f4-19e9-0310-aa3c-eee0fc999fb1
2003-01-18 23:09:37 +00:00
Michael Bayne bddca90c0d Try to cope if we were unable to load our tileset image and ended up with
a placeholder image.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2184 542714f4-19e9-0310-aa3c-eee0fc999fb1
2003-01-18 03:53:31 +00:00
Michael Bayne f2c3211534 Added support for obtaining estimated memory usage of a tile; modified
tile cache to be based on memory usage rather than tile count.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2175 542714f4-19e9-0310-aa3c-eee0fc999fb1
2003-01-17 02:30:50 +00:00
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