Commit Graph

392 Commits

Author SHA1 Message Date
Michael Bayne 8fc55ee79b A bunch of Eclipse facilitated cleanup.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@734 ed5b42cb-e716-0410-a449-f6a68f950b19
2008-12-09 02:00:28 +00:00
Michael Bayne 1df7613dfc Use the correct Log reference.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@732 ed5b42cb-e716-0410-a449-f6a68f950b19
2008-12-07 06:56:29 +00:00
Dave Hoover a431ffa3a3 And while I'm in there, let's qualify that reference so my
javadoc parsing doesn't spit an error.


git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@731 ed5b42cb-e716-0410-a449-f6a68f950b19
2008-12-05 23:20:37 +00:00
Dave Hoover 06bcdeea14 Don't always claim unpacking resources is a mere 1 second from completion.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@730 ed5b42cb-e716-0410-a449-f6a68f950b19
2008-12-05 23:15:39 +00:00
Dave Hoover 8b899014ef Let's reorder those to go clockwise around the compass
(and match the set of cardinals in yohoho that I want to replace with this)


git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@728 ed5b42cb-e716-0410-a449-f6a68f950b19
2008-12-03 19:00:09 +00:00
Dave Hoover 1680e5135b Cardinals.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@727 ed5b42cb-e716-0410-a449-f6a68f950b19
2008-12-03 18:53:20 +00:00
Mike Thomas 42aa38f832 We really need to adjust _priorCurrent regardless of whether this particular call to elapsed() is at a driftRatio of 1.0 or not - the next one might not be, so we need to keep it up to date. Otherwise, we could potentially yank _startStamp around by minutes or hours due to a stale _priorCurrent.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@726 ed5b42cb-e716-0410-a449-f6a68f950b19
2008-12-02 23:52:23 +00:00
Charlie Groves 411afaf415 Skip on toString if baseTileIds is null in addition to when width is 0. When
digester is logging - which happens when log4j is added to the classpath but
not configured - it prints Sections out while they're being initialized and
have a width but no baseTileIds.



git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@724 ed5b42cb-e716-0410-a449-f6a68f950b19
2008-11-27 00:46:24 +00:00
Mike Thomas 1dc123281b Add a new play method that allows specification of a position for the sound source.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@723 ed5b42cb-e716-0410-a449-f6a68f950b19
2008-11-26 23:56:40 +00:00
Dave Hoover e92d57e315 Some warning cleanups, widening, and varargs logification.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@700 ed5b42cb-e716-0410-a449-f6a68f950b19
2008-11-12 18:45:13 +00:00
Dave Hoover c4af53338c Rejigger component rendering order a bit so that individual components can have their own
priority overrides, since unfortunately, not all male/familiars are created equal.


git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@693 ed5b42cb-e716-0410-a449-f6a68f950b19
2008-11-10 23:02:00 +00:00
Michael Bayne ab024a3054 Added isRunning().
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@689 ed5b42cb-e716-0410-a449-f6a68f950b19
2008-11-08 00:10:17 +00:00
Charlie Groves df7fdc5e81 Add tileToFull
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@678 ed5b42cb-e716-0410-a449-f6a68f950b19
2008-10-29 01:11:57 +00:00
Dave Hoover 8d4c46f3c3 Some widening/varargs logging/javadoc fixes.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@675 ed5b42cb-e716-0410-a449-f6a68f950b19
2008-10-27 21:54:28 +00:00
Dave Hoover 4c9ac3ad6f Use RandomUtil.getChance()
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@673 ed5b42cb-e716-0410-a449-f6a68f950b19
2008-10-22 17:26:51 +00:00
Charlie Groves e2e3243a29 Reinstate the mask cache. We were spending about half our scene time making masks
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@672 ed5b42cb-e716-0410-a449-f6a68f950b19
2008-10-22 01:02:31 +00:00
Charlie Groves b13728ac5f Wait for the call to wasResolved to call back about being abandoned as the scene panel is expecting that to be on the AWT thread
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@671 ed5b42cb-e716-0410-a449-f6a68f950b19
2008-10-22 00:13:58 +00:00
Dave Hoover 1daf5c206b And of course, if I were thinking this morning, I would've rerun the organize imports
thing before committing instead of just going "oh yeah, I've been having this stuff
sitting around uncommitted for a while waiting on it to be blessed" and missing
out on things that'd changed in the meantime.


git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@665 ed5b42cb-e716-0410-a449-f6a68f950b19
2008-09-26 17:35:27 +00:00
Dave Hoover b473318b12 More import cleanups to go with r662, along with a little bit of foreaching, widening, etc.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@664 ed5b42cb-e716-0410-a449-f6a68f950b19
2008-09-26 17:29:23 +00:00
Charlie Groves b481c48791 Only log native library loading errors if we attempt to use it
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@663 ed5b42cb-e716-0410-a449-f6a68f950b19
2008-09-26 00:34:23 +00:00
Michael Bayne 8e69ff612e Some import cleanups from Dave.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@662 ed5b42cb-e716-0410-a449-f6a68f950b19
2008-09-25 22:16:10 +00:00
Charlie Groves 4b038fb8e1 Keep updating the tick time even if the sound manager is null
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@659 ed5b42cb-e716-0410-a449-f6a68f950b19
2008-09-23 20:09:36 +00:00
Charlie Groves 62740fe546 Rather than trying to restrict the drift adjustment into a sane range, just stop applying it if it's huge or tiny.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@656 ed5b42cb-e716-0410-a449-f6a68f950b19
2008-09-14 23:27:29 +00:00
Dave Hoover 1c864bf169 Javadoc warnings cleanup.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@655 ed5b42cb-e716-0410-a449-f6a68f950b19
2008-09-12 18:04:58 +00:00
Michael Bayne e284b6cfc1 Unused import patrol.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@654 ed5b42cb-e716-0410-a449-f6a68f950b19
2008-09-11 17:54:45 +00:00
Andrzej Kapolka 89f1f1938e Some changes to bring OpenAL code in line with OpenGL code: use a
Java object to represent each OpenAL object (listener, sources, 
and buffers) and delete the OpenAL object if the Java object is 
garbage-collected.  Added the full range of listener and source 
settings.


git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@653 ed5b42cb-e716-0410-a449-f6a68f950b19
2008-09-10 23:55:25 +00:00
Andrzej Kapolka 5df6f85014 I don't think anything is using this. I'm moving it so that I
can extend it with Clyde-specific bits.


git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@652 ed5b42cb-e716-0410-a449-f6a68f950b19
2008-09-10 00:50:46 +00:00
Andrzej Kapolka 5d3f025b7a Uncommented line after updating samskivert with the required
method.


git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@651 ed5b42cb-e716-0410-a449-f6a68f950b19
2008-08-28 22:57:32 +00:00
Andrzej Kapolka adeab3efa2 Added methods to observe resource files for changes to their
last-modified timestamps (by manual polling).


git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@650 ed5b42cb-e716-0410-a449-f6a68f950b19
2008-08-26 23:12:13 +00:00
Charlie Groves 60d2febeda Allow streams and sounds to have their gain controlled individually as well as from the overall control
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@649 ed5b42cb-e716-0410-a449-f6a68f950b19
2008-08-26 22:17:11 +00:00
Charlie Groves e4cdad7741 Start up streams on the sound queue thread and handle OpenAL barfing on startup
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@648 ed5b42cb-e716-0410-a449-f6a68f950b19
2008-08-26 20:23:02 +00:00
Charlie Groves fff73d94cc Expose the SoundLoader
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@647 ed5b42cb-e716-0410-a449-f6a68f950b19
2008-08-23 21:07:47 +00:00
Charlie Groves aa171bdd0e Expose sound types being enabled or disabled
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@646 ed5b42cb-e716-0410-a449-f6a68f950b19
2008-08-23 19:42:54 +00:00
Charlie Groves 135b25516e Hey, let's not just completely break locking and unlocking sounds
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@645 ed5b42cb-e716-0410-a449-f6a68f950b19
2008-08-22 02:38:57 +00:00
Charlie Groves 329bedd523 Choose a random sound from multi-option sounds in the SoundLoader when told to
play a particular key.
Set the gain on streams before returning them in addition to during each update.



git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@644 ed5b42cb-e716-0410-a449-f6a68f950b19
2008-08-22 02:02:54 +00:00
Michael Bayne a2f5bd532e In this case I think the helper function reduces clarity rather than adds.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@643 ed5b42cb-e716-0410-a449-f6a68f950b19
2008-08-21 18:30:01 +00:00
Charlie Groves c06de7d51f Add ogg streaming to OpenALSoundPlayer
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@642 ed5b42cb-e716-0410-a449-f6a68f950b19
2008-08-21 05:33:19 +00:00
Charlie Groves 81a2d3d104 Clean up some possible nulls to quiet Eclipse
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@641 ed5b42cb-e716-0410-a449-f6a68f950b19
2008-08-21 01:50:06 +00:00
Charlie Groves 99fc1ddbf7 Uhh, probably makes sense to actually hook the volume setting up to the sound manager
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@640 ed5b42cb-e716-0410-a449-f6a68f950b19
2008-08-21 01:43:08 +00:00
Charlie Groves 0abacd42d3 Give OpenALSoundPlayer its own thread and queue to keep it from sharing with the EDT and possibly blocking
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@639 ed5b42cb-e716-0410-a449-f6a68f950b19
2008-08-20 23:31:21 +00:00
Andrzej Kapolka e399b4dd15 Avoid pesky stack overflows.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@635 ed5b42cb-e716-0410-a449-f6a68f950b19
2008-08-19 21:11:32 +00:00
Dave Hoover 754566d011 Pedanticism police.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@632 ed5b42cb-e716-0410-a449-f6a68f950b19
2008-08-15 23:19:44 +00:00
Charlie Groves 8a3c6c8614 There's no way to genericize the Comparable while using the static
ClipBuffer.makeKey to create them, and non-genericized Comparables make the
Baby Jesus(Nate) cry, so just drop the pretense and use String.



git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@631 ed5b42cb-e716-0410-a449-f6a68f950b19
2008-08-15 22:38:46 +00:00
Charlie Groves 4aefa977b4 Expose shouldPlay
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@629 ed5b42cb-e716-0410-a449-f6a68f950b19
2008-08-14 19:02:17 +00:00
Charlie Groves 8febded3b3 Nip a compiler warning
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@628 ed5b42cb-e716-0410-a449-f6a68f950b19
2008-08-14 18:29:09 +00:00
Charlie Groves fbf539580e Readd a deprecated SoundManager that just extends JavaSoundPlayer to keep it around with its original name
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@626 ed5b42cb-e716-0410-a449-f6a68f950b19
2008-08-14 00:51:34 +00:00
Charlie Groves fc32634412 Rename all the media.SoundManager stuff to variants on SoundPlayer to conflict
less with openal.SoundManager.



git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@625 ed5b42cb-e716-0410-a449-f6a68f950b19
2008-08-14 00:50:17 +00:00
Michael Bayne 5c234af875 This needs to live in the openal package because all the OpenAL must not be
visible to things that don't want or care about OpenAL. Also, the openal
package is conditionally compiled, so this would have broken a Narya build that
didn't use the OpenAL libraries.


git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@624 ed5b42cb-e716-0410-a449-f6a68f950b19
2008-08-13 22:49:34 +00:00
Charlie Groves e678d36262 Look at the big smart programmer using the library code instead of rolling his own, hacked-up shit
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@623 ed5b42cb-e716-0410-a449-f6a68f950b19
2008-08-13 22:12:25 +00:00
Charlie Groves e4801b954f Pull the generic sound playing api from SoundManager up into
AbstractSoundManager and implement the actual sound playing with Java sound in
SoundManager and with OpenAL in OpenALSoundManager.  I left the SoundManager
name alone so nothing using it will need to change, but if nothing besides
yohoho is using it, I can refactor it to a more sane naming scheme.

Rip out all the music and alternative format stuff since it didn't work anyway.



git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@622 ed5b42cb-e716-0410-a449-f6a68f950b19
2008-08-13 21:47:42 +00:00