Commit Graph

1190 Commits

Author SHA1 Message Date
Mike Thomas 263cc28f99 First checkpoint commit of fringing in AS. This still needs testing and some callback-wrangling related to getting tile images.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@947 ed5b42cb-e716-0410-a449-f6a68f950b19
2010-07-13 06:08:25 +00:00
Mike Thomas 13b74c92a1 Colorization's range makes far more sense as inclusive rather than exclusive. In particular, it means if you have a color-class with a range of 0.0,0.0,0.0 it will match exactly the target color, which is surely what you meant for it to do.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@946 ed5b42cb-e716-0410-a449-f6a68f950b19
2010-07-12 21:10:52 +00:00
Mike Thomas c483d58683 If we have tiles just off the bottom they can stick up into our screen.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@945 ed5b42cb-e716-0410-a449-f6a68f950b19
2010-07-10 00:58:02 +00:00
Mike Thomas e00b8be8d4 We need a separate bitmap because we can only include each bitmap once in the window, but we can go ahead and share the underlying data.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@944 ed5b42cb-e716-0410-a449-f6a68f950b19
2010-07-10 00:13:50 +00:00
Mike Thomas c65ee0c562 Let's reorganize our scene tiles into SceneBlocks that we can load and unload as chunks as we move our view around the scene. If this sounds familiar, it's because you've been reading MisoScenePanel.java.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@943 ed5b42cb-e716-0410-a449-f6a68f950b19
2010-07-09 23:15:20 +00:00
Mike Thomas 141901b2af The TileUtil.getTileHash function's method for computing a seed was resulting in a lot of very non-random looking vertical and horizontal lines of the same tile, especially around the origin. (0^0 == 1^1 == 2^2 etc) So, let's bit-shift x to make it appear more random.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@942 ed5b42cb-e716-0410-a449-f6a68f950b19
2010-07-09 00:29:56 +00:00
Mike Thomas 64bbf9f9d8 Rather than loading all the base tiles at once (or really, all the ones in an arbitrary region), we'll load only the ones on-screen. And then if we scroll around, we'll load the others we need.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@941 ed5b42cb-e716-0410-a449-f6a68f950b19
2010-07-09 00:18:06 +00:00
Mike Thomas 78f64d2c66 We can just take this out entirely for now - I really don't know why it's not finding this, I guess it must not be getting exported to the as3isolib swc even though it's in the source.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@940 ed5b42cb-e716-0410-a449-f6a68f950b19
2010-07-08 23:43:01 +00:00
Andrzej Kapolka 6abbcfc639 Fix the Shared Libraries build. It looks like the version of as3isolib in
extlibs needs to be updated.


git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@939 ed5b42cb-e716-0410-a449-f6a68f950b19
2010-07-08 23:19:34 +00:00
Mike Thomas 4fba468590 Change how the Miso view handles the time when we're waiting to load the tilesets - show a loading screen of some type instead of showing the semi-transparent blocks.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@938 ed5b42cb-e716-0410-a449-f6a68f950b19
2010-07-08 21:53:56 +00:00
Mike Thomas da88a42716 Use a new, fancy version of the Iso lib scene layout renderer that takes into account a render-priority for use in handling overlapping iso objects. This may want some additional optimization in the future, but we'll see if that's really required.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@937 ed5b42cb-e716-0410-a449-f6a68f950b19
2010-07-08 17:05:10 +00:00
Mike Thomas 1254841995 Second pass on AS recoloring, fixed a bunch of bugs and tied to tiles/tilesets.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@936 ed5b42cb-e716-0410-a449-f6a68f950b19
2010-07-07 18:04:52 +00:00
Dave Hoover 91b0a812ba Line ending happy fun times
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@935 ed5b42cb-e716-0410-a449-f6a68f950b19
2010-07-06 17:28:12 +00:00
Mike Thomas 75f00f82ec Checkpoint commit to getting the png recolor code into nenya. This still needs testing and such.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@934 ed5b42cb-e716-0410-a449-f6a68f950b19
2010-07-03 01:05:08 +00:00
Dave Hoover 7752cca5b0 Document + change name.
"keepRawPngs" is a bit confusing since we tend to refer to the
FastImageIO format as "raw"

git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@933 ed5b42cb-e716-0410-a449-f6a68f950b19
2010-07-02 23:20:28 +00:00
Mike Thomas e3c79a6be8 First pass at getting miso working with actual tiles and tileset data.
Still to do:
- Handle tile priorities in ISO sorting.
- Handle recoloring tiles (this may result in annoyingly significant changes to Tile/TileSet API)
- Dynamically loading sections rather than loading all the tiles of a scene.
- Better handling of the state where the scene's not yet loaded.
- Portals.
- Dynamic sizing of the MisoScenePanel



git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@932 ed5b42cb-e716-0410-a449-f6a68f950b19
2010-07-01 22:27:37 +00:00
Mike Thomas 941a6a83b2 Allow a parameter to TileSetBundlerTask to keep the pngs in the bundle instead of converting to raw and trimming them.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@931 ed5b42cb-e716-0410-a449-f6a68f950b19
2010-07-01 22:14:06 +00:00
Charlie Groves 59ba7edcaa Oh yeah, update this guy as well
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@930 ed5b42cb-e716-0410-a449-f6a68f950b19
2010-06-28 20:03:07 +00:00
Dave Hoover ca9e1aa730 That should be private.
If it's public, we try to shadow it in a subclass & wind up
still getting THIS one.

git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@929 ed5b42cb-e716-0410-a449-f6a68f950b19
2010-06-18 23:40:17 +00:00
Mike Thomas e42ebae867 It's not drawing the real tile/art assets yet, but handles enough of the model correctly to draw boxes for each base/object tile.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@928 ed5b42cb-e716-0410-a449-f6a68f950b19
2010-06-16 22:56:48 +00:00
Dave Hoover 25ee5e9134 Slay some cyclopian variables.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@927 ed5b42cb-e716-0410-a449-f6a68f950b19
2010-06-15 17:27:02 +00:00
Dave Hoover 2efa35a62d Whitespace
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@926 ed5b42cb-e716-0410-a449-f6a68f950b19
2010-06-15 17:26:58 +00:00
Dave Hoover 4438b25d98 Fix syntax
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@925 ed5b42cb-e716-0410-a449-f6a68f950b19
2010-06-11 22:57:10 +00:00
Ray Greenwell d869938b69 Switch to compiling against the aspirin library.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@924 ed5b42cb-e716-0410-a449-f6a68f950b19
2010-06-09 20:51:06 +00:00
Mike Thomas 2f634e3a60 Port of the miso scene model and related bits (so, data only, no rendering of any kind yet).
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@923 ed5b42cb-e716-0410-a449-f6a68f950b19
2010-06-08 01:48:12 +00:00
Mike Thomas e3de56d12a Change that StreamableHashIntMap into a more standard StreamableHashMap
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@922 ed5b42cb-e716-0410-a449-f6a68f950b19
2010-06-08 01:41:24 +00:00
Mike Thomas 3865b20070 Bring the genascript ant target from narya/vilya to nenya.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@921 ed5b42cb-e716-0410-a449-f6a68f950b19
2010-06-08 01:38:34 +00:00
Dave Hoover f6ec3f5af4 We require 1.5 now, so rock on!
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@920 ed5b42cb-e716-0410-a449-f6a68f950b19
2010-05-17 20:13:54 +00:00
Dave Hoover cb15424946 Render debug footprints even if we don't render objects.
It's really handy when you've got objects that hide others to be able to
turn off the objects but still get footprints.

git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@919 ed5b42cb-e716-0410-a449-f6a68f950b19
2010-05-14 18:57:53 +00:00
Dave Hoover 8d54026f63 Whitespace
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@918 ed5b42cb-e716-0410-a449-f6a68f950b19
2010-05-14 18:57:52 +00:00
Dave Hoover 251da6cb22 Varargs
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@917 ed5b42cb-e716-0410-a449-f6a68f950b19
2010-05-14 18:57:51 +00:00
Mike Thomas 209fbfceaf There's pretty clearly a larger issue here, but this seems to solve the immediate issue - ties in the sort are Really Bad as they lead to inconsistent ordering later on. But note that it's still very possible to end up with ties even with this change.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@916 ed5b42cb-e716-0410-a449-f6a68f950b19
2010-04-22 00:48:03 +00:00
Ray Greenwell aaddc866e8 I think I can make this class usable for what I want by simply making
the Node class public so that I can see where I came from in my Stepper.

The thread non-safety only affects callers of getConsidered(), btw.

If I wasn't pinched for time right now I'd modernize this whole thing
and remove the sucky.


git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@915 ed5b42cb-e716-0410-a449-f6a68f950b19
2010-04-13 21:44:57 +00:00
Ray Greenwell 24e3afe18f Some formatting.
Whatever: this class needs a kick to the head.
Maybe I should make a new one that isn't singleton and thread-unsafe
like this one.


git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@914 ed5b42cb-e716-0410-a449-f6a68f950b19
2010-04-13 20:42:26 +00:00
Ray Greenwell c1ba3f7d18 Allow a Stepper to easily be created that doesn't consider diagonals.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@913 ed5b42cb-e716-0410-a449-f6a68f950b19
2010-04-13 00:34:04 +00:00
Ray Greenwell 69d734863c Document two gotchas. This is fucked up. Fucking A.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@912 ed5b42cb-e716-0410-a449-f6a68f950b19
2010-04-07 22:32:57 +00:00
Michael Bayne 80eb551aa0 Missed a file.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@911 ed5b42cb-e716-0410-a449-f6a68f950b19
2010-04-05 01:41:33 +00:00
Michael Bayne 5188504acc Delete the built test bundles in our clean target.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@910 ed5b42cb-e716-0410-a449-f6a68f950b19
2010-04-05 01:40:35 +00:00
Michael Bayne 04f4488f55 Make the "tests" target actually work (and run the tests). But we'll not run
the tests on every "dist" build, we'll just stick with the current behavior of
only compiling the tests (to make sure they don't rot). In a better world
ooo-libs would have a testall target which runs the tests on all the projects
it builds, so that we actually got the benefit of the few unit tests we have.


git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@909 ed5b42cb-e716-0410-a449-f6a68f950b19
2010-04-05 01:35:58 +00:00
Mike Thomas 278696c655 Let's alphabetize those color names in the JComboBoxes.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@908 ed5b42cb-e716-0410-a449-f6a68f950b19
2010-03-31 18:55:16 +00:00
Dave Hoover eb3673363e Button to save out the colorized image
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@907 ed5b42cb-e716-0410-a449-f6a68f950b19
2010-03-24 22:06:16 +00:00
Dave Hoover 6d5c7af519 Log a stack trace for obscenely huge dirty regions.
If we're freaked out enough that we're carping & ignoring it, I want to
be able to actually figure out what's broken.

git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@906 ed5b42cb-e716-0410-a449-f6a68f950b19
2010-03-24 01:08:49 +00:00
Michael Bayne b260dbe768 Should be no harm in compiling against Guava instead of GC as they have the
exact same API. So if you ship with GC instead of Guava, nothing will break.

Eventually we'll want to ship with Guava instead of GC so that we can use
Guava-specific methods, but projects can make that switch at their leisure.


git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@905 ed5b42cb-e716-0410-a449-f6a68f950b19
2010-03-16 23:53:01 +00:00
Michael Bayne 2fd8b7fbaa Some raw type cleanup.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@904 ed5b42cb-e716-0410-a449-f6a68f950b19
2010-03-16 23:27:05 +00:00
Michael Bayne c484d10a48 Fascinating. This class contains both toArray(ArrayList<Integer> lits) and
toArray(ArrayList<Float> list) which erase to the same argument types. They
differ in return types which means that the JVM recognizes them as different,
so when the compiler resolved that it needed to call
"toArray(Ljava/util/ArrayList;)[F", it was not a problem that
"toArray(Ljava/util/ArrayList;)[I" also existed.

javac 1.7 is a bit stricter about this sort of thing and issues a concerned
warning message. Since the ArrayList<Integer> version is not used, I'm nixing
it to avoid confusion.


git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@903 ed5b42cb-e716-0410-a449-f6a68f950b19
2010-03-16 23:26:27 +00:00
Andrzej Kapolka 4145611b9c Added method to get color class by id.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@902 ed5b42cb-e716-0410-a449-f6a68f950b19
2010-03-11 02:03:04 +00:00
Mike Thomas 5920f44e64 It's probably helpful if the clone on the scene model actually clones its ObjectInfo bits.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@901 ed5b42cb-e716-0410-a449-f6a68f950b19
2010-03-11 00:51:30 +00:00
Mike Thomas ba3be78a51 Separate out the modes of the recolor tool. There are now three modes - Using Color Class (old All Colorizations mode), Multi-Color (Specify up to 4 recolors), and Manual Recolor (old specifying target color, offsets manually mode).
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@900 ed5b42cb-e716-0410-a449-f6a68f950b19
2010-03-10 21:41:41 +00:00
Mike Thomas 490dcdfd2b This was a tad broken - if an animation happened to paint before it ticked, it'd try to paint tile -1 which obviously didn't exist. This change may break any custom sequencers anyone has but seems necessary...
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@899 ed5b42cb-e716-0410-a449-f6a68f950b19
2010-03-04 01:39:36 +00:00
Dave Hoover e702a1b33e Unused import
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@898 ed5b42cb-e716-0410-a449-f6a68f950b19
2010-03-03 19:06:03 +00:00