AfflictionNetworks/vilya
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Yay for rabbit holes. Revamped the table services to decouple them from places.

Browse Source 
While I was in there, I extracted the communication between the client and the
TableManager into a new-style "embedded in the TableLobbyObject" service
instead of wonkily routing everything through the global ParlorService and the
ParlorProvider (which got merged into the ParlorManager as a part of this
rabbit holery). The GG build will break... I will fix it.


git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@255 c613c5cb-e716-0410-b11b-feb51c14d237
This commit is contained in:
Michael Bayne
2007-03-21 21:38:31 +00:00
parent f61250f75b
commit b71007a909
24 changed files with 936 additions and 793 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/as/com/threerings/parlor/client/ParlorService.as
-15
View File
@@ -24,10 +24,7 @@ package com.threerings.parlor.client {
import flash.utils.ByteArray;
import com.threerings.parlor.client.ParlorService;
import com.threerings.parlor.client.ParlorService_InviteListener;
import com.threerings.parlor.client.ParlorService_TableListener;
import com.threerings.parlor.data.ParlorMarshaller_InviteMarshaller;
import com.threerings.parlor.data.ParlorMarshaller_TableMarshaller;
import com.threerings.parlor.data.TableConfig;
import com.threerings.parlor.game.data.GameConfig;
import com.threerings.presents.client.Client;
import com.threerings.presents.client.InvocationService;
@@ -44,25 +41,13 @@ public interface ParlorService extends InvocationService
// from Java interface ParlorService
function cancel (arg1 :Client, arg2 :int, arg3 :InvocationService_InvocationListener) :void;
// from Java interface ParlorService
function createTable (arg1 :Client, arg2 :int, arg3 :TableConfig, arg4 :GameConfig, arg5 :ParlorService_TableListener) :void;
// from Java interface ParlorService
function invite (arg1 :Client, arg2 :Name, arg3 :GameConfig, arg4 :ParlorService_InviteListener) :void;
// from Java interface ParlorService
function joinTable (arg1 :Client, arg2 :int, arg3 :int, arg4 :int, arg5 :InvocationService_InvocationListener) :void;
// from Java interface ParlorService
function leaveTable (arg1 :Client, arg2 :int, arg3 :int, arg4 :InvocationService_InvocationListener) :void;
// from Java interface ParlorService
function respond (arg1 :Client, arg2 :int, arg3 :int, arg4 :Object, arg5 :InvocationService_InvocationListener) :void;
// from Java interface ParlorService
function startSolitaire (arg1 :Client, arg2 :GameConfig, arg3 :InvocationService_ConfirmListener) :void;
// from Java interface ParlorService
function startTableNow (arg1 :Client, arg2 :int, arg3 :int, arg4 :InvocationService_InvocationListener) :void;
}
}
src/as/com/threerings/parlor/client/ParlorService_InviteListener.as
-3
View File
@@ -26,10 +26,7 @@ import com.threerings.util.*; // for Float, Integer, etc.
import com.threerings.parlor.client.ParlorService;
import com.threerings.parlor.client.ParlorService_InviteListener;
import com.threerings.parlor.client.ParlorService_TableListener;
import com.threerings.parlor.data.ParlorMarshaller_InviteMarshaller;
import com.threerings.parlor.data.ParlorMarshaller_TableMarshaller;
import com.threerings.parlor.data.TableConfig;
import com.threerings.parlor.game.data.GameConfig;
import com.threerings.presents.client.Client;
import com.threerings.presents.client.InvocationService_ConfirmListener;
src/as/com/threerings/parlor/client/TableService.as
+51
View File
@@ -0,0 +1,51 @@
//
// $Id$
//
// Vilya library - tools for developing networked games
// Copyright (C) 2002-2007 Three Rings Design, Inc., All Rights Reserved
// http://www.threerings.net/code/vilya/
//
// This library is free software; you can redistribute it and/or modify it
// under the terms of the GNU Lesser General Public License as published
// by the Free Software Foundation; either version 2.1 of the License, or
// (at your option) any later version.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
// Lesser General Public License for more details.
//
// You should have received a copy of the GNU Lesser General Public
// License along with this library; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
package com.threerings.parlor.client {
import flash.utils.ByteArray;
import com.threerings.parlor.client.TableService;
import com.threerings.parlor.data.TableConfig;
import com.threerings.parlor.game.data.GameConfig;
import com.threerings.presents.client.Client;
import com.threerings.presents.client.InvocationService;
import com.threerings.presents.client.InvocationService_InvocationListener;
import com.threerings.presents.client.InvocationService_ResultListener;
import com.threerings.presents.data.InvocationMarshaller_ResultMarshaller;
/**
* An ActionScript version of the Java TableService interface.
*/
public interface TableService extends InvocationService
{
// from Java interface TableService
function createTable (arg1 :Client, arg2 :TableConfig, arg3 :GameConfig, arg4 :InvocationService_ResultListener) :void;
// from Java interface TableService
function joinTable (arg1 :Client, arg2 :int, arg3 :int, arg4 :InvocationService_InvocationListener) :void;
// from Java interface TableService
function leaveTable (arg1 :Client, arg2 :int, arg3 :InvocationService_InvocationListener) :void;
// from Java interface TableService
function startTableNow (arg1 :Client, arg2 :int, arg3 :InvocationService_InvocationListener) :void;
}
}
src/as/com/threerings/parlor/client/TableService_TableListener.as
+44
View File
@@ -0,0 +1,44 @@
//
// $Id$
//
// Vilya library - tools for developing networked games
// Copyright (C) 2002-2007 Three Rings Design, Inc., All Rights Reserved
// http://www.threerings.net/code/vilya/
//
// This library is free software; you can redistribute it and/or modify it
// under the terms of the GNU Lesser General Public License as published
// by the Free Software Foundation; either version 2.1 of the License, or
// (at your option) any later version.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
// Lesser General Public License for more details.
//
// You should have received a copy of the GNU Lesser General Public
// License along with this library; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
package com.threerings.parlor.client {
import flash.utils.ByteArray;
import com.threerings.util.*; // for Float, Integer, etc.
import com.threerings.parlor.client.TableService;
import com.threerings.parlor.client.TableService_TableListener;
import com.threerings.parlor.data.TableConfig;
import com.threerings.parlor.data.TableMarshaller_TableMarshaller;
import com.threerings.parlor.game.data.GameConfig;
import com.threerings.presents.client.Client;
import com.threerings.presents.client.InvocationService_InvocationListener;
/**
* An ActionScript version of the Java TableService_TableListener interface.
*/
public interface TableService_TableListener
extends InvocationService_InvocationListener
{
// from Java TableService_TableListener
function tableCreated (arg1 :int) :void
}
}
src/as/com/threerings/parlor/data/ParlorMarshaller.as
+3 -58
View File
@@ -26,10 +26,7 @@ import com.threerings.util.*; // for Float, Integer, etc.
import com.threerings.parlor.client.ParlorService;
import com.threerings.parlor.client.ParlorService_InviteListener;
import com.threerings.parlor.client.ParlorService_TableListener;
import com.threerings.parlor.data.ParlorMarshaller_InviteMarshaller;
import com.threerings.parlor.data.ParlorMarshaller_TableMarshaller;
import com.threerings.parlor.data.TableConfig;
import com.threerings.parlor.game.data.GameConfig;
import com.threerings.presents.client.Client;
import com.threerings.presents.client.InvocationService_ConfirmListener;
@@ -62,21 +59,8 @@ public class ParlorMarshaller extends InvocationMarshaller
]);
}
/** The method id used to dispatch {@link #createTable} requests. */
public static const CREATE_TABLE :int = 2;
// from interface ParlorService
public function createTable (arg1 :Client, arg2 :int, arg3 :TableConfig, arg4 :GameConfig, arg5 :ParlorService_TableListener) :void
{
var listener5 :ParlorMarshaller_TableMarshaller = new ParlorMarshaller_TableMarshaller();
listener5.listener = arg5;
sendRequest(arg1, CREATE_TABLE, [
Integer.valueOf(arg2), arg3, arg4, listener5
]);
}
/** The method id used to dispatch {@link #invite} requests. */
public static const INVITE :int = 3;
public static const INVITE :int = 2;
// from interface ParlorService
public function invite (arg1 :Client, arg2 :Name, arg3 :GameConfig, arg4 :ParlorService_InviteListener) :void
@@ -88,34 +72,8 @@ public class ParlorMarshaller extends InvocationMarshaller
]);
}
/** The method id used to dispatch {@link #joinTable} requests. */
public static const JOIN_TABLE :int = 4;
// from interface ParlorService
public function joinTable (arg1 :Client, arg2 :int, arg3 :int, arg4 :int, arg5 :InvocationService_InvocationListener) :void
{
var listener5 :InvocationMarshaller_ListenerMarshaller = new InvocationMarshaller_ListenerMarshaller();
listener5.listener = arg5;
sendRequest(arg1, JOIN_TABLE, [
Integer.valueOf(arg2), Integer.valueOf(arg3), Integer.valueOf(arg4), listener5
]);
}
/** The method id used to dispatch {@link #leaveTable} requests. */
public static const LEAVE_TABLE :int = 5;
// from interface ParlorService
public function leaveTable (arg1 :Client, arg2 :int, arg3 :int, arg4 :InvocationService_InvocationListener) :void
{
var listener4 :InvocationMarshaller_ListenerMarshaller = new InvocationMarshaller_ListenerMarshaller();
listener4.listener = arg4;
sendRequest(arg1, LEAVE_TABLE, [
Integer.valueOf(arg2), Integer.valueOf(arg3), listener4
]);
}
/** The method id used to dispatch {@link #respond} requests. */
public static const RESPOND :int = 6;
public static const RESPOND :int = 3;
// from interface ParlorService
public function respond (arg1 :Client, arg2 :int, arg3 :int, arg4 :Object, arg5 :InvocationService_InvocationListener) :void
@@ -128,7 +86,7 @@ public class ParlorMarshaller extends InvocationMarshaller
}
/** The method id used to dispatch {@link #startSolitaire} requests. */
public static const START_SOLITAIRE :int = 7;
public static const START_SOLITAIRE :int = 4;
// from interface ParlorService
public function startSolitaire (arg1 :Client, arg2 :GameConfig, arg3 :InvocationService_ConfirmListener) :void
@@ -139,18 +97,5 @@ public class ParlorMarshaller extends InvocationMarshaller
arg2, listener3
]);
}
/** The method id used to dispatch {@link #startTableNow} requests. */
public static const START_TABLE_NOW :int = 8;
// from interface ParlorService
public function startTableNow (arg1 :Client, arg2 :int, arg3 :int, arg4 :InvocationService_InvocationListener) :void
{
var listener4 :InvocationMarshaller_ListenerMarshaller = new InvocationMarshaller_ListenerMarshaller();
listener4.listener = arg4;
sendRequest(arg1, START_TABLE_NOW, [
Integer.valueOf(arg2), Integer.valueOf(arg3), listener4
]);
}
}
}
src/as/com/threerings/parlor/data/ParlorMarshaller_InviteMarshaller.as
-1
View File
@@ -26,7 +26,6 @@ import com.threerings.util.*; // for Float, Integer, etc.
import com.threerings.parlor.client.ParlorService;
import com.threerings.parlor.client.ParlorService_InviteListener;
import com.threerings.parlor.data.TableConfig;
import com.threerings.parlor.game.data.GameConfig;
import com.threerings.presents.client.Client;
import com.threerings.presents.client.InvocationService;
src/as/com/threerings/parlor/data/TableMarshaller.as
+99
View File
@@ -0,0 +1,99 @@
//
// $Id$
//
// Vilya library - tools for developing networked games
// Copyright (C) 2002-2007 Three Rings Design, Inc., All Rights Reserved
// http://www.threerings.net/code/vilya/
//
// This library is free software; you can redistribute it and/or modify it
// under the terms of the GNU Lesser General Public License as published
// by the Free Software Foundation; either version 2.1 of the License, or
// (at your option) any later version.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
// Lesser General Public License for more details.
//
// You should have received a copy of the GNU Lesser General Public
// License along with this library; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
package com.threerings.parlor.data {
import flash.utils.ByteArray;
import com.threerings.util.*; // for Float, Integer, etc.
import com.threerings.parlor.client.TableService;
import com.threerings.parlor.data.TableConfig;
import com.threerings.parlor.game.data.GameConfig;
import com.threerings.presents.client.Client;
import com.threerings.presents.client.InvocationService_InvocationListener;
import com.threerings.presents.client.InvocationService_ResultListener;
import com.threerings.presents.data.InvocationMarshaller;
import com.threerings.presents.data.InvocationMarshaller_ListenerMarshaller;
import com.threerings.presents.data.InvocationMarshaller_ResultMarshaller;
/**
* Provides the implementation of the {@link TableService} interface
* that marshalls the arguments and delivers the request to the provider
* on the server. Also provides an implementation of the response listener
* interfaces that marshall the response arguments and deliver them back
* to the requesting client.
*/
public class TableMarshaller extends InvocationMarshaller
implements TableService
{
/** The method id used to dispatch {@link #createTable} requests. */
public static const CREATE_TABLE :int = 1;
// from interface TableService
public function createTable (arg1 :Client, arg2 :TableConfig, arg3 :GameConfig, arg4 :InvocationService_ResultListener) :void
{
var listener4 :InvocationMarshaller_ResultMarshaller = new InvocationMarshaller_ResultMarshaller();
listener4.listener = arg4;
sendRequest(arg1, CREATE_TABLE, [
arg2, arg3, listener4
]);
}
/** The method id used to dispatch {@link #joinTable} requests. */
public static const JOIN_TABLE :int = 2;
// from interface TableService
public function joinTable (arg1 :Client, arg2 :int, arg3 :int, arg4 :InvocationService_InvocationListener) :void
{
var listener4 :InvocationMarshaller_ListenerMarshaller = new InvocationMarshaller_ListenerMarshaller();
listener4.listener = arg4;
sendRequest(arg1, JOIN_TABLE, [
Integer.valueOf(arg2), Integer.valueOf(arg3), listener4
]);
}
/** The method id used to dispatch {@link #leaveTable} requests. */
public static const LEAVE_TABLE :int = 3;
// from interface TableService
public function leaveTable (arg1 :Client, arg2 :int, arg3 :InvocationService_InvocationListener) :void
{
var listener3 :InvocationMarshaller_ListenerMarshaller = new InvocationMarshaller_ListenerMarshaller();
listener3.listener = arg3;
sendRequest(arg1, LEAVE_TABLE, [
Integer.valueOf(arg2), listener3
]);
}
/** The method id used to dispatch {@link #startTableNow} requests. */
public static const START_TABLE_NOW :int = 4;
// from interface TableService
public function startTableNow (arg1 :Client, arg2 :int, arg3 :InvocationService_InvocationListener) :void
{
var listener3 :InvocationMarshaller_ListenerMarshaller = new InvocationMarshaller_ListenerMarshaller();
listener3.listener = arg3;
sendRequest(arg1, START_TABLE_NOW, [
Integer.valueOf(arg2), listener3
]);
}
}
}
src/as/com/threerings/parlor/data/TableMarshaller_TableMarshaller.as
+59
View File
@@ -0,0 +1,59 @@
//
// $Id$
//
// Vilya library - tools for developing networked games
// Copyright (C) 2002-2007 Three Rings Design, Inc., All Rights Reserved
// http://www.threerings.net/code/vilya/
//
// This library is free software; you can redistribute it and/or modify it
// under the terms of the GNU Lesser General Public License as published
// by the Free Software Foundation; either version 2.1 of the License, or
// (at your option) any later version.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
// Lesser General Public License for more details.
//
// You should have received a copy of the GNU Lesser General Public
// License along with this library; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
package com.threerings.parlor.data {
import flash.utils.ByteArray;
import com.threerings.util.*; // for Float, Integer, etc.
import com.threerings.parlor.client.TableService;
import com.threerings.parlor.client.TableService_TableListener;
import com.threerings.parlor.data.TableConfig;
import com.threerings.parlor.game.data.GameConfig;
import com.threerings.presents.client.Client;
import com.threerings.presents.client.InvocationService;
import com.threerings.presents.data.InvocationMarshaller_ListenerMarshaller;
/**
* Marshalls instances of the TableService_TableMarshaller interface.
*/
public class TableMarshaller_TableMarshaller
extends InvocationMarshaller_ListenerMarshaller
{
/** The method id used to dispatch {@link #tableCreated} responses. */
public static const TABLE_CREATED :int = 1;
// from InvocationMarshaller_ListenerMarshaller
override public function dispatchResponse (methodId :int, args :Array) :void
{
switch (methodId) {
case TABLE_CREATED:
(listener as TableService_TableListener).tableCreated(
(args[0] as int));
return;
default:
super.dispatchResponse(methodId, args);
return;
}
}
}
}