Compare commits
32 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Michael Bayne
|
5e885e420f | ||
|
Michael Bayne
|
d6c4b07e2f | ||
|
Ray Greenwell
|
0fe0305630 | ||
|
Charlie Groves
|
e94bae4638 | ||
|
Par Winzell
|
3f2fad7750 | ||
|
Charlie Groves
|
ea5fee9091 | ||
|
Charlie Groves
|
9a4d1b666c | ||
|
Charlie Groves
|
12d0a938cf | ||
|
Bruno Garcia
|
9419a58b87 | ||
|
Dave Hoover
|
563ba5ed8b | ||
|
Dave Hoover
|
df618d3e0e | ||
|
Dave Hoover
|
41ecb334ba | ||
|
Dave Hoover
|
d905cbef7a | ||
|
Dave Hoover
|
ac7d98a29e | ||
|
Dave Hoover
|
d59010a276 | ||
|
Par Winzell
|
be0fa3dd2e | ||
|
Andrzej Kapolka
|
59a3e8bcaf | ||
|
Michael Bayne
|
5750084ad2 | ||
|
Michael Bayne
|
859d35c4f5 | ||
|
Ray Greenwell
|
54b90b386c | ||
|
Charlie Groves
|
46c1af7015 | ||
|
Michael Bayne
|
7a24f0c30f | ||
|
Michael Bayne
|
ad765f002d | ||
|
Michael Bayne
|
afa7ed0adb | ||
|
Michael Bayne
|
b57c4092ea | ||
|
Michael Bayne
|
7f339bede3 | ||
|
Michael Bayne
|
d272c17b7b | ||
|
Michael Bayne
|
01071e1ed2 | ||
|
Michael Bayne
|
2a19ae07c8 | ||
|
Michael Bayne
|
e83a57e57a | ||
|
Michael Bayne
|
8ed475b322 | ||
|
Michael Bayne
|
31ad60b04c |
-10
@@ -1,10 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<classpath>
|
||||
<classpathentry kind="src" output="target/classes" path="src/main/java"/>
|
||||
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
|
||||
<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
|
||||
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
|
||||
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
|
||||
<classpathentry kind="output" path="target/classes"/>
|
||||
</classpath>
|
||||
@@ -1,23 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<projectDescription>
|
||||
<name>vilya</name>
|
||||
<comment></comment>
|
||||
<projects>
|
||||
</projects>
|
||||
<buildSpec>
|
||||
<buildCommand>
|
||||
<name>org.eclipse.jdt.core.javabuilder</name>
|
||||
<arguments>
|
||||
</arguments>
|
||||
</buildCommand>
|
||||
<buildCommand>
|
||||
<name>org.maven.ide.eclipse.maven2Builder</name>
|
||||
<arguments>
|
||||
</arguments>
|
||||
</buildCommand>
|
||||
</buildSpec>
|
||||
<natures>
|
||||
<nature>org.maven.ide.eclipse.maven2Nature</nature>
|
||||
<nature>org.eclipse.jdt.core.javanature</nature>
|
||||
</natures>
|
||||
</projectDescription>
|
||||
@@ -1,6 +0,0 @@
|
||||
#Thu Dec 09 14:25:50 PST 2010
|
||||
eclipse.preferences.version=1
|
||||
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
|
||||
org.eclipse.jdt.core.compiler.compliance=1.5
|
||||
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
|
||||
org.eclipse.jdt.core.compiler.source=1.5
|
||||
@@ -1,8 +0,0 @@
|
||||
#Thu Dec 09 14:25:25 PST 2010
|
||||
activeProfiles=
|
||||
eclipse.preferences.version=1
|
||||
fullBuildGoals=process-test-resources
|
||||
resolveWorkspaceProjects=true
|
||||
resourceFilterGoals=process-resources resources\:testResources
|
||||
skipCompilerPlugin=true
|
||||
version=1
|
||||
@@ -1,59 +0,0 @@
|
||||
The Vilya library
|
||||
-----------------
|
||||
|
||||
The Vilya library provides various facilities for making networked multiplayer
|
||||
games. Its various packages include:
|
||||
|
||||
* whirled - builds on the crowd framework and defines a scene graph with
|
||||
portals to move between scenes and provides hooks for distributing and
|
||||
updating scene data (for example isometric rendering information) over
|
||||
the network
|
||||
* parlor - builds upon the crowd framework to create the notion of a
|
||||
game with players and provides tools for making turn based games
|
||||
* puzzle - builds on the parlor and media frameworks to provide tools
|
||||
for implementing puzzle games in a networked environment
|
||||
* micasa - builds on the parlor framework to provide lobbies and
|
||||
matchmaking for multiplayer games
|
||||
|
||||
Documentation is somewhat sparse at the moment, but inspection of the code in
|
||||
the tests/ directory shows examples of use of many features of the library.
|
||||
|
||||
Building
|
||||
--------
|
||||
|
||||
Building the library is very simple. First ensure that the necessary third
|
||||
party jar files are available in the lib/ directory. See lib/README for a list
|
||||
of the necessary third party jar files and how to get them.
|
||||
|
||||
The library is built using Ant, a modern build tool written in and for Java. If
|
||||
you aren't already using Ant for other projects, it can be found here:
|
||||
|
||||
http://ant.apache.org/
|
||||
|
||||
Invoke ant with any of the following targets:
|
||||
|
||||
all: builds the distribution files and javadoc documentation
|
||||
compile: builds only the class files (dist/classes)
|
||||
javadoc: builds only the javadoc documentation (dist/docs)
|
||||
dist: builds the distribution jar files (dist/*.jar)
|
||||
|
||||
Distribution
|
||||
------------
|
||||
|
||||
The Vilya library is released under the LGPL. The most recent version of the
|
||||
library is available here:
|
||||
|
||||
http://code.google.com/p/vilya
|
||||
|
||||
Contributions and Contact Information
|
||||
-------------------------------------
|
||||
|
||||
Vilya is actively developed by the scurvy dogs at Three Rings Design, Inc.
|
||||
Contributions are welcome.
|
||||
|
||||
Questions, comments, contributions, and other worldly endeavors can be
|
||||
handled in the Google Group for Three Rings libraries:
|
||||
|
||||
http://groups.google.com/group/ooo-libs
|
||||
|
||||
$Id$
|
||||
@@ -0,0 +1,83 @@
|
||||
The Vilya library
|
||||
=================
|
||||
|
||||
The Vilya library provides various facilities for making networked multiplayer
|
||||
games. Its various packages include:
|
||||
|
||||
* [whirled] - builds on the crowd framework and defines a scene graph with
|
||||
portals to move between scenes and provides hooks for distributing and
|
||||
updating scene data (for example isometric rendering information) over the
|
||||
network
|
||||
* [parlor] - builds upon the crowd framework to create the notion of a game with
|
||||
players and provides tools for making turn based games
|
||||
* [puzzle] - builds on the parlor and media frameworks to provide tools for
|
||||
implementing puzzle games in a networked environment
|
||||
* [micasa] - builds on the parlor framework to provide lobbies and matchmaking
|
||||
for multiplayer games
|
||||
|
||||
[Javadoc documentation](http://threerings.github.com/vilya/apidocs/) is provided.
|
||||
|
||||
Tutorial-style documentation is somewhat sparse at the moment, but inspection
|
||||
of the code in the `src/test/java/` directory shows examples of use of many
|
||||
features of the library.
|
||||
|
||||
Building
|
||||
--------
|
||||
|
||||
The library is built using [Ant](http://ant.apache.org/).
|
||||
|
||||
Invoke ant with any of the following targets:
|
||||
|
||||
all: builds the distribution files and javadoc documentation
|
||||
compile: builds only the class files (dist/classes)
|
||||
javadoc: builds only the javadoc documentation (dist/docs)
|
||||
dist: builds the distribution jar files (dist/*.jar)
|
||||
|
||||
Artifacts
|
||||
---------
|
||||
|
||||
A Maven repository containing released versions of the Vilya Java and
|
||||
ActionScript artifacts are maintained here. To add a Vilya dependency to a
|
||||
Maven project, add the following to your `pom.xml`:
|
||||
|
||||
<repositories>
|
||||
<repository>
|
||||
<id>ooo-repo</id>
|
||||
<url>http://threerings.github.com/maven-repo</url>
|
||||
</repository>
|
||||
</repositories>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>com.threerings</groupId>
|
||||
<artifactId>vilya</artifactId>
|
||||
<version>1.3</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
To add it to an Ivy, SBT, or other Maven repository using project, simply
|
||||
remove the vast majority of the boilerplate above.
|
||||
|
||||
If you prefer to download pre-built binaries, those can be had here:
|
||||
|
||||
* [vilya-1.3.jar](http://threerings.github.com/maven-repo/com/threerings/vilya/1.3/vilya-1.3.jar)
|
||||
* [vilyalib-1.3.swc](http://threerings.github.com/maven-repo/com/threerings/vilyalib/1.3/vilyalib-1.3.swc)
|
||||
|
||||
Distribution
|
||||
------------
|
||||
|
||||
The Vilya library is released under the LGPL. The most recent version of the
|
||||
library is available at http://github.com/threerings/vilya
|
||||
|
||||
Contact
|
||||
-------
|
||||
|
||||
Questions, comments, and other worldly endeavors can be handled via the [Three
|
||||
Rings Libraries](http://groups.google.com/group/ooo-libs) Google Group.
|
||||
|
||||
Vilya is actively developed by the scurvy dogs at
|
||||
[Three Rings](http://www.threerings.net) Contributions are welcome.
|
||||
|
||||
[whirled]: http://threerings.github.com/vilya/apidocs/com/threerings/whirled/package-summary.html
|
||||
[parlor]: http://threerings.github.com/vilya/apidocs/com/threerings/parlor/package-summary.html
|
||||
[puzzle]: http://threerings.github.com/vilya/apidocs/com/threerings/puzzle/package-summary.html
|
||||
[micasa]: http://threerings.github.com/vilya/apidocs/com/threerings/micasa/package-summary.html
|
||||
@@ -1,13 +1,13 @@
|
||||
<?xml version="1.0" standalone="yes"?>
|
||||
<project name="vilya" default="compile" basedir="." xmlns:artifact="urn:maven-artifact-ant">
|
||||
<property name="deploy.dir" value="dist"/>
|
||||
<property name="src.dir" value="src/main/java"/>
|
||||
<property name="asrc.dir" value="src/main/as"/>
|
||||
<property name="tsrc.dir" value="src/test/java"/>
|
||||
<property name="classes.dir" value="${deploy.dir}/classes"/>
|
||||
<property name="tclasses.dir" value="${deploy.dir}/test-classes"/>
|
||||
<property name="deploy.dir" location="dist"/>
|
||||
<property name="src.dir" location="src/main/java"/>
|
||||
<property name="asrc.dir" location="src/main/as"/>
|
||||
<property name="tsrc.dir" location="src/test/java"/>
|
||||
<property name="classes.dir" location="${deploy.dir}/classes"/>
|
||||
<property name="tclasses.dir" location="${deploy.dir}/test-classes"/>
|
||||
|
||||
<property name="ooo-build.vers" value="2.1"/>
|
||||
<property name="ooo-build.vers" value="2.5"/>
|
||||
<ant antfile="etc/bootstrap.xml"/>
|
||||
<import file="${user.home}/.m2/ooo-build/${ooo-build.vers}/ooo-build.xml"/>
|
||||
|
||||
@@ -29,7 +29,7 @@
|
||||
|
||||
<target name="-preptools" depends="-prepare">
|
||||
<artifact:dependencies pathId="tools.classpath">
|
||||
<dependency groupId="com.threerings" artifactId="narya-tools" version="1.8-SNAPSHOT"/>
|
||||
<dependency groupId="com.threerings" artifactId="narya-tools" version="1.9"/>
|
||||
</artifact:dependencies>
|
||||
<taskdef resource="com/threerings/presents/tools.properties" classpathref="tools.classpath"/>
|
||||
</target>
|
||||
|
||||
+13
-20
@@ -1,11 +1,14 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>com.threerings</groupId>
|
||||
<artifactId>vilyalib</artifactId>
|
||||
<packaging>swc</packaging>
|
||||
<version>1.3</version>
|
||||
<name>vilya</name>
|
||||
<version>1.4-SNAPSHOT</version>
|
||||
|
||||
<name>Vilya for ActionScript</name>
|
||||
<description>Facilities for making networked multiplayer games.</description>
|
||||
<url>http://code.google.com/p/vilya/</url>
|
||||
<issueManagement>
|
||||
@@ -24,32 +27,22 @@
|
||||
</repositories>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>com.threerings</groupId>
|
||||
<artifactId>aspirin</artifactId>
|
||||
<version>1.6</version>
|
||||
<scope>compile</scope>
|
||||
<type>swc</type>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>as3isolib</groupId>
|
||||
<artifactId>as3isolib-fp9</artifactId>
|
||||
<version>r298</version>
|
||||
<scope>compile</scope>
|
||||
<type>swc</type>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.threerings</groupId>
|
||||
<artifactId>naryalib</artifactId>
|
||||
<version>1.8</version>
|
||||
<scope>compile</scope>
|
||||
<version>1.9</version>
|
||||
<type>swc</type>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.threerings</groupId>
|
||||
<artifactId>nenyalib</artifactId>
|
||||
<version>1.2</version>
|
||||
<scope>compile</scope>
|
||||
<type>swc</type>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>as3isolib</groupId>
|
||||
<artifactId>as3isolib-fp9</artifactId>
|
||||
<version>r298</version>
|
||||
<type>swc</type>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
@@ -1,23 +1,24 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>com.threerings</groupId>
|
||||
<artifactId>vilya</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
<version>1.3</version>
|
||||
<name>vilya</name>
|
||||
<description>Facilities for making networked multiplayer games.</description>
|
||||
<url>http://code.google.com/p/vilya/</url>
|
||||
<issueManagement>
|
||||
<url>http://code.google.com/p/vilya/issues/list</url>
|
||||
</issueManagement>
|
||||
|
||||
<parent>
|
||||
<groupId>org.sonatype.oss</groupId>
|
||||
<artifactId>oss-parent</artifactId>
|
||||
<version>5</version>
|
||||
<version>7</version>
|
||||
</parent>
|
||||
|
||||
<groupId>com.threerings</groupId>
|
||||
<artifactId>vilya</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
<version>1.4</version>
|
||||
|
||||
<name>Vilya</name>
|
||||
<description>Facilities for making networked multiplayer games.</description>
|
||||
<url>http://github.com/threerings/vilya/</url>
|
||||
<issueManagement>
|
||||
<url>http://github.com/threerings/vilya/issues</url>
|
||||
</issueManagement>
|
||||
|
||||
<licenses>
|
||||
<license>
|
||||
<name>GNU Lesser General Public License (LGPL), Version 2.1</name>
|
||||
@@ -35,85 +36,86 @@
|
||||
</developers>
|
||||
|
||||
<scm>
|
||||
<connection>scm:svn:http://vilya.googlecode.com/svn/tags/vilya-1.3</connection>
|
||||
<developerConnection>scm:svn:svn+ssh://src.earth.threerings.net/vilya/tags/vilya-1.3</developerConnection>
|
||||
<url>http://vilya.googlecode.com/svn/tags/vilya-1.3</url>
|
||||
<connection>scm:git:git://github.com/threerings/vilya.git/tags/vilya-1.4</connection>
|
||||
<developerConnection>scm:svn:svn+ssh://src.earth.threerings.net/vilya/tags/vilya-1.4</developerConnection>
|
||||
<url>http://github.com/threerings/vilya/tags/vilya-1.4</url>
|
||||
</scm>
|
||||
|
||||
<repositories>
|
||||
<repository>
|
||||
<id>ooo-repo</id>
|
||||
<url>http://threerings.github.com/maven-repo</url>
|
||||
</repository>
|
||||
</repositories>
|
||||
|
||||
<dependencies>
|
||||
<!-- exported dependencies -->
|
||||
<dependency>
|
||||
<groupId>com.google.guava</groupId>
|
||||
<artifactId>guava</artifactId>
|
||||
<version>r07</version>
|
||||
<scope>compile</scope>
|
||||
<version>10.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.google.inject</groupId>
|
||||
<artifactId>guice</artifactId>
|
||||
<version>2.0</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.samskivert</groupId>
|
||||
<artifactId>samskivert</artifactId>
|
||||
<version>1.3</version>
|
||||
<scope>compile</scope>
|
||||
<version>1.5</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.threerings</groupId>
|
||||
<artifactId>narya</artifactId>
|
||||
<version>1.8</version>
|
||||
<scope>compile</scope>
|
||||
<version>1.9</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.threerings</groupId>
|
||||
<artifactId>nenya</artifactId>
|
||||
<version>1.2</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>javax.annotation</groupId>
|
||||
<artifactId>jsr250-api</artifactId>
|
||||
<version>1.0</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
|
||||
<!-- optional dependencies -->
|
||||
<dependency>
|
||||
<groupId>commons-digester</groupId>
|
||||
<artifactId>commons-digester</artifactId>
|
||||
<version>2.0</version>
|
||||
<scope>compile</scope>
|
||||
<optional>true</optional>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.samskivert</groupId>
|
||||
<artifactId>depot</artifactId>
|
||||
<version>1.2</version>
|
||||
<scope>compile</scope>
|
||||
<version>1.5</version>
|
||||
<optional>true</optional>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>javassist</groupId>
|
||||
<artifactId>javassist</artifactId>
|
||||
<version>3.8.0.GA</version>
|
||||
<scope>compile</scope>
|
||||
<optional>true</optional>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.megginson.sax</groupId>
|
||||
<artifactId>xml-writer</artifactId>
|
||||
<version>0.2</version>
|
||||
<scope>compile</scope>
|
||||
<optional>true</optional>
|
||||
</dependency>
|
||||
|
||||
<!-- test dependencies -->
|
||||
<dependency>
|
||||
<groupId>junit</groupId>
|
||||
<artifactId>junit</artifactId>
|
||||
<version>4.8.1</version>
|
||||
<version>4.10</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
@@ -146,11 +148,10 @@
|
||||
<quiet>true</quiet>
|
||||
<show>public</show>
|
||||
<links>
|
||||
<link>http://samskivert.googlecode.com/svn/apidocs/</link>
|
||||
<link>http://samskivert.github.com/samskivert/apidocs/</link>
|
||||
<link>http://depot.googlecode.com/svn/apidocs/</link>
|
||||
<link>http://guava-libraries.googlecode.com/svn/trunk/javadoc/</link>
|
||||
<link>http://docs.guava-libraries.googlecode.com/git/javadoc/</link>
|
||||
<link>http://google-web-toolkit.googlecode.com/svn/javadoc/2.1/</link>
|
||||
<link>http://evgeny-goldin.org/ant/api/</link>
|
||||
</links>
|
||||
</configuration>
|
||||
</plugin>
|
||||
@@ -183,6 +184,36 @@
|
||||
<version>2.5</version>
|
||||
</plugin>
|
||||
</plugins>
|
||||
<pluginManagement>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<!-- Tell m2eclipse to ignore the enforcer plugin from our parent. Otherwise it warns
|
||||
about not being able to run it. -->
|
||||
<groupId>org.eclipse.m2e</groupId>
|
||||
<artifactId>lifecycle-mapping</artifactId>
|
||||
<version>1.0.0</version>
|
||||
<configuration>
|
||||
<lifecycleMappingMetadata>
|
||||
<pluginExecutions>
|
||||
<pluginExecution>
|
||||
<pluginExecutionFilter>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-enforcer-plugin</artifactId>
|
||||
<versionRange>[1.0,)</versionRange>
|
||||
<goals>
|
||||
<goal>enforce</goal>
|
||||
</goals>
|
||||
</pluginExecutionFilter>
|
||||
<action>
|
||||
<ignore />
|
||||
</action>
|
||||
</pluginExecution>
|
||||
</pluginExecutions>
|
||||
</lifecycleMappingMetadata>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</pluginManagement>
|
||||
</build>
|
||||
|
||||
<profiles>
|
||||
|
||||
@@ -27,8 +27,6 @@ import com.threerings.io.ObjectOutputStream;
|
||||
import com.threerings.util.Byte;
|
||||
import com.threerings.util.Comparable;
|
||||
import com.threerings.util.Hashable;
|
||||
import com.threerings.util.Integer;
|
||||
import com.threerings.util.Joiner;
|
||||
|
||||
import com.threerings.presents.dobj.DSet;
|
||||
import com.threerings.presents.dobj.DSet_Entry;
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
|
||||
package com.threerings.parlor.card.data {
|
||||
|
||||
import com.threerings.util.ArrayUtil;
|
||||
import com.threerings.util.Arrays;
|
||||
import com.threerings.util.StreamableArrayList;
|
||||
|
||||
/**
|
||||
@@ -101,7 +101,7 @@ public class Deck extends StreamableArrayList
|
||||
*/
|
||||
public function shuffle () :void
|
||||
{
|
||||
ArrayUtil.shuffle(_array);
|
||||
Arrays.shuffle(_array);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -22,10 +22,11 @@
|
||||
package com.threerings.parlor.card.trick.client {
|
||||
|
||||
import com.threerings.io.TypedArray;
|
||||
import com.threerings.parlor.card.data.Card;
|
||||
import com.threerings.presents.client.Client;
|
||||
|
||||
import com.threerings.presents.client.InvocationService;
|
||||
|
||||
import com.threerings.parlor.card.data.Card;
|
||||
|
||||
/**
|
||||
* An ActionScript version of the Java TrickCardGameService interface.
|
||||
*/
|
||||
|
||||
@@ -22,11 +22,13 @@
|
||||
package com.threerings.parlor.card.trick.data {
|
||||
|
||||
import com.threerings.io.TypedArray;
|
||||
|
||||
import com.threerings.util.Integer;
|
||||
|
||||
import com.threerings.presents.data.InvocationMarshaller;
|
||||
|
||||
import com.threerings.parlor.card.data.Card;
|
||||
import com.threerings.parlor.card.trick.client.TrickCardGameService;
|
||||
import com.threerings.presents.client.Client;
|
||||
import com.threerings.presents.data.InvocationMarshaller;
|
||||
import com.threerings.util.Integer;
|
||||
|
||||
/**
|
||||
* Provides the implementation of the <code>TrickCardGameService</code> interface
|
||||
|
||||
@@ -21,19 +21,13 @@
|
||||
|
||||
package com.threerings.parlor.client {
|
||||
|
||||
import mx.containers.Grid;
|
||||
|
||||
import mx.controls.CheckBox;
|
||||
import mx.controls.ComboBox;
|
||||
import mx.controls.Label;
|
||||
|
||||
import com.threerings.flex.GridUtil;
|
||||
|
||||
import com.threerings.parlor.data.RangeParameter;
|
||||
import com.threerings.parlor.data.TableConfig;
|
||||
import com.threerings.parlor.data.ToggleParameter;
|
||||
import com.threerings.parlor.util.ParlorContext;
|
||||
|
||||
import com.threerings.parlor.game.client.FlexGameConfigurator;
|
||||
import com.threerings.parlor.game.data.GameConfig;
|
||||
|
||||
|
||||
@@ -21,10 +21,12 @@
|
||||
|
||||
package com.threerings.parlor.client {
|
||||
|
||||
import com.threerings.util.Name;
|
||||
|
||||
import com.threerings.presents.client.InvocationDecoder;
|
||||
|
||||
import com.threerings.parlor.client.ParlorReceiver;
|
||||
import com.threerings.parlor.game.data.GameConfig;
|
||||
import com.threerings.presents.client.InvocationDecoder;
|
||||
import com.threerings.util.Name;
|
||||
|
||||
/**
|
||||
* Dispatches calls to a {@link ParlorReceiver} instance.
|
||||
|
||||
@@ -21,10 +21,10 @@
|
||||
|
||||
package com.threerings.parlor.client {
|
||||
|
||||
import com.threerings.util.ArrayUtil;
|
||||
import com.threerings.util.Arrays;
|
||||
import com.threerings.util.Log;
|
||||
import com.threerings.util.Map;
|
||||
import com.threerings.util.Maps;
|
||||
import com.threerings.util.Log;
|
||||
import com.threerings.util.Name;
|
||||
|
||||
import com.threerings.presents.client.BasicDirector;
|
||||
@@ -93,7 +93,7 @@ public class ParlorDirector extends BasicDirector
|
||||
*/
|
||||
public function removeGameReadyObserver (observer :GameReadyObserver) :void
|
||||
{
|
||||
ArrayUtil.removeFirst(_grobs, observer);
|
||||
Arrays.removeFirst(_grobs, observer);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -21,12 +21,13 @@
|
||||
|
||||
package com.threerings.parlor.client {
|
||||
|
||||
import com.threerings.parlor.game.data.GameConfig;
|
||||
import com.threerings.presents.client.Client;
|
||||
import com.threerings.util.Name;
|
||||
|
||||
import com.threerings.presents.client.InvocationService;
|
||||
import com.threerings.presents.client.InvocationService_ConfirmListener;
|
||||
import com.threerings.presents.client.InvocationService_InvocationListener;
|
||||
import com.threerings.util.Name;
|
||||
|
||||
import com.threerings.parlor.game.data.GameConfig;
|
||||
|
||||
/**
|
||||
* An ActionScript version of the Java ParlorService interface.
|
||||
|
||||
@@ -21,11 +21,9 @@
|
||||
|
||||
package com.threerings.parlor.client {
|
||||
|
||||
import com.threerings.parlor.util.ParlorContext;
|
||||
|
||||
import com.threerings.parlor.data.TableConfig;
|
||||
|
||||
import com.threerings.parlor.game.client.GameConfigurator;
|
||||
import com.threerings.parlor.util.ParlorContext;
|
||||
|
||||
/**
|
||||
* This should be implemented some user-interface element that allows
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
|
||||
package com.threerings.parlor.client {
|
||||
|
||||
import com.threerings.util.ArrayUtil;
|
||||
import com.threerings.util.Arrays;
|
||||
import com.threerings.util.Log;
|
||||
import com.threerings.util.Name;
|
||||
import com.threerings.util.ObserverList;
|
||||
@@ -31,7 +31,6 @@ import com.threerings.presents.client.BasicDirector;
|
||||
import com.threerings.presents.client.Client;
|
||||
import com.threerings.presents.client.ClientEvent;
|
||||
import com.threerings.presents.client.InvocationService_ResultListener;
|
||||
|
||||
import com.threerings.presents.dobj.DObject;
|
||||
import com.threerings.presents.dobj.EntryAddedEvent;
|
||||
import com.threerings.presents.dobj.EntryRemovedEvent;
|
||||
@@ -39,7 +38,6 @@ import com.threerings.presents.dobj.EntryUpdatedEvent;
|
||||
import com.threerings.presents.dobj.SetListener;
|
||||
|
||||
import com.threerings.crowd.data.BodyObject;
|
||||
import com.threerings.crowd.data.PlaceObject;
|
||||
|
||||
import com.threerings.parlor.data.Table;
|
||||
import com.threerings.parlor.data.TableConfig;
|
||||
@@ -376,7 +374,7 @@ public class TableDirector extends BasicDirector
|
||||
|
||||
// look for our username in the players array
|
||||
var self :BodyObject = (_pctx.getClient().getClientObject() as BodyObject);
|
||||
if (ArrayUtil.contains(table.players, self.getVisibleName())) {
|
||||
if (Arrays.contains(table.players, self.getVisibleName())) {
|
||||
_ourTable = table;
|
||||
}
|
||||
|
||||
|
||||
@@ -21,13 +21,14 @@
|
||||
|
||||
package com.threerings.parlor.client {
|
||||
|
||||
import com.threerings.parlor.data.TableConfig;
|
||||
import com.threerings.parlor.game.data.GameConfig;
|
||||
import com.threerings.presents.client.Client;
|
||||
import com.threerings.util.Name;
|
||||
|
||||
import com.threerings.presents.client.InvocationService;
|
||||
import com.threerings.presents.client.InvocationService_InvocationListener;
|
||||
import com.threerings.presents.client.InvocationService_ResultListener;
|
||||
import com.threerings.util.Name;
|
||||
|
||||
import com.threerings.parlor.data.TableConfig;
|
||||
import com.threerings.parlor.game.data.GameConfig;
|
||||
|
||||
/**
|
||||
* An ActionScript version of the Java TableService interface.
|
||||
|
||||
@@ -21,17 +21,18 @@
|
||||
|
||||
package com.threerings.parlor.data {
|
||||
|
||||
import com.threerings.parlor.client.ParlorService;
|
||||
import com.threerings.parlor.client.ParlorService_InviteListener;
|
||||
import com.threerings.parlor.game.data.GameConfig;
|
||||
import com.threerings.presents.client.Client;
|
||||
import com.threerings.util.Integer;
|
||||
import com.threerings.util.Name;
|
||||
|
||||
import com.threerings.presents.client.InvocationService_ConfirmListener;
|
||||
import com.threerings.presents.client.InvocationService_InvocationListener;
|
||||
import com.threerings.presents.data.InvocationMarshaller;
|
||||
import com.threerings.presents.data.InvocationMarshaller_ConfirmMarshaller;
|
||||
import com.threerings.presents.data.InvocationMarshaller_ListenerMarshaller;
|
||||
import com.threerings.util.Integer;
|
||||
import com.threerings.util.Name;
|
||||
|
||||
import com.threerings.parlor.client.ParlorService;
|
||||
import com.threerings.parlor.client.ParlorService_InviteListener;
|
||||
import com.threerings.parlor.game.data.GameConfig;
|
||||
|
||||
/**
|
||||
* Provides the implementation of the <code>ParlorService</code> interface
|
||||
|
||||
@@ -21,9 +21,10 @@
|
||||
|
||||
package com.threerings.parlor.data {
|
||||
|
||||
import com.threerings.parlor.client.ParlorService_InviteListener;
|
||||
import com.threerings.presents.data.InvocationMarshaller_ListenerMarshaller;
|
||||
|
||||
import com.threerings.parlor.client.ParlorService_InviteListener;
|
||||
|
||||
/**
|
||||
* Marshalls instances of the ParlorService_InviteMarshaller interface.
|
||||
*/
|
||||
|
||||
@@ -21,21 +21,18 @@
|
||||
|
||||
package com.threerings.parlor.data {
|
||||
|
||||
import com.threerings.util.ArrayUtil;
|
||||
import com.threerings.util.ClassUtil;
|
||||
import com.threerings.util.Hashable;
|
||||
import com.threerings.util.Joiner;
|
||||
import com.threerings.util.Name;
|
||||
|
||||
import com.threerings.io.ObjectInputStream;
|
||||
import com.threerings.io.ObjectOutputStream;
|
||||
import com.threerings.io.TypedArray;
|
||||
|
||||
import com.threerings.util.Arrays;
|
||||
import com.threerings.util.Hashable;
|
||||
import com.threerings.util.Joiner;
|
||||
import com.threerings.util.Name;
|
||||
|
||||
import com.threerings.presents.dobj.DSet;
|
||||
import com.threerings.presents.dobj.DSet_Entry;
|
||||
|
||||
import com.threerings.crowd.data.BodyObject;
|
||||
|
||||
import com.threerings.parlor.game.data.GameConfig;
|
||||
|
||||
/**
|
||||
@@ -133,7 +130,7 @@ public class Table
|
||||
for (var jj :int = 0; jj < subTeams.length; jj++) {
|
||||
var occ :Name = (players[(subTeams[jj] as int)] as Name);
|
||||
if (occ != null) {
|
||||
newSubTeams.push(ArrayUtil.indexOf(players, occ));
|
||||
newSubTeams.push(Arrays.indexOf(players, occ));
|
||||
}
|
||||
}
|
||||
newSubTeams.sort(null, Array.NUMERIC);
|
||||
|
||||
@@ -21,16 +21,17 @@
|
||||
|
||||
package com.threerings.parlor.data {
|
||||
|
||||
import com.threerings.parlor.client.TableService;
|
||||
import com.threerings.parlor.game.data.GameConfig;
|
||||
import com.threerings.presents.client.Client;
|
||||
import com.threerings.util.Integer;
|
||||
import com.threerings.util.Name;
|
||||
|
||||
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;
|
||||
import com.threerings.util.Integer;
|
||||
import com.threerings.util.Name;
|
||||
|
||||
import com.threerings.parlor.client.TableService;
|
||||
import com.threerings.parlor.game.data.GameConfig;
|
||||
|
||||
/**
|
||||
* Provides the implementation of the <code>TableService</code> interface
|
||||
|
||||
@@ -21,17 +21,15 @@
|
||||
|
||||
package com.threerings.parlor.game.client {
|
||||
|
||||
import mx.core.Container;
|
||||
import mx.core.UIComponent;
|
||||
|
||||
import mx.containers.Grid;
|
||||
import mx.containers.GridItem;
|
||||
import mx.containers.GridRow;
|
||||
|
||||
import com.threerings.flex.GridUtil;
|
||||
import mx.core.Container;
|
||||
import mx.core.UIComponent;
|
||||
|
||||
import com.threerings.parlor.game.data.GameConfig;
|
||||
import com.threerings.parlor.util.ParlorContext;
|
||||
|
||||
import com.threerings.flex.GridUtil;
|
||||
|
||||
/**
|
||||
* Provides the base from which interfaces can be built to configure games prior to starting them.
|
||||
|
||||
@@ -21,16 +21,16 @@
|
||||
|
||||
package com.threerings.parlor.game.data {
|
||||
|
||||
import com.threerings.io.ObjectInputStream;
|
||||
import com.threerings.io.ObjectOutputStream;
|
||||
import com.threerings.io.TypedArray;
|
||||
|
||||
import com.threerings.util.ClassUtil;
|
||||
import com.threerings.util.Cloneable;
|
||||
import com.threerings.util.Hashable;
|
||||
import com.threerings.util.Name;
|
||||
import com.threerings.util.StringUtil;
|
||||
|
||||
import com.threerings.io.ObjectInputStream;
|
||||
import com.threerings.io.ObjectOutputStream;
|
||||
import com.threerings.io.TypedArray;
|
||||
|
||||
import com.threerings.crowd.data.PlaceConfig;
|
||||
|
||||
import com.threerings.parlor.client.TableConfigurator;
|
||||
|
||||
@@ -21,16 +21,16 @@
|
||||
|
||||
package com.threerings.parlor.game.data {
|
||||
|
||||
import com.threerings.util.ArrayUtil;
|
||||
import com.threerings.util.Integer;
|
||||
import com.threerings.util.Joiner;
|
||||
import com.threerings.util.langBoolean;
|
||||
import com.threerings.util.Name;
|
||||
|
||||
import com.threerings.io.ObjectInputStream;
|
||||
import com.threerings.io.ObjectOutputStream;
|
||||
import com.threerings.io.TypedArray;
|
||||
|
||||
import com.threerings.util.Arrays;
|
||||
import com.threerings.util.Integer;
|
||||
import com.threerings.util.Joiner;
|
||||
import com.threerings.util.Name;
|
||||
import com.threerings.util.langBoolean;
|
||||
|
||||
import com.threerings.crowd.data.PlaceObject;
|
||||
|
||||
/**
|
||||
@@ -157,7 +157,7 @@ public class GameObject extends PlaceObject
|
||||
*/
|
||||
public function getPlayerIndex (username :Name) :int
|
||||
{
|
||||
return ArrayUtil.indexOf(players, username);
|
||||
return Arrays.indexOf(players, username);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -218,7 +218,7 @@ public class GameObject extends PlaceObject
|
||||
*/
|
||||
public function getWinnerIndex () :int
|
||||
{
|
||||
return ArrayUtil.indexOf(winners, true);
|
||||
return Arrays.indexOf(winners, true);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -23,8 +23,8 @@ package com.threerings.parlor.turn.client {
|
||||
|
||||
import com.threerings.util.Name;
|
||||
|
||||
import com.threerings.presents.dobj.AttributeChangedEvent;
|
||||
import com.threerings.presents.dobj.AttributeChangeListener;
|
||||
import com.threerings.presents.dobj.AttributeChangedEvent;
|
||||
|
||||
import com.threerings.crowd.data.BodyObject;
|
||||
import com.threerings.crowd.data.PlaceConfig;
|
||||
@@ -34,7 +34,6 @@ import com.threerings.crowd.util.CrowdContext;
|
||||
import com.threerings.parlor.game.client.GameController;
|
||||
import com.threerings.parlor.game.client.GameControllerDelegate;
|
||||
import com.threerings.parlor.game.data.GameObject;
|
||||
|
||||
import com.threerings.parlor.turn.data.TurnGameObject;
|
||||
|
||||
/**
|
||||
|
||||
@@ -22,6 +22,7 @@
|
||||
package com.threerings.parlor.util {
|
||||
|
||||
import com.threerings.crowd.util.CrowdContext;
|
||||
|
||||
import com.threerings.parlor.client.ParlorDirector;
|
||||
|
||||
/**
|
||||
|
||||
@@ -24,19 +24,20 @@ package com.threerings.stage.client {
|
||||
import flash.display.DisplayObject;
|
||||
import flash.display.Sprite;
|
||||
|
||||
import com.threerings.cast.CharacterSprite;
|
||||
import as3isolib.display.IsoSprite;
|
||||
|
||||
import com.threerings.util.DirectionCodes;
|
||||
import com.threerings.media.Tickable;
|
||||
|
||||
import com.threerings.media.util.Path;
|
||||
import com.threerings.media.util.Pathable;
|
||||
|
||||
import com.threerings.cast.CharacterSprite;
|
||||
|
||||
import com.threerings.miso.client.PriorityIsoDisplayObject;
|
||||
import com.threerings.miso.util.MisoSceneMetrics;
|
||||
import com.threerings.miso.util.MisoUtil;
|
||||
import com.threerings.stage.data.StageLocation;
|
||||
|
||||
import as3isolib.display.IsoSprite;
|
||||
import as3isolib.display.scene.IsoScene;
|
||||
import as3isolib.graphics.SolidColorFill;
|
||||
import com.threerings.stage.data.StageLocation;
|
||||
|
||||
public class CharacterIsoSprite extends IsoSprite
|
||||
implements Pathable, PriorityIsoDisplayObject
|
||||
|
||||
@@ -21,48 +21,47 @@
|
||||
|
||||
package com.threerings.stage.client {
|
||||
|
||||
import flash.display.DisplayObject;
|
||||
|
||||
import flash.geom.Point;
|
||||
import flash.geom.Rectangle;
|
||||
|
||||
import flash.events.Event;
|
||||
import flash.events.MouseEvent;
|
||||
import flash.geom.Point;
|
||||
|
||||
import com.threerings.cast.CharacterSprite;
|
||||
import com.threerings.crowd.client.OccupantObserver;
|
||||
import as3isolib.geom.Pt;
|
||||
|
||||
import com.threerings.crowd.data.OccupantInfo;
|
||||
import com.threerings.crowd.data.PlaceObject;
|
||||
import com.threerings.media.Tickable;
|
||||
import com.threerings.media.util.LineSegmentPath;
|
||||
import com.threerings.media.util.Path;
|
||||
import com.threerings.util.Controller;
|
||||
import com.threerings.util.Integer;
|
||||
import com.threerings.util.Iterator;
|
||||
import com.threerings.util.Log;
|
||||
import com.threerings.util.Map;
|
||||
import com.threerings.util.Maps;
|
||||
import com.threerings.util.MathUtil;
|
||||
import com.threerings.util.StringUtil;
|
||||
|
||||
import com.threerings.presents.dobj.EntryUpdatedEvent;
|
||||
import com.threerings.presents.dobj.SetAdapter;
|
||||
import com.threerings.presents.dobj.SetListener;
|
||||
|
||||
import com.threerings.crowd.client.OccupantObserver;
|
||||
import com.threerings.crowd.data.OccupantInfo;
|
||||
import com.threerings.crowd.data.PlaceObject;
|
||||
import com.threerings.crowd.util.CrowdContext;
|
||||
|
||||
import com.threerings.media.Tickable;
|
||||
import com.threerings.media.util.LineSegmentPath;
|
||||
import com.threerings.media.util.Path;
|
||||
|
||||
import com.threerings.cast.CharacterSprite;
|
||||
|
||||
import com.threerings.miso.util.MisoSceneMetrics;
|
||||
import com.threerings.miso.util.MisoUtil;
|
||||
|
||||
import com.threerings.whirled.spot.data.Location;
|
||||
import com.threerings.whirled.spot.data.Portal;
|
||||
import com.threerings.whirled.spot.data.SceneLocation;
|
||||
import com.threerings.whirled.spot.data.SpotCodes;
|
||||
import com.threerings.whirled.spot.data.SpotSceneObject;
|
||||
import com.threerings.whirled.util.WhirledContext;
|
||||
import com.threerings.stage.data.StageSceneObject;
|
||||
|
||||
import com.threerings.stage.data.StageLocation;
|
||||
import com.threerings.stage.data.StageSceneObject;
|
||||
import com.threerings.stage.util.StageContext;
|
||||
import com.threerings.crowd.util.CrowdContext;
|
||||
import com.threerings.presents.dobj.EntryUpdatedEvent;
|
||||
import com.threerings.presents.dobj.SetAdapter;
|
||||
import com.threerings.presents.dobj.SetListener;
|
||||
|
||||
import com.threerings.miso.util.MisoSceneMetrics;
|
||||
import com.threerings.miso.util.MisoUtil;
|
||||
|
||||
import as3isolib.geom.Pt;
|
||||
|
||||
public class CrowdStageScenePanel extends StageScenePanel
|
||||
implements OccupantObserver, Tickable
|
||||
|
||||
@@ -22,14 +22,13 @@
|
||||
package com.threerings.stage.client {
|
||||
|
||||
import flash.display.Bitmap;
|
||||
import flash.display.BitmapData;
|
||||
import flash.display.DisplayObject;
|
||||
|
||||
import flash.geom.Point;
|
||||
|
||||
import as3isolib.display.IsoSprite;
|
||||
|
||||
import com.threerings.miso.client.PriorityIsoDisplayObject;
|
||||
|
||||
import com.threerings.whirled.spot.data.Portal;
|
||||
|
||||
public class PortalIsoSprite extends IsoSprite
|
||||
|
||||
@@ -21,16 +21,19 @@
|
||||
|
||||
package com.threerings.stage.client {
|
||||
|
||||
import com.threerings.util.Log;
|
||||
import com.threerings.util.Map;
|
||||
import com.threerings.util.Maps;
|
||||
|
||||
import com.threerings.media.image.ClassRecord;
|
||||
import com.threerings.media.image.ColorPository;
|
||||
import com.threerings.media.image.ColorRecord;
|
||||
import com.threerings.media.image.Colorization;
|
||||
import com.threerings.stage.data.StageScene;
|
||||
import com.threerings.miso.data.ObjectInfo;
|
||||
import com.threerings.media.tile.Colorizer;
|
||||
import com.threerings.util.Log;
|
||||
import com.threerings.util.Maps;
|
||||
import com.threerings.util.Map;
|
||||
|
||||
import com.threerings.miso.data.ObjectInfo;
|
||||
|
||||
import com.threerings.stage.data.StageScene;
|
||||
|
||||
/**
|
||||
* Handles colorization of object tiles in a scene.
|
||||
@@ -135,10 +138,12 @@ public class SceneColorizer implements Colorizer
|
||||
}
|
||||
}
|
||||
|
||||
import com.threerings.media.image.Colorization;
|
||||
import com.threerings.media.image.ColorPository;
|
||||
import com.threerings.media.image.Colorization;
|
||||
import com.threerings.media.tile.Colorizer;
|
||||
|
||||
import com.threerings.miso.data.ObjectInfo;
|
||||
|
||||
import com.threerings.stage.client.SceneColorizer;
|
||||
|
||||
class BaseColorizer implements Colorizer {
|
||||
|
||||
@@ -23,23 +23,24 @@ package com.threerings.stage.client {
|
||||
|
||||
import flash.display.DisplayObject;
|
||||
|
||||
import com.threerings.miso.client.MisoScenePanel;
|
||||
import com.threerings.miso.util.MisoContext;
|
||||
import com.threerings.miso.util.MisoSceneMetrics;
|
||||
import com.threerings.miso.util.MisoUtil;
|
||||
import com.threerings.miso.client.SceneBlock;
|
||||
import com.threerings.miso.data.MisoSceneModel;
|
||||
import com.threerings.util.Iterator;
|
||||
import com.threerings.util.MathUtil;
|
||||
import com.threerings.whirled.spot.data.Portal;
|
||||
import com.threerings.whirled.spot.data.SpotScene;
|
||||
import com.threerings.whirled.spot.data.SpotSceneModel;
|
||||
import com.threerings.stage.data.StageLocation;
|
||||
|
||||
import as3isolib.display.IsoSprite;
|
||||
import as3isolib.display.IsoView;
|
||||
import as3isolib.display.scene.IsoScene;
|
||||
|
||||
import com.threerings.util.Iterator;
|
||||
|
||||
import com.threerings.miso.client.MisoScenePanel;
|
||||
import com.threerings.miso.client.SceneBlock;
|
||||
import com.threerings.miso.data.MisoSceneModel;
|
||||
import com.threerings.miso.util.MisoContext;
|
||||
import com.threerings.miso.util.MisoSceneMetrics;
|
||||
import com.threerings.miso.util.MisoUtil;
|
||||
|
||||
import com.threerings.whirled.spot.data.Portal;
|
||||
import com.threerings.whirled.spot.data.SpotScene;
|
||||
|
||||
import com.threerings.stage.data.StageLocation;
|
||||
|
||||
public class StageSceneBlock extends SceneBlock
|
||||
{
|
||||
public function StageSceneBlock (key :int, objScene :IsoScene, portalScene :IsoScene,
|
||||
|
||||
@@ -21,15 +21,19 @@
|
||||
|
||||
package com.threerings.stage.client {
|
||||
|
||||
import com.threerings.util.Log;
|
||||
|
||||
import com.threerings.crowd.client.PlaceView;
|
||||
import com.threerings.crowd.util.CrowdContext;
|
||||
|
||||
import com.threerings.miso.util.MisoSceneMetrics;
|
||||
import com.threerings.stage.data.StageLocation;
|
||||
import com.threerings.stage.util.StageContext;
|
||||
import com.threerings.util.Log;
|
||||
|
||||
import com.threerings.whirled.data.SceneUpdate;
|
||||
import com.threerings.whirled.spot.client.SpotSceneController;
|
||||
|
||||
import com.threerings.stage.data.StageLocation;
|
||||
import com.threerings.stage.util.StageContext;
|
||||
|
||||
public class StageSceneController extends SpotSceneController
|
||||
{
|
||||
public var log :Log = Log.getLog(StageSceneController);
|
||||
|
||||
@@ -23,26 +23,27 @@ package com.threerings.stage.client {
|
||||
|
||||
import flash.display.DisplayObject;
|
||||
|
||||
import as3isolib.display.IsoSprite;
|
||||
import as3isolib.display.scene.IsoScene;
|
||||
|
||||
import com.threerings.util.Controller;
|
||||
import com.threerings.util.Iterator;
|
||||
import com.threerings.util.Log;
|
||||
import com.threerings.whirled.data.SceneUpdate;
|
||||
import com.threerings.whirled.spot.data.Portal;
|
||||
|
||||
import com.threerings.media.tile.Colorizer;
|
||||
import com.threerings.media.tile.Tile;
|
||||
|
||||
import com.threerings.miso.client.MisoScenePanel;
|
||||
import com.threerings.miso.client.PriorityIsoDisplayObject;
|
||||
import com.threerings.miso.client.SceneBlock;
|
||||
import com.threerings.miso.client.TileIsoSprite;
|
||||
import com.threerings.miso.data.ObjectInfo;
|
||||
import com.threerings.miso.util.MisoSceneMetrics;
|
||||
|
||||
import com.threerings.whirled.data.SceneUpdate;
|
||||
import com.threerings.whirled.spot.data.Portal;
|
||||
|
||||
import com.threerings.stage.data.StageMisoSceneModel;
|
||||
import com.threerings.stage.data.StageScene;
|
||||
import com.threerings.stage.util.StageContext;
|
||||
|
||||
import as3isolib.display.IsoSprite;
|
||||
import as3isolib.display.scene.IsoScene;
|
||||
|
||||
/**
|
||||
* Eventually responsible for rendering a stage scene - but for now it's a stub.
|
||||
*/
|
||||
|
||||
@@ -22,11 +22,12 @@
|
||||
package com.threerings.stage.client {
|
||||
|
||||
import com.threerings.io.TypedArray;
|
||||
import com.threerings.miso.data.ObjectInfo;
|
||||
import com.threerings.presents.client.Client;
|
||||
|
||||
import com.threerings.presents.client.InvocationService;
|
||||
import com.threerings.presents.client.InvocationService_ConfirmListener;
|
||||
|
||||
import com.threerings.miso.data.ObjectInfo;
|
||||
|
||||
/**
|
||||
* An ActionScript version of the Java StageSceneService interface.
|
||||
*/
|
||||
|
||||
@@ -24,8 +24,8 @@ package com.threerings.stage.data {
|
||||
import com.threerings.io.ObjectInputStream;
|
||||
import com.threerings.io.ObjectOutputStream;
|
||||
|
||||
import com.threerings.whirled.data.SceneUpdate;
|
||||
import com.threerings.whirled.data.SceneModel;
|
||||
import com.threerings.whirled.data.SceneUpdate;
|
||||
|
||||
/**
|
||||
* Update to change the default colorization for objects in a scene which
|
||||
|
||||
@@ -25,10 +25,11 @@ import com.threerings.io.ObjectInputStream;
|
||||
import com.threerings.io.ObjectOutputStream;
|
||||
import com.threerings.io.TypedArray;
|
||||
|
||||
import com.threerings.whirled.data.SceneUpdate;
|
||||
import com.threerings.whirled.data.SceneModel;
|
||||
import com.threerings.miso.data.ObjectInfo;
|
||||
|
||||
import com.threerings.whirled.data.SceneModel;
|
||||
import com.threerings.whirled.data.SceneUpdate;
|
||||
|
||||
/**
|
||||
* A scene update that is broadcast when objects have been added to or removed
|
||||
* from the scene.
|
||||
|
||||
@@ -21,17 +21,18 @@
|
||||
|
||||
package com.threerings.stage.data {
|
||||
|
||||
import com.threerings.io.ObjectInputStream;
|
||||
import com.threerings.io.ObjectOutputStream;
|
||||
import com.threerings.io.SimpleStreamableObject;
|
||||
|
||||
import com.threerings.util.ClassUtil;
|
||||
import com.threerings.util.DirectionCodes;
|
||||
import com.threerings.util.DirectionUtil;
|
||||
import com.threerings.util.Hashable;
|
||||
|
||||
import com.threerings.io.SimpleStreamableObject;
|
||||
import com.threerings.io.ObjectInputStream;
|
||||
import com.threerings.io.ObjectOutputStream;
|
||||
import com.threerings.whirled.spot.data.Location;
|
||||
|
||||
import com.threerings.stage.data.StageLocation;
|
||||
import com.threerings.whirled.spot.data.Location;
|
||||
|
||||
/**
|
||||
* Contains information on a scene occupant's position and orientation.
|
||||
|
||||
@@ -21,13 +21,14 @@
|
||||
|
||||
package com.threerings.stage.data {
|
||||
|
||||
import com.threerings.util.Integer;
|
||||
|
||||
import com.threerings.miso.data.SparseMisoSceneModel;
|
||||
import com.threerings.miso.data.SparseMisoSceneModel_Section;
|
||||
|
||||
import com.threerings.whirled.data.AuxModel;
|
||||
import com.threerings.whirled.data.SceneModel;
|
||||
import com.threerings.io.ObjectInputStream;
|
||||
import com.threerings.io.ObjectOutputStream;
|
||||
import com.threerings.miso.data.SparseMisoSceneModel_Section;
|
||||
import com.threerings.util.Integer;
|
||||
|
||||
import com.threerings.stage.data.StageMisoSceneModel;
|
||||
|
||||
/**
|
||||
|
||||
@@ -21,11 +21,7 @@
|
||||
|
||||
package com.threerings.stage.data {
|
||||
|
||||
import com.threerings.io.ObjectInputStream;
|
||||
import com.threerings.io.ObjectOutputStream;
|
||||
|
||||
import com.threerings.crowd.data.OccupantInfo;
|
||||
import com.threerings.crowd.data.BodyObject;
|
||||
|
||||
/**
|
||||
* Extends the standard occupant info with stage specific business.
|
||||
|
||||
@@ -21,8 +21,10 @@
|
||||
|
||||
package com.threerings.stage.data {
|
||||
|
||||
import com.threerings.crowd.data.PlaceConfig;
|
||||
import com.threerings.util.Iterator;
|
||||
|
||||
import com.threerings.crowd.data.PlaceConfig;
|
||||
|
||||
import com.threerings.whirled.data.SceneImpl;
|
||||
import com.threerings.whirled.spot.data.Portal;
|
||||
import com.threerings.whirled.spot.data.SpotScene;
|
||||
|
||||
@@ -21,11 +21,10 @@
|
||||
|
||||
package com.threerings.stage.data {
|
||||
|
||||
import com.threerings.crowd.data.PlaceConfig;
|
||||
import com.threerings.io.ObjectInputStream;
|
||||
import com.threerings.io.ObjectOutputStream;
|
||||
import com.threerings.stage.client.StageSceneController;
|
||||
import com.threerings.crowd.client.PlaceController;
|
||||
import com.threerings.crowd.data.PlaceConfig;
|
||||
|
||||
import com.threerings.stage.client.StageSceneController;
|
||||
|
||||
/**
|
||||
* Place configuration for the main isometric scenes in Stage.
|
||||
|
||||
@@ -22,11 +22,13 @@
|
||||
package com.threerings.stage.data {
|
||||
|
||||
import com.threerings.io.TypedArray;
|
||||
import com.threerings.miso.data.ObjectInfo;
|
||||
import com.threerings.presents.client.Client;
|
||||
|
||||
import com.threerings.presents.client.InvocationService_ConfirmListener;
|
||||
import com.threerings.presents.data.InvocationMarshaller;
|
||||
import com.threerings.presents.data.InvocationMarshaller_ConfirmMarshaller;
|
||||
|
||||
import com.threerings.miso.data.ObjectInfo;
|
||||
|
||||
import com.threerings.stage.client.StageSceneService;
|
||||
|
||||
/**
|
||||
|
||||
@@ -24,11 +24,13 @@ package com.threerings.stage.data {
|
||||
import com.threerings.io.ObjectInputStream;
|
||||
import com.threerings.io.ObjectOutputStream;
|
||||
|
||||
import com.threerings.stage.data.StageSceneModel;
|
||||
import com.threerings.util.Integer;
|
||||
import com.threerings.util.StreamableHashMap;
|
||||
import com.threerings.whirled.spot.data.SpotSceneModel;
|
||||
|
||||
import com.threerings.whirled.data.SceneModel;
|
||||
import com.threerings.whirled.spot.data.SpotSceneModel;
|
||||
|
||||
import com.threerings.stage.data.StageSceneModel;
|
||||
|
||||
/**
|
||||
* Extends the basic scene model with the notion of a scene type and
|
||||
|
||||
@@ -22,6 +22,7 @@
|
||||
package com.threerings.stage.data {
|
||||
|
||||
import com.threerings.io.ObjectInputStream;
|
||||
|
||||
import com.threerings.whirled.spot.data.SpotSceneObject;
|
||||
|
||||
public class StageSceneObject extends SpotSceneObject
|
||||
|
||||
@@ -22,6 +22,7 @@
|
||||
package com.threerings.stage.util {
|
||||
|
||||
import com.threerings.media.image.ColorPository;
|
||||
|
||||
import com.threerings.miso.util.MisoContext;
|
||||
|
||||
/**
|
||||
|
||||
@@ -46,6 +46,14 @@ public /*abstract*/ class SceneController extends PlaceController
|
||||
{
|
||||
super.init(ctx, config);
|
||||
_wctx = WhirledContext(ctx);
|
||||
|
||||
_updateListener = new MessageAdapter(
|
||||
function (event :MessageEvent) :void {
|
||||
if (event.getName() == SceneCodes.SCENE_UPDATE) {
|
||||
sceneUpdated(event.getArgs()[0] as SceneUpdate);
|
||||
}
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
// documentation inherited
|
||||
@@ -75,13 +83,7 @@ public /*abstract*/ class SceneController extends PlaceController
|
||||
}
|
||||
|
||||
/** Used to listen for scene updates. */
|
||||
protected var _updateListener :MessageListener = new MessageAdapter(
|
||||
function (event :MessageEvent) :void {
|
||||
if (event.getName() == SceneCodes.SCENE_UPDATE) {
|
||||
sceneUpdated(event.getArgs()[0] as SceneUpdate);
|
||||
}
|
||||
}
|
||||
);
|
||||
protected var _updateListener :MessageListener;
|
||||
|
||||
protected var _wctx :WhirledContext;
|
||||
}
|
||||
|
||||
@@ -22,6 +22,7 @@
|
||||
package com.threerings.whirled.client {
|
||||
|
||||
import com.threerings.presents.client.InvocationDecoder;
|
||||
|
||||
import com.threerings.whirled.client.SceneReceiver;
|
||||
|
||||
/**
|
||||
|
||||
@@ -24,13 +24,13 @@ package com.threerings.whirled.client {
|
||||
import flash.errors.IOError;
|
||||
import flash.errors.IllegalOperationError;
|
||||
|
||||
import com.threerings.io.TypedArray;
|
||||
|
||||
import com.threerings.util.Log;
|
||||
import com.threerings.util.Map;
|
||||
import com.threerings.util.Maps;
|
||||
import com.threerings.util.ResultListener;
|
||||
|
||||
import com.threerings.io.TypedArray;
|
||||
|
||||
import com.threerings.presents.client.BasicDirector;
|
||||
import com.threerings.presents.client.Client;
|
||||
import com.threerings.presents.client.ClientEvent;
|
||||
|
||||
@@ -21,7 +21,6 @@
|
||||
|
||||
package com.threerings.whirled.client {
|
||||
|
||||
import com.threerings.presents.client.Client;
|
||||
import com.threerings.presents.client.InvocationService;
|
||||
|
||||
/**
|
||||
|
||||
@@ -21,9 +21,12 @@
|
||||
|
||||
package com.threerings.whirled.client {
|
||||
|
||||
import com.threerings.crowd.data.PlaceConfig;
|
||||
import com.threerings.io.TypedArray;
|
||||
|
||||
import com.threerings.presents.client.InvocationService_InvocationListener;
|
||||
|
||||
import com.threerings.crowd.data.PlaceConfig;
|
||||
|
||||
import com.threerings.whirled.data.SceneModel;
|
||||
|
||||
/**
|
||||
|
||||
@@ -21,10 +21,10 @@
|
||||
|
||||
package com.threerings.whirled.data {
|
||||
|
||||
import com.threerings.util.Cloneable;
|
||||
|
||||
import com.threerings.io.Streamable;
|
||||
|
||||
import com.threerings.util.Cloneable;
|
||||
|
||||
/**
|
||||
* An interface that must be implemented by auxiliary scene models.
|
||||
*/
|
||||
|
||||
@@ -21,9 +21,10 @@
|
||||
|
||||
package com.threerings.whirled.data {
|
||||
|
||||
import com.threerings.presents.client.Client;
|
||||
import com.threerings.presents.data.InvocationMarshaller;
|
||||
import com.threerings.util.Integer;
|
||||
|
||||
import com.threerings.presents.data.InvocationMarshaller;
|
||||
|
||||
import com.threerings.whirled.client.SceneService;
|
||||
import com.threerings.whirled.client.SceneService_SceneMoveListener;
|
||||
|
||||
|
||||
@@ -21,9 +21,12 @@
|
||||
|
||||
package com.threerings.whirled.data {
|
||||
|
||||
import com.threerings.crowd.data.PlaceConfig;
|
||||
import com.threerings.io.TypedArray;
|
||||
|
||||
import com.threerings.presents.data.InvocationMarshaller_ListenerMarshaller;
|
||||
|
||||
import com.threerings.crowd.data.PlaceConfig;
|
||||
|
||||
import com.threerings.whirled.client.SceneService_SceneMoveListener;
|
||||
|
||||
/**
|
||||
|
||||
@@ -21,14 +21,14 @@
|
||||
|
||||
package com.threerings.whirled.data {
|
||||
|
||||
import com.threerings.util.ClassUtil;
|
||||
import com.threerings.util.Cloneable;
|
||||
|
||||
import com.threerings.io.ObjectInputStream;
|
||||
import com.threerings.io.ObjectOutputStream;
|
||||
import com.threerings.io.SimpleStreamableObject;
|
||||
import com.threerings.io.TypedArray;
|
||||
|
||||
import com.threerings.util.ClassUtil;
|
||||
import com.threerings.util.Cloneable;
|
||||
|
||||
/**
|
||||
* The scene model is the bare bones representation of the data for a
|
||||
* scene in the Whirled system. From the scene model, one would create an
|
||||
|
||||
@@ -23,13 +23,12 @@ package com.threerings.whirled.data {
|
||||
|
||||
import flash.errors.IllegalOperationError;
|
||||
|
||||
import com.threerings.util.Joiner;
|
||||
|
||||
import com.threerings.io.ObjectInputStream;
|
||||
import com.threerings.io.ObjectOutputStream;
|
||||
import com.threerings.io.Streamable;
|
||||
|
||||
import com.threerings.util.Cloneable;
|
||||
import com.threerings.util.Joiner;
|
||||
import com.threerings.util.Log;
|
||||
|
||||
/**
|
||||
|
||||
@@ -20,7 +20,6 @@
|
||||
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
package com.threerings.whirled.spot.client {
|
||||
import com.threerings.crowd.client.CrowdClient;
|
||||
import com.threerings.util.Log;
|
||||
import com.threerings.util.ResultListener;
|
||||
|
||||
@@ -28,7 +27,6 @@ import com.threerings.presents.client.BasicDirector;
|
||||
import com.threerings.presents.client.Client;
|
||||
import com.threerings.presents.client.ClientEvent;
|
||||
import com.threerings.presents.client.ConfirmAdapter;
|
||||
import com.threerings.presents.data.ClientObject;
|
||||
import com.threerings.presents.dobj.AttributeChangeListener;
|
||||
import com.threerings.presents.dobj.AttributeChangedEvent;
|
||||
import com.threerings.presents.dobj.DObject;
|
||||
@@ -38,6 +36,7 @@ import com.threerings.presents.dobj.Subscriber;
|
||||
|
||||
import com.threerings.crowd.chat.client.ChatDirector;
|
||||
import com.threerings.crowd.chat.data.ChatCodes;
|
||||
import com.threerings.crowd.client.CrowdClient;
|
||||
import com.threerings.crowd.client.LocationAdapter;
|
||||
import com.threerings.crowd.client.LocationDirector;
|
||||
import com.threerings.crowd.data.BodyObject;
|
||||
@@ -46,8 +45,6 @@ import com.threerings.crowd.data.PlaceObject;
|
||||
import com.threerings.whirled.client.SceneDirector;
|
||||
import com.threerings.whirled.data.SceneModel;
|
||||
import com.threerings.whirled.data.ScenePlace;
|
||||
import com.threerings.whirled.util.WhirledContext;
|
||||
|
||||
import com.threerings.whirled.spot.data.ClusteredBodyObject;
|
||||
import com.threerings.whirled.spot.data.Location;
|
||||
import com.threerings.whirled.spot.data.Portal;
|
||||
@@ -56,6 +53,7 @@ import com.threerings.whirled.spot.data.SpotCodes;
|
||||
import com.threerings.whirled.spot.data.SpotMarshaller;
|
||||
import com.threerings.whirled.spot.data.SpotScene;
|
||||
import com.threerings.whirled.spot.data.SpotSceneObject;
|
||||
import com.threerings.whirled.util.WhirledContext;
|
||||
|
||||
/**
|
||||
* Extends the standard scene director with facilities to move between locations within a scene.
|
||||
@@ -463,7 +461,9 @@ public class SpotSceneDirector extends BasicDirector
|
||||
}
|
||||
|
||||
import com.threerings.io.TypedArray;
|
||||
|
||||
import com.threerings.crowd.data.PlaceConfig;
|
||||
|
||||
import com.threerings.whirled.client.SceneDirector;
|
||||
import com.threerings.whirled.data.SceneModel;
|
||||
import com.threerings.whirled.spot.client.SpotService_SpotSceneMoveListener;
|
||||
|
||||
@@ -21,9 +21,9 @@
|
||||
|
||||
package com.threerings.whirled.spot.client {
|
||||
|
||||
import com.threerings.presents.client.Client;
|
||||
import com.threerings.presents.client.InvocationService;
|
||||
import com.threerings.presents.client.InvocationService_ConfirmListener;
|
||||
|
||||
import com.threerings.whirled.spot.data.Location;
|
||||
|
||||
/**
|
||||
|
||||
@@ -21,9 +21,12 @@
|
||||
|
||||
package com.threerings.whirled.spot.client {
|
||||
|
||||
import com.threerings.crowd.data.PlaceConfig;
|
||||
import com.threerings.io.TypedArray;
|
||||
|
||||
import com.threerings.presents.client.InvocationService_InvocationListener;
|
||||
|
||||
import com.threerings.crowd.data.PlaceConfig;
|
||||
|
||||
import com.threerings.whirled.data.SceneModel;
|
||||
|
||||
/**
|
||||
|
||||
@@ -21,13 +21,11 @@
|
||||
|
||||
package com.threerings.whirled.spot.data {
|
||||
|
||||
import flash.geom.Rectangle;
|
||||
|
||||
import com.threerings.util.Hashable;
|
||||
|
||||
import com.threerings.io.Streamable;
|
||||
import com.threerings.io.ObjectInputStream;
|
||||
import com.threerings.io.ObjectOutputStream;
|
||||
import com.threerings.io.Streamable;
|
||||
|
||||
import com.threerings.util.Hashable;
|
||||
|
||||
import com.threerings.presents.dobj.DSet_Entry;
|
||||
|
||||
|
||||
@@ -21,16 +21,14 @@
|
||||
|
||||
package com.threerings.whirled.spot.data {
|
||||
|
||||
import com.threerings.util.ClassUtil;
|
||||
import com.threerings.util.Cloneable;
|
||||
import com.threerings.util.Hashable;
|
||||
import com.threerings.util.Joiner;
|
||||
|
||||
import com.threerings.io.ObjectInputStream;
|
||||
import com.threerings.io.ObjectOutputStream;
|
||||
import com.threerings.io.SimpleStreamableObject;
|
||||
|
||||
import com.threerings.util.ClassUtil;
|
||||
import com.threerings.util.Cloneable;
|
||||
import com.threerings.util.Hashable;
|
||||
import com.threerings.util.Joiner;
|
||||
|
||||
/**
|
||||
* Represents an exit to another scene. A body sprite would walk over to a
|
||||
|
||||
@@ -21,12 +21,12 @@
|
||||
|
||||
package com.threerings.whirled.spot.data {
|
||||
|
||||
import com.threerings.util.Hashable;
|
||||
|
||||
import com.threerings.io.ObjectInputStream;
|
||||
import com.threerings.io.ObjectOutputStream;
|
||||
import com.threerings.io.SimpleStreamableObject;
|
||||
|
||||
import com.threerings.util.Hashable;
|
||||
|
||||
import com.threerings.presents.dobj.DSet_Entry;
|
||||
|
||||
/**
|
||||
|
||||
@@ -21,12 +21,13 @@
|
||||
|
||||
package com.threerings.whirled.spot.data {
|
||||
|
||||
import com.threerings.presents.client.Client;
|
||||
import com.threerings.util.Byte;
|
||||
import com.threerings.util.Integer;
|
||||
|
||||
import com.threerings.presents.client.InvocationService_ConfirmListener;
|
||||
import com.threerings.presents.data.InvocationMarshaller;
|
||||
import com.threerings.presents.data.InvocationMarshaller_ConfirmMarshaller;
|
||||
import com.threerings.util.Byte;
|
||||
import com.threerings.util.Integer;
|
||||
|
||||
import com.threerings.whirled.spot.client.SpotService;
|
||||
import com.threerings.whirled.spot.client.SpotService_SpotSceneMoveListener;
|
||||
|
||||
|
||||
+4
-1
@@ -21,9 +21,12 @@
|
||||
|
||||
package com.threerings.whirled.spot.data {
|
||||
|
||||
import com.threerings.crowd.data.PlaceConfig;
|
||||
import com.threerings.io.TypedArray;
|
||||
|
||||
import com.threerings.presents.data.InvocationMarshaller_ListenerMarshaller;
|
||||
|
||||
import com.threerings.crowd.data.PlaceConfig;
|
||||
|
||||
import com.threerings.whirled.data.SceneModel;
|
||||
import com.threerings.whirled.spot.client.SpotService_SpotSceneMoveListener;
|
||||
|
||||
|
||||
@@ -23,9 +23,9 @@ package com.threerings.whirled.spot.data {
|
||||
|
||||
import com.threerings.util.ArrayIterator;
|
||||
import com.threerings.util.Iterator;
|
||||
import com.threerings.util.Log;
|
||||
import com.threerings.util.Map;
|
||||
import com.threerings.util.Maps;
|
||||
import com.threerings.util.Log;
|
||||
|
||||
/**
|
||||
* An implementation of the {@link SpotScene} interface.
|
||||
|
||||
@@ -21,14 +21,14 @@
|
||||
|
||||
package com.threerings.whirled.spot.data {
|
||||
|
||||
import com.threerings.util.ArrayUtil;
|
||||
import com.threerings.util.ClassUtil;
|
||||
|
||||
import com.threerings.io.ObjectInputStream;
|
||||
import com.threerings.io.ObjectOutputStream;
|
||||
import com.threerings.io.SimpleStreamableObject;
|
||||
import com.threerings.io.TypedArray;
|
||||
|
||||
import com.threerings.util.Arrays;
|
||||
import com.threerings.util.ClassUtil;
|
||||
|
||||
import com.threerings.whirled.data.AuxModel;
|
||||
import com.threerings.whirled.data.SceneModel;
|
||||
|
||||
@@ -75,7 +75,7 @@ public class SpotSceneModel extends SimpleStreamableObject
|
||||
*/
|
||||
public function removePortal (portal :Portal) :void
|
||||
{
|
||||
ArrayUtil.removeFirst(portals, portal);
|
||||
Arrays.removeFirst(portals, portal);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -26,6 +26,7 @@ import com.threerings.io.ObjectOutputStream;
|
||||
|
||||
import com.threerings.presents.dobj.DSet;
|
||||
import com.threerings.presents.dobj.DSet_Entry;
|
||||
|
||||
import com.threerings.whirled.data.SceneObject;
|
||||
import com.threerings.whirled.spot.data.SceneLocation;
|
||||
|
||||
|
||||
@@ -22,6 +22,7 @@
|
||||
package com.threerings.whirled.util {
|
||||
|
||||
import com.threerings.crowd.data.PlaceConfig;
|
||||
|
||||
import com.threerings.whirled.data.Scene;
|
||||
import com.threerings.whirled.data.SceneModel;
|
||||
|
||||
|
||||
@@ -22,6 +22,7 @@
|
||||
package com.threerings.whirled.util {
|
||||
|
||||
import com.threerings.crowd.util.CrowdContext;
|
||||
|
||||
import com.threerings.whirled.client.SceneDirector;
|
||||
|
||||
/**
|
||||
|
||||
@@ -22,6 +22,7 @@
|
||||
package com.threerings.whirled.zone.client {
|
||||
|
||||
import com.threerings.presents.client.InvocationDecoder;
|
||||
|
||||
import com.threerings.whirled.zone.client.ZoneReceiver;
|
||||
|
||||
/**
|
||||
|
||||
@@ -22,6 +22,7 @@
|
||||
package com.threerings.whirled.zone.client {
|
||||
|
||||
import com.threerings.io.TypedArray;
|
||||
|
||||
import com.threerings.util.Log;
|
||||
import com.threerings.util.ResultListener;
|
||||
|
||||
@@ -38,12 +39,10 @@ import com.threerings.whirled.client.SceneDirector_MoveHandler;
|
||||
import com.threerings.whirled.data.SceneModel;
|
||||
import com.threerings.whirled.data.SceneUpdate;
|
||||
import com.threerings.whirled.util.WhirledContext;
|
||||
|
||||
import com.threerings.whirled.zone.client.ZoneService_ZoneMoveListener;
|
||||
import com.threerings.whirled.zone.data.ZoneSummary;
|
||||
import com.threerings.whirled.zone.util.ZoneUtil;
|
||||
|
||||
|
||||
public class ZoneDirector extends BasicDirector
|
||||
implements ZoneReceiver, ZoneService_ZoneMoveListener, SceneDirector_MoveHandler
|
||||
{
|
||||
|
||||
@@ -21,7 +21,6 @@
|
||||
|
||||
package com.threerings.whirled.zone.client {
|
||||
|
||||
import com.threerings.presents.client.Client;
|
||||
import com.threerings.presents.client.InvocationService;
|
||||
|
||||
/**
|
||||
|
||||
@@ -21,9 +21,12 @@
|
||||
|
||||
package com.threerings.whirled.zone.client {
|
||||
|
||||
import com.threerings.crowd.data.PlaceConfig;
|
||||
import com.threerings.io.TypedArray;
|
||||
|
||||
import com.threerings.presents.client.InvocationService_InvocationListener;
|
||||
|
||||
import com.threerings.crowd.data.PlaceConfig;
|
||||
|
||||
import com.threerings.whirled.data.SceneModel;
|
||||
import com.threerings.whirled.zone.data.ZoneSummary;
|
||||
|
||||
|
||||
@@ -21,9 +21,10 @@
|
||||
|
||||
package com.threerings.whirled.zone.data {
|
||||
|
||||
import com.threerings.presents.client.Client;
|
||||
import com.threerings.presents.data.InvocationMarshaller;
|
||||
import com.threerings.util.Integer;
|
||||
|
||||
import com.threerings.presents.data.InvocationMarshaller;
|
||||
|
||||
import com.threerings.whirled.zone.client.ZoneService;
|
||||
import com.threerings.whirled.zone.client.ZoneService_ZoneMoveListener;
|
||||
|
||||
|
||||
@@ -21,9 +21,12 @@
|
||||
|
||||
package com.threerings.whirled.zone.data {
|
||||
|
||||
import com.threerings.crowd.data.PlaceConfig;
|
||||
import com.threerings.io.TypedArray;
|
||||
|
||||
import com.threerings.presents.data.InvocationMarshaller_ListenerMarshaller;
|
||||
|
||||
import com.threerings.crowd.data.PlaceConfig;
|
||||
|
||||
import com.threerings.whirled.data.SceneModel;
|
||||
import com.threerings.whirled.zone.client.ZoneService_ZoneMoveListener;
|
||||
|
||||
|
||||
@@ -21,13 +21,13 @@
|
||||
|
||||
package com.threerings.whirled.zone.data {
|
||||
|
||||
import com.threerings.util.Name;
|
||||
|
||||
import com.threerings.io.ObjectInputStream;
|
||||
import com.threerings.io.ObjectOutputStream;
|
||||
import com.threerings.io.SimpleStreamableObject;
|
||||
import com.threerings.io.TypedArray;
|
||||
|
||||
import com.threerings.util.Name;
|
||||
|
||||
/**
|
||||
* The zone summary contains information on a zone, including its name and
|
||||
* summary info on all of the scenes in this zone (which can be used to
|
||||
|
||||
@@ -24,7 +24,6 @@ package com.threerings.micasa.lobby;
|
||||
import javax.annotation.Generated;
|
||||
|
||||
import com.threerings.presents.data.InvocationMarshaller;
|
||||
import com.threerings.presents.dobj.InvocationResponseEvent;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
|
||||
@@ -1088,8 +1088,7 @@ public abstract class CardPanel extends VirtualMediaPanel
|
||||
|
||||
/** Observers of hand card selection/deselection. */
|
||||
protected ObserverList<CardSelectionObserver> _handSelectionObservers =
|
||||
new ObserverList<CardSelectionObserver>(
|
||||
ObserverList.FAST_UNSAFE_NOTIFY);
|
||||
ObserverList.newFastUnsafe();
|
||||
|
||||
/** The location of the center of the hand's upper edge. */
|
||||
protected Point _handLocation = new Point();
|
||||
|
||||
@@ -369,6 +369,5 @@ public class TableDirector extends BasicDirector
|
||||
protected Table _ourTable;
|
||||
|
||||
/** An array of entities that want to hear about when we stand up or sit down. */
|
||||
protected ObserverList<SeatednessObserver> _seatedObservers =
|
||||
new ObserverList<SeatednessObserver>(ObserverList.FAST_UNSAFE_NOTIFY);
|
||||
protected ObserverList<SeatednessObserver> _seatedObservers = ObserverList.newFastUnsafe();
|
||||
}
|
||||
|
||||
@@ -27,7 +27,6 @@ import com.threerings.parlor.client.ParlorService;
|
||||
import com.threerings.parlor.game.data.GameConfig;
|
||||
import com.threerings.presents.client.InvocationService;
|
||||
import com.threerings.presents.data.InvocationMarshaller;
|
||||
import com.threerings.presents.dobj.InvocationResponseEvent;
|
||||
import com.threerings.util.Name;
|
||||
|
||||
/**
|
||||
|
||||
@@ -44,7 +44,7 @@ import static com.threerings.parlor.Log.log;
|
||||
* The game controller manages the flow and control of a game on the client side. This class serves
|
||||
* as the root of a hierarchy of controller classes that aim to provide functionality shared
|
||||
* between various similar games. The base controller provides functionality for starting and
|
||||
* ending the game and for calculating ratings adjustements when a game ends normally. It also
|
||||
* ending the game and for calculating ratings adjustments when a game ends normally. It also
|
||||
* handles the basic house keeping like subscription to the game object and dispatch of commands
|
||||
* and distributed object events.
|
||||
*/
|
||||
@@ -198,8 +198,7 @@ public abstract class GameController extends PlaceController
|
||||
if (event.getName().equals(GameObject.STATE)) {
|
||||
int newState = event.getIntValue();
|
||||
if (!stateDidChange(newState)) {
|
||||
log.warning("Game transitioned to unknown state [gobj=" + _gobj +
|
||||
", state=" + newState + "].");
|
||||
log.warning("Game transitioned to unknown state", "gobj", _gobj, "state", newState);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -28,8 +28,7 @@ import com.threerings.io.SimpleStreamableObject;
|
||||
*/
|
||||
public class GameAI extends SimpleStreamableObject
|
||||
{
|
||||
/** The "personality" of the AI, which can be interpreted by
|
||||
* each puzzle. */
|
||||
/** The "personality" of the AI, which can be interpreted by each puzzle. */
|
||||
public int personality;
|
||||
|
||||
/** The skill level of the AI. */
|
||||
@@ -41,8 +40,7 @@ public class GameAI extends SimpleStreamableObject
|
||||
}
|
||||
|
||||
/**
|
||||
* Constructs an AI with the specified (game-interpreted) skill and
|
||||
* personality.
|
||||
* Constructs an AI with the specified (game-interpreted) skill and personality.
|
||||
*/
|
||||
public GameAI (int personality, int skill)
|
||||
{
|
||||
|
||||
@@ -91,8 +91,8 @@ public class TurnGameManagerDelegate extends GameManagerDelegate
|
||||
{
|
||||
// sanity check
|
||||
if (_turnIdx < 0 || _turnIdx >= _turnGame.getPlayers().length) {
|
||||
log.warning("startTurn() called with invalid turn index [game=" + where() +
|
||||
", turnIdx=" + _turnIdx + "].");
|
||||
log.warning("startTurn() called with invalid turn index", "game", where(),
|
||||
"turnIdx", _turnIdx);
|
||||
// abort, abort
|
||||
return;
|
||||
}
|
||||
@@ -223,8 +223,8 @@ public class TurnGameManagerDelegate extends GameManagerDelegate
|
||||
if (_turnIdx == oturnIdx) {
|
||||
// if we've wrapped all the way around, stop where we are even if the current
|
||||
// player is not active.
|
||||
log.warning("1 or less active players. Unable to properly change turn. " +
|
||||
"[game=" + where() + "].");
|
||||
log.warning("1 or less active players. Unable to properly change turn.",
|
||||
"game", where());
|
||||
break;
|
||||
}
|
||||
} while (!_tgmgr.isActivePlayer(_turnIdx));
|
||||
@@ -241,8 +241,8 @@ public class TurnGameManagerDelegate extends GameManagerDelegate
|
||||
while (!_tgmgr.isActivePlayer(_turnIdx)) {
|
||||
_turnIdx = (_turnIdx + 1) % size;
|
||||
if (_turnIdx == firstPick) {
|
||||
log.warning("No players eligible for randomly-assigned turn. Choking. " +
|
||||
"[game=" + where() + "].");
|
||||
log.warning("No players eligible for randomly-assigned turn. Choking.",
|
||||
"game", where());
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -397,7 +397,7 @@ public abstract class PuzzleController extends GameController
|
||||
}
|
||||
|
||||
// refuse to start the action if our puzzle view is hidden
|
||||
if (_pidx != -1 && !_panel.getBoardView().isShowing()) {
|
||||
if (_pidx != -1 && !_pview.isShowing()) {
|
||||
log.warning("Refusing to start action on hidden puzzle.", new Exception());
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -281,7 +281,6 @@ public abstract class DropControllerDelegate extends PuzzleControllerDelegate
|
||||
updateSelfSummary();
|
||||
}
|
||||
|
||||
// documentation inherited
|
||||
protected boolean handleBlockAction (ActionEvent action)
|
||||
{
|
||||
String cmd = action.getActionCommand();
|
||||
@@ -1140,8 +1139,7 @@ public abstract class DropControllerDelegate extends PuzzleControllerDelegate
|
||||
};
|
||||
|
||||
/** A piece operation that will update piece sprites as board positions are updated. */
|
||||
protected DropBoard.PieceOperation _updateBoardOp =
|
||||
new DropBoard.PieceOperation() {
|
||||
protected DropBoard.PieceOperation _updateBoardOp = new DropBoard.PieceOperation() {
|
||||
public boolean execute (DropBoard board, int col, int row) {
|
||||
_dview.updatePiece(col, row);
|
||||
return true;
|
||||
|
||||
@@ -87,9 +87,7 @@ public abstract class Stat
|
||||
public static int initType (Type type, Stat prototype)
|
||||
{
|
||||
// compute a code for this stat using the CRC32 hash of its name
|
||||
_crc.reset();
|
||||
_crc.update(type.name().getBytes());
|
||||
int code = (int)_crc.getValue();
|
||||
int code = crc32(type.name());
|
||||
|
||||
// make sure the code does not collide
|
||||
if (_codeToType.containsKey(code)) {
|
||||
@@ -106,6 +104,16 @@ public abstract class Stat
|
||||
return code;
|
||||
}
|
||||
|
||||
/**
|
||||
* Computes and returns the CRC32 hash of the specified string.
|
||||
*/
|
||||
public static int crc32 (String string)
|
||||
{
|
||||
_crc.reset();
|
||||
_crc.update(string.getBytes());
|
||||
return (int)_crc.getValue();
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the type of this statistic.
|
||||
*/
|
||||
|
||||
@@ -25,7 +25,6 @@ import javax.annotation.Generated;
|
||||
|
||||
import com.threerings.crowd.data.PlaceConfig;
|
||||
import com.threerings.presents.data.InvocationMarshaller;
|
||||
import com.threerings.presents.dobj.InvocationResponseEvent;
|
||||
import com.threerings.whirled.client.SceneService;
|
||||
|
||||
/**
|
||||
|
||||
@@ -26,7 +26,6 @@ import javax.annotation.Generated;
|
||||
import com.threerings.crowd.data.PlaceConfig;
|
||||
import com.threerings.presents.client.InvocationService;
|
||||
import com.threerings.presents.data.InvocationMarshaller;
|
||||
import com.threerings.presents.dobj.InvocationResponseEvent;
|
||||
import com.threerings.whirled.data.SceneModel;
|
||||
import com.threerings.whirled.data.SceneUpdate;
|
||||
import com.threerings.whirled.spot.client.SpotService;
|
||||
|
||||
@@ -27,16 +27,16 @@ package com.threerings.whirled.util;
|
||||
*/
|
||||
public class NoSuchSceneException extends Exception
|
||||
{
|
||||
public NoSuchSceneException (int sceneid)
|
||||
public NoSuchSceneException (int sceneId)
|
||||
{
|
||||
super("No such scene [sceneid=" + sceneid + "]");
|
||||
_sceneid = sceneid;
|
||||
super("No such scene [sceneId=" + sceneId + "]");
|
||||
_sceneId = sceneId;
|
||||
}
|
||||
|
||||
public int getSceneId ()
|
||||
{
|
||||
return _sceneid;
|
||||
return _sceneId;
|
||||
}
|
||||
|
||||
protected int _sceneid;
|
||||
protected int _sceneId;
|
||||
}
|
||||
|
||||
@@ -25,7 +25,6 @@ import javax.annotation.Generated;
|
||||
|
||||
import com.threerings.crowd.data.PlaceConfig;
|
||||
import com.threerings.presents.data.InvocationMarshaller;
|
||||
import com.threerings.presents.dobj.InvocationResponseEvent;
|
||||
import com.threerings.whirled.data.SceneModel;
|
||||
import com.threerings.whirled.data.SceneUpdate;
|
||||
import com.threerings.whirled.zone.client.ZoneService;
|
||||
|
||||
Reference in New Issue
Block a user