Commit Graph

836 Commits

Author SHA1 Message Date
Michael Bayne 628bc34eef Make sure we have clips before we try to pick one at random.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2379 542714f4-19e9-0310-aa3c-eee0fc999fb1
2003-04-05 19:00:28 +00:00
Ray Greenwell 02081105c8 cut down on the amount of logging we do for missing sounds
(unless verbose logging is turned on.)


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2378 542714f4-19e9-0310-aa3c-eee0fc999fb1
2003-04-05 03:38:41 +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
Ray Greenwell 2c4c2d6b92 - only play the default sound for missing sounds if verbose sound event logging
is turned on.
- Expire PLAY requests if they are not processed within 400ms.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2376 542714f4-19e9-0310-aa3c-eee0fc999fb1
2003-04-04 22:34:59 +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 1942314cc1 Log our validations when debugging.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2372 542714f4-19e9-0310-aa3c-eee0fc999fb1
2003-04-02 03:59:17 +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 cb6d73e98c needsPaint() will only be called by the FrameManager *after* it has just
called tick(), therefore we don't need to incorporate _tickPaintPending
into our determinations. Additionally, we need to clear _tickPaintPending
if we return false from this method because we won't get painted in that
case and won't clear it in paint().


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2369 542714f4-19e9-0310-aa3c-eee0fc999fb1
2003-04-01 03:38:03 +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 fe88ce14a6 Checkus sanitorium.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2349 542714f4-19e9-0310-aa3c-eee0fc999fb1
2003-03-30 02:19:56 +00:00
Michael Bayne c69a7b0f7c Allow the frame to be constructed with a graphics configuration.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2346 542714f4-19e9-0310-aa3c-eee0fc999fb1
2003-03-30 00:00:00 +00:00
Michael Bayne 9c54590c92 We're not generating that colorization for our health. We need to return
it to the caller!


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2345 542714f4-19e9-0310-aa3c-eee0fc999fb1
2003-03-29 02:30:14 +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
Michael Bayne 0bd5d6728c Whoops, left in some debug logging.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2326 542714f4-19e9-0310-aa3c-eee0fc999fb1
2003-03-25 23:06:51 +00:00
Michael Bayne 0b0757b98c Fixed up the goddamned repaint fuckola. Fucking pain in the ass, all this
Swing, AWT and frame manager interaction.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2325 542714f4-19e9-0310-aa3c-eee0fc999fb1
2003-03-25 23:05:58 +00:00
Michael Bayne b66e0d2584 Keep track of whether or not anything was painted each frame and avoid the
extra effort of copying the back buffer to the screen if nothing actually
changed.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2322 542714f4-19e9-0310-aa3c-eee0fc999fb1
2003-03-25 19:06:54 +00:00
Ray Greenwell 2c7c0107e2 - don't "lock" sounds when we're using the test sound directory
- allow random picks from among some variants when using test sounds
- fixed default sound for JWS users so that it loads from a bundle


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2319 542714f4-19e9-0310-aa3c-eee0fc999fb1
2003-03-24 19:35:18 +00:00
Ray Greenwell 153ed8d1b9 Added a runtime adjust for verbose logging of sound playing
(useful when working with testsounds).


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2318 542714f4-19e9-0310-aa3c-eee0fc999fb1
2003-03-23 04:10:50 +00:00
Ray Greenwell 639e08b36a Specify a fallback sound path in the constructor to be used if
a sound cannot be found.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2315 542714f4-19e9-0310-aa3c-eee0fc999fb1
2003-03-22 18:14:00 +00:00
Michael Bayne f6c16e6faf Allow preferred width or height to be overridden since it seems that
JScrollPane will happily return some insane value when it's wrapping an
empty JList.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2314 542714f4-19e9-0310-aa3c-eee0fc999fb1
2003-03-22 01:56:09 +00:00
Ray Greenwell 632366d019 Fixed bug that may occaisionally cause sound to not shut down,
removed unnecessary synchronization.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2307 542714f4-19e9-0310-aa3c-eee0fc999fb1
2003-03-17 18:50:18 +00:00
Ray Greenwell d1d538376f removed vestigial variable
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2306 542714f4-19e9-0310-aa3c-eee0fc999fb1
2003-03-17 05:28:26 +00:00
Michael Bayne ff600ddb66 Log more information if the queue is full since I saw that when entering a
sword fighting puzzle just now.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2305 542714f4-19e9-0310-aa3c-eee0fc999fb1
2003-03-13 18:35:03 +00:00
Ray Greenwell b0f351769c Good night Wesley, I added a runtime adjust for the output buffer size.
I'll surely remove it in the morning.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2304 542714f4-19e9-0310-aa3c-eee0fc999fb1
2003-03-12 00:28:05 +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 d7e60e2749 Not to freak out if we can't recolor an image, just log a warning and
return the unrecolored version.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2288 542714f4-19e9-0310-aa3c-eee0fc999fb1
2003-02-22 01:48:21 +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 8a430a41aa Make orientation of pathable at end of path available.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2256 542714f4-19e9-0310-aa3c-eee0fc999fb1
2003-02-12 05:27:57 +00:00
Ray Greenwell 3489a23603 Added hacked-together support for playing .ogg files.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2255 542714f4-19e9-0310-aa3c-eee0fc999fb1
2003-02-12 01:44:44 +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
Ray Greenwell ffa840c5ac - fixed grievous bug that NPE'd when a sound was in a bundle rather than
being loaded out of the classpath.
- enabled sound. I want to test at home with my old linux machine and see
  how things are.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2249 542714f4-19e9-0310-aa3c-eee0fc999fb1
2003-02-07 02:53:49 +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 998e4cada4 IntListUtil.sum() replaced total().
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2233 542714f4-19e9-0310-aa3c-eee0fc999fb1
2003-02-04 03:11:43 +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 e6796b2d55 The amazing revamp four hundred billion. Let's see:
- Reworked colorization repository such that we now have arbitrary named
  "colorization classes" which can be used by various and sundry entities
  to colorize themselves.

- Added support for individual object colorizations as well as "spots"
  that go along with objects (will be used to automatically create portals
  into buildings and automatically position users properly when at a
  "station").

- Repackaged things in miso to more closely mimic what we do everywhere
  else (no more miso.scene, now we have miso.data and miso.client).

- Fixed up miso scene XML representation so that objects can more easily
  be expanded to have yet more stuff if we think of more stuff that they
  might aught to have in the future. Structured the miso scene model so
  that "uninteresting" objects (those that simply sit somewhere and don't
  do anything) take up a lot less memory than "interesting" objects (those
  that have action strings, "spots", colorizations and the works). I may
  want to roll colorizations into the "uninteresting" realm, but that
  remains to be seen.

- Made it possible for object tilesets to specify default render
  priorities for objects in that tileset. This will hopefully allow us to
  get by without any "custom" render priorities that are specified on
  scene objects, instead relying on the default priorities to resolve
  common conflicts.

There are surely other cleanups in there, but I think that was the major
thrust of it.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2228 542714f4-19e9-0310-aa3c-eee0fc999fb1
2003-01-31 23:10:46 +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 412c7701c3 Modified image tracing not to depend on band format but to have the image
convert whatever its internal format is into ARGB for our inspection. It's
arguably a smidge slower (though we eliminated the multiple method calls
per pixel to determine whether it is non-transparent), but will work with
any source and destination image format.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2220 542714f4-19e9-0310-aa3c-eee0fc999fb1
2003-01-24 22:54:08 +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 0a6dfcd703 Added createErrorImage(); modified createTracedImage() and
createImageMask() not to freak out if the source image is not RGBA, Java
automatically unpacks pixels appropriately for 8-bit colormapped images,
so there's no need to be so picky. In createTracedImage() we were
converting the image to a screen optimized image anyway and thus the
source image format had absolutely no bearing on what we did with the
image later.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2218 542714f4-19e9-0310-aa3c-eee0fc999fb1
2003-01-24 21:48:14 +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