Checkpoint, I've got an interactive 2d scene mostly working.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@4151 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Ray Greenwell
2006-05-26 21:54:34 +00:00
parent 9c33f1de53
commit fdfce50d01
20 changed files with 113 additions and 47 deletions
@@ -27,7 +27,7 @@ import com.threerings.presents.client.Client;
import com.threerings.presents.client.InvocationService;
import com.threerings.presents.client.InvocationListener;
import com.threerings.presents.data.InvocationMarshaller;
import com.threerings.presents.data.ListenerMarshaller;
import com.threerings.presents.data.InvocationMarshaller_ListenerMarshaller;
import com.threerings.presents.dobj.InvocationResponseEvent;
import com.threerings.util.Name;
@@ -56,7 +56,7 @@ public class ChatMarshaller extends InvocationMarshaller
// documentation inherited from interface
public function broadcast (arg1 :Client, arg2 :String, arg3 :InvocationListener) :void
{
var listener3 :ListenerMarshaller = new ListenerMarshaller();
var listener3 :InvocationMarshaller_ListenerMarshaller = new InvocationMarshaller_ListenerMarshaller();
listener3.listener = arg3;
sendRequest(arg1, BROADCAST, [ arg2, listener3 ]);
}
@@ -2,11 +2,11 @@ package com.threerings.crowd.chat.data {
import com.threerings.util.Long;
import com.threerings.presents.data.ListenerMarshaller;
import com.threerings.presents.data.InvocationMarshaller_ListenerMarshaller;
import com.threerings.crowd.chat.client.TellListener;
public class TellMarshaller extends ListenerMarshaller
public class TellMarshaller extends InvocationMarshaller_ListenerMarshaller
{
/** The method id used to dispatch {@link #tellSucceeded}
* responses. */
@@ -1,10 +1,10 @@
package com.threerings.crowd.data {
import com.threerings.presents.data.ListenerMarshaller;
import com.threerings.presents.data.InvocationMarshaller_ListenerMarshaller;
import com.threerings.crowd.client.MoveListener
public class LocationMarshaller_MoveMarshaller extends ListenerMarshaller
public class LocationMarshaller_MoveMarshaller extends InvocationMarshaller_ListenerMarshaller
{
/** The method id used to dispatch {@link #moveSucceeded}
* responses. */
@@ -63,7 +63,7 @@ public class OccupantInfo
public static const X_STATUS :Array = [ "active", "idle", "discon" ];
/** The body object id of this occupant (and our entry key). */
public var bodyOid :Integer;
public var bodyOid :int;
/** The username of this occupant. */
public var username :Name;
@@ -74,7 +74,7 @@ public class OccupantInfo
/** Access to the body object id as an int. */
public function getBodyOid () :int
{
return bodyOid.value;
return bodyOid;
}
// documentation inherited from interface DSet_Entry
@@ -86,7 +86,7 @@ public class OccupantInfo
// documentation inherited from superinterface Streamable
public function writeObject (out :ObjectOutputStream) :void
{
out.writeObject(bodyOid);
out.writeObject(new Integer(bodyOid));
out.writeObject(username);
out.writeByte(status);
}
@@ -94,7 +94,7 @@ public class OccupantInfo
// documentation inherited from superinterface Streamable
public function readObject (ins :ObjectInputStream) :void
{
bodyOid = (ins.readField(Integer) as Integer);
bodyOid = (ins.readField(Integer) as Integer).value;
username = (ins.readObject() as Name);
status = ins.readByte();
}