Commit Graph

46 Commits

Author SHA1 Message Date
Michael Bayne 3e4540958a Made occupant info into a simple streamable object because it was
screaming out for it.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1271 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-04-17 22:19:40 +00:00
Ray Greenwell a11bff9cf8 Allow objects such as a NPPirate to receive the results of a changeLoc
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1267 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-04-17 17:07:13 +00:00
Michael Bayne 4047bbbf18 Whoops. Missing an import.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1263 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-04-17 00:20:56 +00:00
Michael Bayne e4185bd7a1 Added getModel().
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1262 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-04-17 00:16:34 +00:00
Michael Bayne 85cdabbbee Added some imports that were needed for javadoc comment resolution that
became necesssary when *Codes were moved out of .client and into .data.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1247 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-04-15 18:06:20 +00:00
Walter Korman a97e9db978 Moved remaining client.*Codes classes into their respective data packages
as they are intended to represent codes shared between the client and the
server.  Made correspondingly necessary changes throughout.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1240 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-04-15 16:28:05 +00:00
Walter Korman 1415319aab Edited auxilliary -> auxiliary.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@923 542714f4-19e9-0310-aa3c-eee0fc999fb1
2002-02-03 08:22:38 +00:00
Michael Bayne 589915a9ee Clear out last known location id when we leave a scene as well.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@811 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-12-16 22:09:17 +00:00
Michael Bayne c8148d9ea0 Report whether or not a cluster speak request was issued.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@810 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-12-16 21:59:25 +00:00
Michael Bayne 2f6199cf06 Register our cluster chat objects with their own happy chat message type.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@809 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-12-16 21:47:37 +00:00
Michael Bayne 178639e0c8 Clear out our cluster chat object subscription when we leave a place and
added some checks to avoid sending cluster speak requests unless we
currently occupy a location that is in a cluster.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@806 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-12-16 21:23:27 +00:00
Michael Bayne 5082bb817f Added convenience functions for looking up a location by id and a location
index by id.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@805 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-12-16 21:22:31 +00:00
Michael Bayne 1c02c2d6f4 Got cluster chat support working. Made it an invocation service rather
than a place service (which may be changed back when place services
improve or I may change the main chat stuff to be an invocation service).


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@803 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-12-16 21:02:18 +00:00
Michael Bayne caa0da51f2 Clear out a user's previous location when they move to a new location or
flee the scene.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@800 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-12-16 08:07:53 +00:00
Michael Bayne c105a3d882 Pass an object manager to the provider at construct time and use that one
rather than accessing the one in WhirledServer.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@790 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-12-16 05:38:26 +00:00
Michael Bayne 769b2e8895 Blag! Both the ZoneDirector and the SpotSceneDirector needed to extend the
SceneDirector which, without multiple inheritance, would make it
impossible to use both in a single client. Of course, we need to use both
in Yohoho!

So I refactored the whole enchilada to delegate rather than extend, which
blows because various methods must now be made public and a particular
failure case for the moveTo request now requires that a special failure
handler interface be made available so that LocationDirector "extensions"
can inject themselves into the failure handling process.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@789 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-12-16 05:18:20 +00:00
Michael Bayne e7b7364141 Modified the way locations are assigned when entering a scene. The
SpotSceneManager now actually does the proper assignment in
populateOccupantInfo and it does so having been warned that a body is
entering via a particular location by the SpotProvider when it processes a
traversePortal request. If the user enters a scene via some other
mechanism (like a zoned moveTo request), they will be assigned to the
default entrance for the scene, which is what we want. We also avoid the
extra occupant update that was necessary with the previous method. Yay!


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@788 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-12-16 05:15:27 +00:00
Michael Bayne efd1a69caa Finished up implementation of portal traversal back-end.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@781 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-12-14 23:12:39 +00:00
Michael Bayne 9737db1e0e Need this to prevent circumvention (which is not quite as bad as
circumcision nor as fun as circumnavigation).


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@777 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-12-14 02:44:10 +00:00
Michael Bayne 8e27b7e740 Wired up rest of location change stuff.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@776 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-12-14 01:51:46 +00:00
Michael Bayne a38684db5e Beginnings of Spot invocation services to allow moving between locations,
tracking and reporting locations of bodies within a scene and handling
chatting between users in a cluster. Other minor cleanups.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@774 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-12-14 00:12:32 +00:00
Michael Bayne 3af0d8b1ee Added support for cloning scene models (we love doing multiple inheritance
by hand!).


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@754 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-12-12 02:47:17 +00:00
Michael Bayne 509fb5c47e Was missing the name attribute.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@752 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-12-07 05:14:57 +00:00
Michael Bayne 7831d150e5 If there are no target scene or portal names, don't write them out. Also
fixed naming of <portal> element.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@751 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-12-07 05:11:25 +00:00
Michael Bayne 548acf53e8 Have to update _nextLocationId when a location is added, in case its
location id is bigger than the biggest we've seen.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@750 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-12-07 02:10:14 +00:00
Michael Bayne 14b9708e9e Added facilities for obtaining a valid location id from the scene because
it's the one that knows which location ids are in use.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@748 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-12-05 09:20:10 +00:00
Michael Bayne 7fcc918797 The fancy equals() turned out not to be useful based on the semantics of
List.indexOf(), etc.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@747 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-12-05 09:14:29 +00:00
Michael Bayne fba773c4a2 Make Location.equals() do fancy stuff to make life easier elsewhere.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@746 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-12-05 09:06:30 +00:00
Michael Bayne 2c27824718 Sweet Mary, mother of Jesus! Another fucking refactor. It turns out that
the way I was doing inheritance between the display and editable scene
implementations was not copacetic. The new method (which is for every
editable scene impl to delegate to a display scene impl so that regardless
of how far along you are on the inheritance chain, there are only ever two
actual objects, the display impl and the editable impl) is somewhat
cleaner, but makes it clear that no method can work as nicely as it would
were we to have mutliple inheritance.

The basic problem is that the editable versions of the scenes have to be
able to manipulate the instance variables in the display versions of the
scenes because they have to keep them up to date so that they are
displaying the right thing. As the editable versions are in different
packages, they don't have access to the display instance variables, so the
display versions simply have to make available enough "editable"
functionality to allow the editable versions to get their job done. It's
more coupling that I'd like, but at least it's only between the display
and editable versions across the inheritance hierarchy rather than down
the hierarchy.

Blah.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@745 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-12-05 08:45:06 +00:00
Michael Bayne 7c60cb5df2 Comment edit.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@744 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-12-05 07:38:54 +00:00
Michael Bayne a8e66a4191 Modified scene writer code.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@742 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-12-05 04:45:13 +00:00
Michael Bayne 3af703d31b Minor edit.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@741 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-12-05 03:49:29 +00:00
Michael Bayne 7e415d9655 Documentation update.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@740 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-12-05 03:40:32 +00:00
Michael Bayne dd69489de4 More scene and spot scene refactoring. Got parsers working for those in
the new new style (or was that the new new new style).


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@739 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-12-05 03:38:10 +00:00
Michael Bayne 7dfff1decb Editable mania! I love to delegate.
Augmented standard scene and spot scene models with versions that provide
access to data only needed by the editor and loader. Filtered that whole
paradigm down through the locations and portals and all that.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@737 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-12-04 22:34:04 +00:00
Michael Bayne 1c823ae349 Updates related to non-global-uniquifying location ids.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@721 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-12-03 19:40:11 +00:00
Michael Bayne 2c303a6e91 Added toString().
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@680 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-11-29 19:32:06 +00:00
Michael Bayne 4134683a40 Created rulesets for parsing scene models.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@679 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-11-29 19:31:52 +00:00
Michael Bayne ef487a6ae1 Javadoc fix.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@676 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-11-29 06:38:35 +00:00
Michael Bayne 6bbce232b4 Implemented and/or cleaned up the XML scene writers.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@675 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-11-29 06:36:29 +00:00
Michael Bayne f6888abcb1 Added a means by which to create blank spot scene models.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@665 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-11-29 00:16:46 +00:00
Michael Bayne 573b9821cd Added a name for use in the editor and in XML files.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@664 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-11-29 00:16:31 +00:00
Michael Bayne cdc4adfca8 Added getDefaultEntranceId().
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@663 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-11-29 00:16:11 +00:00
Michael Bayne 816fc6172f Missed a spot. Ha ha, ha ha ha ha ha! Sorry. Pardon the pun.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@631 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-11-20 04:18:11 +00:00
Michael Bayne e82bc2b4fe Beginnings of Spot services.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@618 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-11-13 02:25:36 +00:00
Michael Bayne 17281a9db3 We love to document. Provided an initial description of what services the
whirled.spot package will provide and created a Log class for the package.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@617 542714f4-19e9-0310-aa3c-eee0fc999fb1
2001-11-13 00:12:20 +00:00