Commit Graph

1347 Commits

Author SHA1 Message Date
Walter Korman eb270593d1 Need to trim whitespace from the project jar files.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1350 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-05-08 23:04:07 +00:00
Walter Korman f0ebe247e4 Fixed javadoc typo.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1349 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-05-08 21:15:26 +00:00
Michael Bayne 7a7309f347 Make the tiler cope if it's given a null source image.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1348 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-05-07 03:23:46 +00:00
Michael Bayne 04a1b4a38a Created a helper class that can be used to render a tiled background image
that is generated by cutting up a small image into nine sections and using
each appropriately to create the expanded background.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1347 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-05-07 03:11:17 +00:00
Michael Bayne 18c4c32c85 Whoops, I booched it.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1346 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-05-07 00:57:49 +00:00
Michael Bayne ac31caa28b Added support for centering the media panel on a region of interest when
it is displaying in a space smaller than its desired view size.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1345 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-05-07 00:53:56 +00:00
Michael Bayne 581a2cce44 Don't choke if we're asked about game over and we've already shut down and
pitched our game object.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1344 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-05-07 00:49:24 +00:00
Michael Bayne 6dcdba4540 Added toString() to records; report which record we're failing to add when
such things happen.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1343 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-05-07 00:05:02 +00:00
Michael Bayne 181fa3269d Only update ourselves in halt() if we actually stopped something.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1342 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-05-06 23:24:15 +00:00
Michael Bayne 320706e857 Do our recoloring in one fell swoop.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1341 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-05-06 23:23:27 +00:00
Michael Bayne 8063347815 Modified image recoloring to use Colorization objects since they now live
in the same package. Also added support for applying a set of
recolorizations all at once so that previous recolorings aren't borked by
subsequent recolorings (plus it's more efficient).


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1340 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-05-06 23:23:08 +00:00
Michael Bayne 99c4330646 The vast and the sweeping. Modified the tile framework such that tiles no
longer provide access to their underlying image (they actually still do,
but not in the normal course of affairs). This will allow us to use
"trimmed" tiles which are trimmed to the smallest rectangle that contains
the non-transparent pixels in a tile image, which will shrink up our
components and other tiles a great deal.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1339 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-05-06 18:08:32 +00:00
Ray Greenwell 1c182d6e36 this line should have been commented out too
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1338 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-05-04 21:36:32 +00:00
Michael Bayne 2e46950ef0 Message bundles are init()ed now rather than constructed with their
desired arguments.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1337 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-05-04 19:39:27 +00:00
Michael Bayne 37a1167fb5 Revamped component action animation support so that we're not passing
around arrays of multi-frame images but instead pass around one object
that knows how to render any action frame in any orientation. This
apparently fixed some horrible bug that we had introduced in doing JITC
and now the whole thing is super fast, just like I always thought it would
be. Once we introduce trimmed images, it will blaze!


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1336 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-05-04 19:38:14 +00:00
Michael Bayne 47e38b4fa8 Changed MultiFrameImage around so that it retains total control over its
internal images and doesn't necessarily need to decode them into multiple
images or even have actual images at all. This cleans things up and paves
the way for our "trimmed" image support which is forthcoming.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1335 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-05-04 19:35:31 +00:00
Michael Bayne 0492637aa0 Moved hitTest() into ImageUtil where its accessible to all that need it.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1334 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-05-04 19:34:14 +00:00
Michael Bayne 554fb9e249 First pass at just in time compositing (JITC!). Things aren't quite as
fast as I'd have hoped, but I'm optimistic that the image compression
business that Walter and I are embarking upon will solve that handily.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1333 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-05-04 06:57:24 +00:00
Michael Bayne 33eb11b8f6 Fixed yet another bug with the Swing rendering code: apparently the
JEditorPane, when displaying HTML that contains forms, pointlessly wraps
its Swing components in heavy weight AWT components which would otherwise
trigger some funny business that we don't want it to trigger.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1332 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-05-04 05:13:54 +00:00
Michael Bayne d43442b3dd Changed debug logging so that it is easier to enable and disable since I
seem to be debugging the fucking rendering every other day. Fixed bug with
dirty region combining.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1331 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-05-04 03:09:46 +00:00
Michael Bayne cdb20c8389 No longer need to disable lightweight popups. Yay!
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1330 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-05-03 04:17:25 +00:00
Michael Bayne a98f5f617a Yet more rendering fixes: we render the frame participants before the dirty
Swing components and we go through and specifically render any components
in the upper layers (see JLayeredPane for what this means) that overlap
our frame participants every frame. This is non-optimal, but the hairy
code that somehow magically works out who to repaint when components
overlap is not even something that I want to dig more deeply into. There
are generally not many components in the upper layers (only popups like
menus and tooltips and internal frames when we use them).


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1329 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-05-03 04:16:41 +00:00
Michael Bayne 4da9a66c1d Fixed more repaint bugs. We weren't properly painting the opaque component
when doing old-skool rendering. We also needed to climb up the hierarchy
looking to see if a parent is dirty for each dirty component and combine
the child and parent dirty rects and only repaint the parent otherwise we
can run into problems with render order. Oh the complexity (though Swing
does this too).


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1328 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-05-03 04:14:20 +00:00
Michael Bayne 2005f22000 Moved fringing code into base display miso scene and added code to fringe
a scene when it is first displayed.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1327 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-05-03 04:12:48 +00:00
Michael Bayne ccf0dca140 Don't issue an ALREADY_THERE response if a user requests to move to a zone
they already occupy. When a client logs on after a disconnect, it needs to
do a zoned moveTo request to get back to where it was because it doesn't
have the zone summary and associated good stuff.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1326 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-05-03 00:00:17 +00:00
Michael Bayne 9abf440dde If the client asks to move to the location they're already in, just go
along with them rather than sticking a fork in the program.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1325 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-05-02 21:19:28 +00:00
Michael Bayne c15f763ba0 It's a feature!
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1324 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-05-02 19:34:51 +00:00
Ray Greenwell 9503d37d90 added getResourceString() which actually gets the business from
the ResourceBundle, making this class easy to extend...


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1323 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-05-01 03:39:13 +00:00
Michael Bayne e13f354672 Oops, forgot that ResourceBundle throws a MissingResourceException rather
than returning null. Whee!


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1322 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-05-01 02:47:18 +00:00
Michael Bayne 3f91aed3aa Added code to allow the creation of custom message bundles to go along
with a particular bundle's translation files. Mainly so Ray can do his
funny business with the pirate message translations.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1321 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-05-01 02:45:00 +00:00
Michael Bayne d026daa466 Not to choke if we can't resolve a resource bundle.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1320 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-04-30 17:45:27 +00:00
Michael Bayne 4ec673e6c2 Localized chat! Server entities may now fake speak and tell messages that
are translated by the client upon receipt. We love to translate.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1319 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-04-30 17:27:30 +00:00
Michael Bayne 530a348890 Added tileImageDown().
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1318 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-04-30 02:14:13 +00:00
Ray Greenwell 0fe4f660a5 Let any object receive success/failure responses for a traversePortal
request.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1317 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-04-29 21:03:00 +00:00
Michael Bayne 6ecc381180 Added tileImageAcross().
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1316 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-04-29 01:12:54 +00:00
Michael Bayne dc5d23e3e4 Don't foolishly blow away a perfectly good set of object tile ids and
actions unless we're actually loaded into the editor and turned into a
real editable scene.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1315 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-04-28 03:14:15 +00:00
Michael Bayne d107dd790f If we have no clip, we need to repaint our whole bounds.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1314 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-04-28 02:50:32 +00:00
Michael Bayne b602cb4fce Modified frame manager to do the right thing in terms of repainting
everything if we lose our volatile offscreen buffer image.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1313 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-04-28 02:49:32 +00:00
Michael Bayne f79d048084 Create the lists and tables at construct time in case we never load up a
scene and are asked to look at that stuff.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1312 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-04-28 01:37:02 +00:00
Michael Bayne 7af3e3afdc Was preferring lowest not highest.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1311 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-04-28 01:30:10 +00:00
Michael Bayne 872e10f11d Catch IllegalArgumentException if it's thrown while we're loading our
images. The PNG loader seems to be kind enough to throw fucking runtime
exceptions when it encounters file format problems instead of throwing
IOException or some other declared exception.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1310 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-04-28 01:19:11 +00:00
Michael Bayne fad747e69e Updates to reflect changes to DisplayMisoScene.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1309 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-04-27 23:07:58 +00:00
Michael Bayne 4d62053e4d Check for tile intersection using the polygon's bounds rather than doing
the expensive polygon/rectangle intersection test (since we're doing 400
of these every frame).


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1308 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-04-27 23:07:41 +00:00
Michael Bayne b68d34e4e8 Use the width and height that we so handily obtained earlier.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1307 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-04-27 22:40:09 +00:00
Michael Bayne 46b6defc06 Removed some debug logging; tried the buffer strategy approach which won't
work because we're not painting everything on every frame, but left the
commented out alternative rendering code in there in case we want to
fiddle with it at a later date (or provide support for buffer strategies
for applications that do want to paint everything).


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1306 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-04-27 22:39:45 +00:00
Michael Bayne 116ce388ca Need to translate to the coordinates of the opaque parent we're
repainting, not necessarily the original component we're repainting.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1305 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-04-27 19:12:00 +00:00
Michael Bayne b9af18d10e We need to paint the first opaque parent of a dirty component rather than
the dirty component directly.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1304 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-04-27 18:59:55 +00:00
Michael Bayne 6a7fd11321 Try filling the offscreen buffer with a solid color after we create it to
avoid painting garbage to the screen.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1303 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-04-27 18:59:27 +00:00
Michael Bayne 938445071e Removed the last vestiges of the object "layer". Scenes now simply have a
list of objects, they can overlap (I think that objects added to a scene
later will be rendered before objects added earlier which ends up feeling
natural in the editor); no longer are objects ignored when their footprint
lies outside the scene bounds.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1302 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-04-27 18:41:14 +00:00
Michael Bayne f3131f994a Fixed up the test tiles (got rid of the last of Dave's old tiles) and
created a couple of test scenes using said test tiles so that we can run
the viewer.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1301 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-04-27 05:16:01 +00:00