Commit Graph

332 Commits

Author SHA1 Message Date
Dave Hoover ffd07764ee In case something goes screwy and we come up with a bogus time to sleep waiting
on our sound to play, make sure we do at least our half second fudge, rather 
than spewing errors as we try to sleep for negative amounts of time.


git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@332 ed5b42cb-e716-0410-a449-f6a68f950b19
2007-11-07 18:34:40 +00:00
Dave Hoover e46e126604 Cut this back; 16 seems to be adequate, and with how everything's structured
right now, we only cancel looping sounds after working with a full buffer's
worth of audio, so going too large is problematic.

It'd probably be a Good Thing to do something a little fancier for cancelling 
looping sounds more immediately, but for now, we'll stick with close to what's 
been the status quo for years.


git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@331 ed5b42cb-e716-0410-a449-f6a68f950b19
2007-11-05 19:58:43 +00:00
Michael Bayne 9055539f69 We want to hear about repaints, though I need to test this more in various
other scenarios to really really be sure. Oh the twisty maze of AWT passages.


git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@330 ed5b42cb-e716-0410-a449-f6a68f950b19
2007-11-03 00:45:12 +00:00
Michael Bayne 1c0e4d2678 Let us collect.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@329 ed5b42cb-e716-0410-a449-f6a68f950b19
2007-11-02 23:10:31 +00:00
Par Winzell 400feab8f0 It's a bit counterintuitive that nothing in nenya/build.xml actually looks at all the ActionScript files... I keep forgetting.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@328 ed5b42cb-e716-0410-a449-f6a68f950b19
2007-11-01 15:27:05 +00:00
Par Winzell 45abd9a903 If it were done, when 'tis done, then 'twer well, it were done properly.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@327 ed5b42cb-e716-0410-a449-f6a68f950b19
2007-11-01 14:50:22 +00:00
Par Winzell c9ee5f1c21 Add a Hermite interpolator for the Path code. It would be sort of nice to bring Animations and Paths under a common umbrella, by the way.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@326 ed5b42cb-e716-0410-a449-f6a68f950b19
2007-11-01 14:27:16 +00:00
Dave Hoover bbbb5a2498 Only jump through extra hoops converting our sounds to pcm if we need to
(e.g. decoding oggs, but not playing wavs)
And then make looping work even if we're playing something that doesn't 
support resetting to marks in the stream (e.g. decoding oggs)


git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@325 ed5b42cb-e716-0410-a449-f6a68f950b19
2007-10-31 23:34:03 +00:00
Mike Thomas 5ab6e41f2f Rename parameters to reflect reality.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@324 ed5b42cb-e716-0410-a449-f6a68f950b19
2007-10-31 23:21:59 +00:00
Par Winzell 9d8d509fc7 Let the world know what's playing.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@323 ed5b42cb-e716-0410-a449-f6a68f950b19
2007-10-31 22:23:15 +00:00
Dave Hoover b0a9cb847e Millis, not seconds.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@322 ed5b42cb-e716-0410-a449-f6a68f950b19
2007-10-30 23:10:40 +00:00
Dave Hoover bf50fef84c When playing sounds, sleep for our estimated line reading time based on
how long we think the sound will really take to play, not how long the last
chunk of our buffer will take. With bumped up LINEBUF_SIZE, we'd sleep longer,
but would actually START sleeping much sooner, so we would truncate sounds.


git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@321 ed5b42cb-e716-0410-a449-f6a68f950b19
2007-10-30 22:54:46 +00:00
Ray Greenwell bce057c307 Moved chat controls here.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@320 ed5b42cb-e716-0410-a449-f6a68f950b19
2007-10-30 19:07:23 +00:00
Michael Bayne 7ac169ad97 Target 1.5 when building.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@319 ed5b42cb-e716-0410-a449-f6a68f950b19
2007-10-30 06:20:13 +00:00
Mike Thomas b9d255b032 We can't reliably make the decision as to how to load the image (FastImageIO/raw v normal) at the ResourceManager level - the path name by this point may be a file in the cache which will have lost its indicative extension. Instead, make the decision before we turn the resource path into an actual file name. This fixes YPP's current image loading issues.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@318 ed5b42cb-e716-0410-a449-f6a68f950b19
2007-10-29 20:15:25 +00:00
Par Winzell e89f1dbe3b Added a helpful Animation for smooth alpha transitions.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@317 ed5b42cb-e716-0410-a449-f6a68f950b19
2007-10-29 16:09:39 +00:00
Par Winzell 7adc0b51f5 Let our clarification not be a blatant lie.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@316 ed5b42cb-e716-0410-a449-f6a68f950b19
2007-10-29 16:02:34 +00:00
Par Winzell 17d64726a4 Clarify nature of argument.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@315 ed5b42cb-e716-0410-a449-f6a68f950b19
2007-10-29 15:08:21 +00:00
Dave Hoover 618e688aab Nix unnecessary cast and unused compare function.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@314 ed5b42cb-e716-0410-a449-f6a68f950b19
2007-10-26 22:55:49 +00:00
Michael Bayne cbe348db9a Fixed warning messages.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@313 ed5b42cb-e716-0410-a449-f6a68f950b19
2007-10-26 20:17:30 +00:00
Michael Bayne ee10bb11ed Extract FileResourceBundle into a separate subclass and hide it away from the
rest of the world.


git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@312 ed5b42cb-e716-0410-a449-f6a68f950b19
2007-10-26 20:08:38 +00:00
Michael Bayne 9103590534 Load our images directly. Yay.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@311 ed5b42cb-e716-0410-a449-f6a68f950b19
2007-10-26 19:52:52 +00:00
Michael Bayne ecc173d6ad Revamped image loading such that the ResourceManager handles loading images
given a resource path so that it can be smart about loading from files versus
streams depending on what works based based on where the resources are coming
from. Also moved FastImageIO into com.threerings.resource to avoid a dependence
on com.threerings.media in resource.


git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@310 ed5b42cb-e716-0410-a449-f6a68f950b19
2007-10-26 19:50:53 +00:00
Charlie Groves 3e47134b06 Eclipse metadata
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@309 ed5b42cb-e716-0410-a449-f6a68f950b19
2007-10-26 18:37:15 +00:00
Dave Hoover 0f98f64a9a If we want to use fancier SPI things (such as the stuff to trivially let us
play oggs), we need to jump through slightly more hoops with our audio. 
Also, bumping up LINEBUF_SIZE appears to clear up some general issues with 
linux playback being worse than other platforms, but definitely solves issues
where playing ogg turned into a bowl of rice krispies on all platforms.


git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@308 ed5b42cb-e716-0410-a449-f6a68f950b19
2007-10-23 00:08:22 +00:00
Par Winzell 3f54473d60 Accept a text format to use, so the button can match the UI it appears in.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@307 ed5b42cb-e716-0410-a449-f6a68f950b19
2007-10-21 21:35:25 +00:00
Dave Hoover 1ebd28a450 Little bit of widening, type safety, and flagging overrides.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@306 ed5b42cb-e716-0410-a449-f6a68f950b19
2007-10-17 23:34:32 +00:00
Michael Bayne 8e7997a061 Fixed a bunch of deprecated bits and added some type-safety.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@305 ed5b42cb-e716-0410-a449-f6a68f950b19
2007-10-17 21:55:59 +00:00
Michael Bayne 07830b303f Nixed a bunch of redundant casts.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@304 ed5b42cb-e716-0410-a449-f6a68f950b19
2007-10-17 21:52:40 +00:00
Charlie Groves e0a22877e2 This seems like its been pretty happy on ice, so take off the training wheels
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@303 ed5b42cb-e716-0410-a449-f6a68f950b19
2007-10-12 20:11:00 +00:00
Mike Thomas 8bc738c6d8 If a scene block resolution somehow gets abandoned, remove it from the list of blocks we're awaiting. I'd like to believe this is related to the mysterious YPP missing scene block bugs we've seen forever, but since I can't reproduce it - no idea if it actually is.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@302 ed5b42cb-e716-0410-a449-f6a68f950b19
2007-10-10 18:15:15 +00:00
Michael Bayne 59186e034f Added onStart function; cleaned up start().
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@301 ed5b42cb-e716-0410-a449-f6a68f950b19
2007-10-09 07:30:35 +00:00
Michael Bayne 6f67eac059 Brought my path stuff into general purpose land and improved it in the process.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@300 ed5b42cb-e716-0410-a449-f6a68f950b19
2007-10-09 07:17:01 +00:00
Charlie Groves 094e6b1730 Dirty SceneObjectTips as they're laid out. This was relying on tips being added and laid out before the initial paint.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@299 ed5b42cb-e716-0410-a449-f6a68f950b19
2007-10-08 23:00:20 +00:00
Charlie Groves b4417cc330 Add a switch to disable dirtying the whole screen on an invalid component on the Mac again. I can't reproduce the problem now, and I might have just been seeing some sea monster badness before. Leave the current behavior on by default though.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@298 ed5b42cb-e716-0410-a449-f6a68f950b19
2007-10-03 22:10:28 +00:00
Charlie Groves 1423c03890 Incidental genericity
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@297 ed5b42cb-e716-0410-a449-f6a68f950b19
2007-10-03 21:26:25 +00:00
Charlie Groves ddb3c92fa1 Let's not make things that actually compose stuff hop about the screen by using their VolatileMirage offset in the place of their origin offset.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@296 ed5b42cb-e716-0410-a449-f6a68f950b19
2007-09-26 22:18:27 +00:00
Charlie Groves c45878681f If we're creating a CompositedMultiFrameImage with only a single source image and it's a TileSetFrameImage, just use the Mirages in that TileSet rather than creating a whole new set of BufferedImages to composite them into. This halves the image memory used by anything that's just colorizing and transforming its images and doesn't really need composition.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@295 ed5b42cb-e716-0410-a449-f6a68f950b19
2007-09-26 21:49:11 +00:00
Charlie Groves 8d5fc6c6ea Rolling back r292 with great sadness in my heart. The non-repainting doesn't happen very often, but sure enough it does and sure enough it's awful.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@294 ed5b42cb-e716-0410-a449-f6a68f950b19
2007-09-03 22:45:29 +00:00
Charlie Groves 68bdd9402c Crank the CharacterManager cache up too so we're not compositing our sea monsters over and over again.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@293 ed5b42cb-e716-0410-a449-f6a68f950b19
2007-09-01 00:45:40 +00:00
Charlie Groves 1e55b4ed7e Haven't been able to see any non-repainting without this on my mac, and this was causing the whole screen to be dirtied once a second when the countdown timer in a seamonster battle ticked.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@292 ed5b42cb-e716-0410-a449-f6a68f950b19
2007-08-31 17:18:35 +00:00
Charlie Groves 65b8cdbc3a Factor in the percentage of the databuffer a BufferedMirage is using to
estimate its memory if its BufferedImage is a subimage of another
BufferedImage.

Include the amount of memory used by colorizations in ImageManager's cache
usage calculations.

Crank ImageManager's cache size up to 32 megs since a) it's actually seeing the
memory used by colorizations and b) the new seamonsters are pretty sizable.



git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@291 ed5b42cb-e716-0410-a449-f6a68f950b19
2007-08-30 22:50:24 +00:00
Mike Thomas 37b5e58961 If a MultiTileSprite overlaps with another item, take their render priorities into account.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@290 ed5b42cb-e716-0410-a449-f6a68f950b19
2007-08-30 18:50:16 +00:00
Michael Bayne a1332d45ff Use junit4.jar.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@289 ed5b42cb-e716-0410-a449-f6a68f950b19
2007-08-28 20:26:11 +00:00
Charlie Groves 11322269c2 Redraw seems to work correctly on the Mac now, so only invalidate the shifted region like on other platforms.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@288 ed5b42cb-e716-0410-a449-f6a68f950b19
2007-08-28 17:07:39 +00:00
Mike Thomas 95c36c22a2 Explanatory comment.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@287 ed5b42cb-e716-0410-a449-f6a68f950b19
2007-08-22 22:26:36 +00:00
Mike Thomas b560a045cd Add ability for a sprite to specify that it resides in a rectangular region of tiles rather than assuming all sprites only occupy one tile.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@286 ed5b42cb-e716-0410-a449-f6a68f950b19
2007-08-22 22:24:54 +00:00
Mike Thomas 9d73fe0587 This needs to respect sprite offset.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@285 ed5b42cb-e716-0410-a449-f6a68f950b19
2007-08-22 22:22:59 +00:00
Charlie Groves e003d97535 Break the code for completing a fade into a method so subclasses can override it and do what they will when it finishes.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@284 ed5b42cb-e716-0410-a449-f6a68f950b19
2007-08-10 22:00:50 +00:00
Michael Bayne 069fe85c70 A whole lot of widening, refactoring, thinking, rethinking and fiddling around
for what ultimately boils down adding this method to BundledComponentRepository:

    @Override // from IMImageProvider
    public Mirage getTileImage (String path, Rectangle bounds, Colorization[] zations)
    {
        // we don't need our images prepared for screen rendering
        BufferedImage src = _imgr.getImage(getImageKey(path), zations);
        if (bounds != null) {
            src = src.getSubimage(bounds.x, bounds.y, bounds.width, bounds.height);
        }
        return new BufferedMirage(src);
    }

So much fun to revisit code I wrote six years ago.


git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@283 ed5b42cb-e716-0410-a449-f6a68f950b19
2007-08-03 22:04:04 +00:00