Commit Graph

966 Commits

Author SHA1 Message Date
Bruno Garcia 1c1032874a ArrayUtil --> Arrays.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@1172 ed5b42cb-e716-0410-a449-f6a68f950b19
2011-06-17 22:18:01 +00:00
Dave Hoover 15c95e618f Unused imports
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@1170 ed5b42cb-e716-0410-a449-f6a68f950b19
2011-06-07 20:33:34 +00:00
Dave Hoover b4409dfb5c Whitespace
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@1167 ed5b42cb-e716-0410-a449-f6a68f950b19
2011-05-26 17:31:25 +00:00
Dave Hoover dc5cb6f5f2 Javadocify
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@1166 ed5b42cb-e716-0410-a449-f6a68f950b19
2011-05-26 17:31:22 +00:00
Andrzej Kapolka 692ca57250 Turns out I completely screwed up my measurements, and it is in fact
(much) faster to read the decompressed files as opposed to reading them
in-place from the jar.  At least I double-checked before going too
far.  In case you were wondering, it's *really* fast to simply check
a jar file for an entry that doesn't exist.


git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@1165 ed5b42cb-e716-0410-a449-f6a68f950b19
2011-05-09 20:47:20 +00:00
Andrzej Kapolka d46608becd I tested it on Linux, and on Windows, and on OS X: on every platform,
near as I can tell, it's substantially faster to read resources
directly from the jar file rather than unpacking them first.  Why
would that be?  Well, for starters, I'm guessing it takes less time to
decompress data than to read more data from the storage device.  Also,
it's likely to use disk space more efficiently: having all the
resources in one jar makes it more likely that they'll occupy adjacent
blocks, not to mention the fact that there's less wasted space from
partially filled blocks.  So, add an option to avoid unpacking files
from jars before reading them.  This doesn't work with FastImageIO's
memory-mapped image reading, but we don't use that in Spiral Knights.


git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@1164 ed5b42cb-e716-0410-a449-f6a68f950b19
2011-05-06 22:58:07 +00:00
Andrzej Kapolka e29bf08b7b Added a ResourceStream for convenience, changed "file" to "URL" in
various locations of URLStream.


git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@1163 ed5b42cb-e716-0410-a449-f6a68f950b19
2011-05-05 01:40:21 +00:00
Andrzej Kapolka 4ee9d56fe7 That should call the superclass method.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@1162 ed5b42cb-e716-0410-a449-f6a68f950b19
2011-05-05 01:01:28 +00:00
Andrzej Kapolka e699b5817a Turn FileStream into a more general URLStream so that we can stream music
from jar/resource URLs (but retain FileStream for compatibility).


git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@1161 ed5b42cb-e716-0410-a449-f6a68f950b19
2011-05-05 00:58:32 +00:00
Mark Johnson 81abfe0d30 - Keep the current/desired state of the sound up to date and add a method to check if a sound is
pending, (ie. set to play but hasn't finished buffering)


git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@1160 ed5b42cb-e716-0410-a449-f6a68f950b19
2011-04-14 20:33:28 +00:00
Andrzej Kapolka 8a951b218f Since the JME package was removed from Nenya, it no longer makes sense to
include the model/animation exporters for 3DS Max.


git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@1149 ed5b42cb-e716-0410-a449-f6a68f950b19
2011-04-06 21:35:44 +00:00
Charlie Groves 1fa612c349 Use the convenience creation methods on ObserverList
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@1148 ed5b42cb-e716-0410-a449-f6a68f950b19
2011-04-05 21:07:41 +00:00
Dave Hoover 82a7a4476a Speeling
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@1134 ed5b42cb-e716-0410-a449-f6a68f950b19
2011-03-31 20:10:25 +00:00
Andrzej Kapolka 9fcf4d1edd It's cheaper to check the flag, so let's do that first.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@1132 ed5b42cb-e716-0410-a449-f6a68f950b19
2011-03-25 03:34:04 +00:00
Andrzej Kapolka f0ff20fd23 Come to think of it, we don't need to maintain a list of closed nodes; we can
just use a flag.


git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@1131 ed5b42cb-e716-0410-a449-f6a68f950b19
2011-03-25 03:19:51 +00:00
Andrzej Kapolka 5dab9cfab2 ArrayList.contains shows up as a hot spot in pathfinding. Let's try using
an identity hash set to accelerate it (identity hash set uses linear probing,
which can give better cache performance than the chaining used by the normal
hash set).


git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@1129 ed5b42cb-e716-0410-a449-f6a68f950b19
2011-03-23 04:49:18 +00:00
Bruno Garcia e68ac3a0c9 Typo.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@1125 ed5b42cb-e716-0410-a449-f6a68f950b19
2011-03-10 01:55:13 +00:00
Michael Bayne f648e24f90 Moved action tileset parsing into a helper class, so that it can be more easily
tested and debugged. Turns out the problem I was chasing was a digester-2.0
dependency where a digester-1.8 dependency was needed, but I'll go ahead and
commit this anyway.


git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@1123 ed5b42cb-e716-0410-a449-f6a68f950b19
2011-02-03 20:04:09 +00:00
Andrzej Kapolka 02d46eb73a I was wondering where that went.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@1119 ed5b42cb-e716-0410-a449-f6a68f950b19
2011-01-27 01:10:08 +00:00
Andrzej Kapolka d076bf84e8 Check for a locale-specific resource in getResourceFile.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@1118 ed5b42cb-e716-0410-a449-f6a68f950b19
2011-01-27 01:08:05 +00:00
Jamie Doornbos 7c5debc5e3 Oops, remove spam
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@1110 ed5b42cb-e716-0410-a449-f6a68f950b19
2011-01-11 18:41:33 +00:00
Jamie Doornbos 8324fb01b1 The Pattern.quote was not enough, a Matcher.quoteReplacement would also be required. However, we don't really need regular expressions here, so just use the literal "replace".
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@1109 ed5b42cb-e716-0410-a449-f6a68f950b19
2011-01-11 18:33:25 +00:00
Jamie Doornbos 2ae8b60e2f Allow paths with backslashes
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@1108 ed5b42cb-e716-0410-a449-f6a68f950b19
2011-01-10 21:03:27 +00:00
Andrzej Kapolka 7ed7e5ad7d Added accessors for the position components.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@1107 ed5b42cb-e716-0410-a449-f6a68f950b19
2011-01-05 23:04:36 +00:00
Dave Hoover c612491d16 Auld Lang Syne
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@1106 ed5b42cb-e716-0410-a449-f6a68f950b19
2011-01-01 05:03:45 +00:00
Dave Hoover f1ad37f799 Whitespace
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@1104 ed5b42cb-e716-0410-a449-f6a68f950b19
2011-01-01 05:03:08 +00:00
Dave Hoover 96d7b697a3 Speeling
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@1103 ed5b42cb-e716-0410-a449-f6a68f950b19
2011-01-01 05:03:06 +00:00
Dave Hoover aa7cef1891 We're depending on at least java 1.5 at this point.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@1102 ed5b42cb-e716-0410-a449-f6a68f950b19
2011-01-01 05:03:05 +00:00
Michael Bayne d984e1678c If we're going to go to all the trouble of having them pass in an argument,
let's actually make use of it.


git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@1101 ed5b42cb-e716-0410-a449-f6a68f950b19
2010-12-23 17:17:04 +00:00
Michael Bayne 2f7474f700 Path related fixes to make things work on Windows. Courtesy of
Patrick @onyxbits.de.


git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@1098 ed5b42cb-e716-0410-a449-f6a68f950b19
2010-12-07 01:06:11 +00:00
Michael Bayne 26abce367c Moved src/as and src/ms into src/main along with their java brethren.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@1091 ed5b42cb-e716-0410-a449-f6a68f950b19
2010-11-23 19:35:01 +00:00
Mark Johnson 4ce2d46976 - fix floorDiv to handle negative divisors correctly
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@1065 ed5b42cb-e716-0410-a449-f6a68f950b19
2010-11-13 00:50:16 +00:00
Michael Bayne 85ca7f1c45 Made ClassRecord and ColorRecord comparable on name.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@1064 ed5b42cb-e716-0410-a449-f6a68f950b19
2010-11-11 17:13:37 +00:00
Michael Bayne f94d7c8d1a It looks like Vilya uses CastUtil, so we'll just make it slightly less hacky
and put it back into the main codebase.


git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@1063 ed5b42cb-e716-0410-a449-f6a68f950b19
2010-11-08 22:25:14 +00:00
Michael Bayne 310ff1e3ba Moved CastUtil into tests, since it's test code. Added missing depend to
miso-viewer build target.


git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@1062 ed5b42cb-e716-0410-a449-f6a68f950b19
2010-11-08 22:16:01 +00:00
Michael Bayne 07919e8a57 Added some commentary.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@1061 ed5b42cb-e716-0410-a449-f6a68f950b19
2010-11-08 22:13:33 +00:00
Michael Bayne 26d4b72520 Added an example colorization configuration, wired it into the Miso scene
viewer, so now we have colorized pirates walking around the scene instead of
weird red/purple ones.


git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@1060 ed5b42cb-e716-0410-a449-f6a68f950b19
2010-11-08 22:04:22 +00:00
Michael Bayne b5a547edf9 More test bits moving up to the top-level.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@1055 ed5b42cb-e716-0410-a449-f6a68f950b19
2010-11-08 21:05:17 +00:00
Michael Bayne 870af00cc3 Whitespace tweaks.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@1054 ed5b42cb-e716-0410-a449-f6a68f950b19
2010-11-08 21:04:28 +00:00
Michael Bayne b5f47287fe OMG tests that actually test something. (This coming from the reformed original
author of the non-testing test.)


git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@1052 ed5b42cb-e716-0410-a449-f6a68f950b19
2010-11-08 20:56:30 +00:00
Michael Bayne 906f69a392 Making tests work again. Next up will be fixing test failures. (Actually next
up will be making the tests actually test something, and then fixing that when
they break.)


git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@1050 ed5b42cb-e716-0410-a449-f6a68f950b19
2010-11-08 19:44:11 +00:00
Michael Bayne 2a61ecf169 Let's not call getTileCount() in toString() as that results in UniformTileSet
getting its image and doing some math, which fucks us if we're working with
bogus tilesets (which we do when testing).


git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@1049 ed5b42cb-e716-0410-a449-f6a68f950b19
2010-11-08 19:42:34 +00:00
Michael Bayne fbeba68787 More {@code} usage, whitespace tweaks.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@1048 ed5b42cb-e716-0410-a449-f6a68f950b19
2010-11-08 19:41:52 +00:00
Michael Bayne aacf7fab4b Yay for {@code}!
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@1046 ed5b42cb-e716-0410-a449-f6a68f950b19
2010-11-08 19:16:18 +00:00
Michael Bayne 63a26726d1 Switched (partially) to Maven-based dependency resolution. Further work
forthcoming to fix up the tests.

Peskily, it looks like I'm going to have to take one for the team and become
the maintainer of a Maven artifact for LWJGL. In spite of repeated requests
over the years for Mavenized artifacts for LWJGL, Mazon resists it (he seems to
think he has to use Maven to *build* LWJGL, which he certainly need not do).
There have been a variety of half-assed attempts to maintain third-party Maven
repositories, all of which have petered out a major version or two ago.


git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@1045 ed5b42cb-e716-0410-a449-f6a68f950b19
2010-11-08 18:51:32 +00:00
Michael Bayne e1ac0cea66 More dots!
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@1042 ed5b42cb-e716-0410-a449-f6a68f950b19
2010-10-24 03:44:38 +00:00
Michael Bayne a181d13ce2 Need more dots!
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@1041 ed5b42cb-e716-0410-a449-f6a68f950b19
2010-10-24 03:43:49 +00:00
Michael Bayne 12ba2038b2 Get our tools from narya.jar and its dependencies. Moved src/java into
src/main/java. Prepared to move tests out into main project.


git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@1040 ed5b42cb-e716-0410-a449-f6a68f950b19
2010-10-24 02:21:32 +00:00
Michael Bayne 64fe2ea656 JME is kind of an evolutionary dead end, so we're going to move all the JME
code into the Bang project directly so as to confine the dependencies on JME
libraries to the only thing that will ever need them.


git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@1035 ed5b42cb-e716-0410-a449-f6a68f950b19
2010-10-22 16:50:32 +00:00
Dave Hoover bc7fd397fb Update source headers to point to our new home.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@1034 ed5b42cb-e716-0410-a449-f6a68f950b19
2010-10-18 19:02:13 +00:00