Abstracted character-sprite-related activity to the cast package in
preparation for character component compositing and other character-related antics. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@575 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Walter Korman
@@ -1,12 +0,0 @@
|
||||
<?xml version="1.0" standalone="yes"?>
|
||||
|
||||
<!-- $Id: characters.xml,v 1.5 2001/10/25 18:07:13 shaper Exp $ -->
|
||||
|
||||
<!-- Initial test character description data. -->
|
||||
|
||||
<characters>
|
||||
|
||||
<character tsid="1011" frames="5" fps="5" origin="47, 80"/>
|
||||
<character tsid="1012" frames="6" fps="5" origin="47, 80"/>
|
||||
|
||||
</characters>
|
||||
@@ -0,0 +1,19 @@
|
||||
<?xml version="1.0" standalone="yes"?>
|
||||
|
||||
<!-- $Id: components.xml,v 1.1 2001/10/26 01:17:21 shaper Exp $ -->
|
||||
|
||||
<!-- Initial test character component description data. -->
|
||||
|
||||
<charactercomponents>
|
||||
|
||||
<componenttypes>
|
||||
<type ctid="1" frames="5" fps="5" origin="47, 80"/>
|
||||
<type ctid="2" frames="6" fps="5" origin="47, 80"/>
|
||||
</componenttypes>
|
||||
|
||||
<components>
|
||||
<component cid="1011" ctid="1"/>
|
||||
<component cid="1012" ctid="2"/>
|
||||
</components>
|
||||
|
||||
</charactercomponents>
|
||||
@@ -0,0 +1,43 @@
|
||||
<?xml version="1.0" standalone="yes"?>
|
||||
|
||||
<scene>
|
||||
<name>Untitled Scene</name>
|
||||
<version>1</version>
|
||||
<locations></locations>
|
||||
<clusters></clusters>
|
||||
<portals></portals>
|
||||
<tiles>
|
||||
<layer lnum="0">
|
||||
<row rownum="0">1004,10,1004,10,1004,10,1004,10,1004,10,1004,10,1004,10,1004,10,1004,10,1010,2,1010,2,1004,10,1004,10,1004,10,1004,10,1004,10,1004,10,1004,10,1004,10,1004,10,1004,10,1004,10</row>
|
||||
<row rownum="1">1004,10,1004,10,1004,10,1004,10,1004,10,1004,10,1004,10,1004,10,1010,3,1010,2,1010,2,1010,2,1004,10,1004,10,1004,10,1004,10,1004,10,1004,10,1004,10,1004,10,1004,10,1004,10</row>
|
||||
<row rownum="2">1004,10,1004,10,1004,10,1004,10,1004,10,1004,10,1004,10,1010,3,1010,3,1010,2,1010,2,1010,2,1010,2,1004,10,1004,10,1004,10,1004,10,1004,10,1004,10,1004,10,1004,10,1004,10</row>
|
||||
<row rownum="3">1004,10,1004,10,1004,10,1004,10,1004,10,1004,10,1010,3,1010,3,1010,3,1010,3,1010,2,1010,2,1010,2,1010,2,1004,10,1004,10,1004,10,1004,10,1004,10,1004,10,1004,10,1004,10</row>
|
||||
<row rownum="4">1004,10,1004,10,1004,10,1004,10,1004,10,1010,2,1010,2,1010,2,1010,3,1010,2,1010,2,1010,2,1010,2,1010,3,1010,3,1004,10,1004,10,1004,10,1004,10,1004,10,1004,10,1004,10</row>
|
||||
<row rownum="5">1004,10,1004,10,1004,10,1004,10,1004,10,1004,10,1004,10,1004,10,1010,3,1010,2,1010,2,1010,2,1010,2,1010,2,1010,3,1010,3,1004,10,1004,10,1004,10,1004,10,1004,10,1004,10</row>
|
||||
<row rownum="6">1004,10,1004,10,1004,10,1004,10,1004,10,1004,10,1004,10,1004,10,1010,3,1010,2,1010,2,1010,2,1010,2,1010,2,1010,3,1010,3,1010,3,1004,10,1004,10,1004,10,1004,10,1004,10</row>
|
||||
<row rownum="7">1004,10,1004,10,1010,3,1010,3,1004,10,1004,10,1004,10,1004,10,1010,3,1010,2,1010,2,1010,2,1010,2,1010,2,1004,10,1004,10,1004,10,1004,10,1004,10,1004,10,1004,10,1004,10</row>
|
||||
<row rownum="8">1004,10,1010,2,1010,3,1010,2,1010,2,1010,2,1010,2,1010,2,1010,2,1010,2,1010,3,1010,2,1010,2,1010,2,1004,10,1004,10,1004,10,1004,10,1010,3,1004,10,1004,10,1004,10</row>
|
||||
<row rownum="9">1010,2,1010,2,1010,3,1010,2,1010,2,1010,2,1010,2,1010,2,1010,2,1010,2,1010,2,1010,3,1010,2,1010,2,1004,10,1004,10,1004,10,1004,10,1010,3,1010,3,1004,10,1004,10</row>
|
||||
<row rownum="10">1010,2,1010,2,1010,2,1010,2,1010,2,1010,2,1010,2,1010,2,1010,3,1010,3,1010,2,1010,2,1010,2,1010,2,1010,2,1010,2,1010,2,1010,2,1010,2,1010,2,1010,2,1004,10</row>
|
||||
<row rownum="11">1004,10,1010,2,1010,2,1010,2,1010,2,1010,2,1010,2,1010,2,1010,2,1010,2,1010,2,1010,2,1010,2,1010,2,1010,2,1010,2,1010,2,1010,2,1010,2,1010,2,1010,2,1010,2</row>
|
||||
<row rownum="12">1004,10,1004,10,1010,2,1010,2,1010,2,1010,2,1010,2,1010,2,1010,2,1010,2,1010,2,1010,2,1010,2,1010,2,1010,2,1010,2,1010,2,1010,3,1010,3,1010,3,1010,2,1010,2</row>
|
||||
<row rownum="13">1004,10,1004,10,1004,10,1010,2,1010,2,1004,10,1004,10,1004,10,1004,10,1010,2,1010,2,1004,10,1010,2,1010,2,1010,2,1010,2,1010,2,1010,2,1010,2,1010,2,1010,2,1004,10</row>
|
||||
<row rownum="14">1004,10,1004,10,1004,10,1004,10,1010,2,1004,10,1004,10,1004,10,1004,10,1010,2,1010,2,1010,2,1010,2,1004,10,1004,10,1004,10,1004,10,1010,2,1010,2,1010,2,1004,10,1004,10</row>
|
||||
<row rownum="15">1004,10,1004,10,1004,10,1004,10,1004,10,1004,10,1004,10,1004,10,1004,10,1010,2,1010,2,1010,2,1010,2,1004,10,1004,10,1004,10,1004,10,1010,3,1010,3,1004,10,1004,10,1004,10</row>
|
||||
<row rownum="16">1004,10,1004,10,1004,10,1004,10,1004,10,1004,10,1010,3,1010,3,1010,3,1010,2,1010,2,1010,2,1010,2,1004,10,1004,10,1004,10,1004,10,1010,3,1004,10,1004,10,1004,10,1004,10</row>
|
||||
<row rownum="17">1004,10,1004,10,1004,10,1004,10,1004,10,1004,10,1004,10,1010,3,1010,3,1010,2,1010,3,1010,3,1010,2,1010,3,1010,3,1010,3,1010,3,1004,10,1004,10,1004,10,1004,10,1004,10</row>
|
||||
<row rownum="18">1004,10,1004,10,1004,10,1004,10,1004,10,1004,10,1004,10,1004,10,1010,3,1010,2,1010,2,1010,3,1010,2,1010,3,1010,3,1010,3,1004,10,1004,10,1004,10,1004,10,1004,10,1004,10</row>
|
||||
<row rownum="19">1004,10,1004,10,1004,10,1004,10,1004,10,1004,10,1004,10,1004,10,1004,10,1010,2,1010,2,1010,2,1010,2,1010,3,1010,3,1004,10,1004,10,1004,10,1004,10,1004,10,1004,10,1004,10</row>
|
||||
<row rownum="20">1004,10,1004,10,1004,10,1004,10,1004,10,1004,10,1004,10,1004,10,1004,10,1004,10,1010,2,1010,2,1010,2,1010,3,1004,10,1004,10,1004,10,1004,10,1004,10,1004,10,1004,10,1004,10</row>
|
||||
<row rownum="21">1004,10,1004,10,1004,10,1004,10,1004,10,1004,10,1004,10,1004,10,1004,10,1004,10,1004,10,1010,2,1010,2,1004,10,1004,10,1004,10,1004,10,1004,10,1004,10,1004,10,1004,10,1004,10</row>
|
||||
</layer>
|
||||
<layer lnum="1"></layer>
|
||||
<layer lnum="2">
|
||||
<row rownum="7" colstart="7">1009,0</row>
|
||||
<row rownum="9" colstart="17">1009,0</row>
|
||||
<row rownum="15" colstart="8">1009,0</row>
|
||||
<row rownum="16" colstart="16">1009,0</row>
|
||||
</layer>
|
||||
</tiles>
|
||||
</scene>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
//
|
||||
// $Id: ViewerSceneViewPanel.java,v 1.22 2001/10/25 22:08:29 mdb Exp $
|
||||
// $Id: ViewerSceneViewPanel.java,v 1.23 2001/10/26 01:17:22 shaper Exp $
|
||||
|
||||
package com.threerings.miso.viewer;
|
||||
|
||||
@@ -10,7 +10,10 @@ import javax.swing.JPanel;
|
||||
|
||||
import com.samskivert.util.Config;
|
||||
|
||||
import com.threerings.cast.*;
|
||||
|
||||
import com.threerings.media.sprite.*;
|
||||
import com.threerings.media.tile.TileManager;
|
||||
import com.threerings.media.util.RandomUtil;
|
||||
import com.threerings.media.util.PerformanceMonitor;
|
||||
import com.threerings.media.util.PerformanceObserver;
|
||||
@@ -18,6 +21,7 @@ import com.threerings.media.util.PerformanceObserver;
|
||||
import com.threerings.miso.Log;
|
||||
import com.threerings.miso.scene.*;
|
||||
import com.threerings.miso.scene.xml.XMLFileSceneRepository;
|
||||
import com.threerings.miso.scene.util.IsoUtil;
|
||||
import com.threerings.miso.util.*;
|
||||
import com.threerings.miso.viewer.util.ViewerContext;
|
||||
|
||||
@@ -40,8 +44,8 @@ public class ViewerSceneViewPanel extends SceneViewPanel
|
||||
prepareStartingScene();
|
||||
|
||||
// construct the character manager from which we obtain sprites
|
||||
CharacterManager charmgr = new CharacterManager(
|
||||
ctx.getConfig(), ctx.getTileManager(), _scenemodel);
|
||||
CharacterManager charmgr = MisoUtil.createCharacterManager(
|
||||
ctx.getConfig(), ctx.getTileManager());
|
||||
|
||||
// create the manipulable sprite
|
||||
_sprite = createSprite(spritemgr, charmgr, TSID_CHAR_USER);
|
||||
@@ -62,12 +66,16 @@ public class ViewerSceneViewPanel extends SceneViewPanel
|
||||
/**
|
||||
* Creates a new sprite.
|
||||
*/
|
||||
protected AmbulatorySprite createSprite (
|
||||
protected MisoCharacterSprite createSprite (
|
||||
SpriteManager spritemgr, CharacterManager charmgr, int tsid)
|
||||
{
|
||||
AmbulatorySprite s = charmgr.getCharacter(tsid);
|
||||
int dummy[] = { tsid };
|
||||
CharacterDescriptor desc = new CharacterDescriptor(dummy);
|
||||
MisoCharacterSprite s =
|
||||
(MisoCharacterSprite)charmgr.getCharacter(desc);
|
||||
if (s != null) {
|
||||
s.setLocation(300, 300);
|
||||
IsoUtil.setSpriteSceneLocation(_scenemodel, s);
|
||||
s.addSpriteObserver(this);
|
||||
spritemgr.addSprite(s);
|
||||
}
|
||||
@@ -81,7 +89,7 @@ public class ViewerSceneViewPanel extends SceneViewPanel
|
||||
protected void createDecoys (
|
||||
SpriteManager spritemgr, CharacterManager charmgr)
|
||||
{
|
||||
_decoys = new AmbulatorySprite[NUM_DECOYS];
|
||||
_decoys = new MisoCharacterSprite[NUM_DECOYS];
|
||||
for (int ii = 0; ii < NUM_DECOYS; ii++) {
|
||||
_decoys[ii] = createSprite(spritemgr, charmgr, TSID_CHAR);
|
||||
if (_decoys[ii] != null) {
|
||||
@@ -133,7 +141,7 @@ public class ViewerSceneViewPanel extends SceneViewPanel
|
||||
* screen coordinates. Returns whether a path was successfully
|
||||
* assigned.
|
||||
*/
|
||||
protected boolean createPath (AmbulatorySprite s, int x, int y)
|
||||
protected boolean createPath (MisoCharacterSprite s, int x, int y)
|
||||
{
|
||||
// get the path from here to there
|
||||
Path path = _view.getPath(s, x, y);
|
||||
@@ -151,7 +159,7 @@ public class ViewerSceneViewPanel extends SceneViewPanel
|
||||
/**
|
||||
* Assigns a new random path to the given sprite.
|
||||
*/
|
||||
protected void createRandomPath (AmbulatorySprite s)
|
||||
protected void createRandomPath (MisoCharacterSprite s)
|
||||
{
|
||||
Dimension d = _scenemodel.bounds.getSize();
|
||||
|
||||
@@ -166,7 +174,7 @@ public class ViewerSceneViewPanel extends SceneViewPanel
|
||||
public void handleEvent (SpriteEvent event)
|
||||
{
|
||||
if (event instanceof PathCompletedEvent) {
|
||||
AmbulatorySprite s = (AmbulatorySprite)event.getSprite();
|
||||
MisoCharacterSprite s = (MisoCharacterSprite)event.getSprite();
|
||||
|
||||
if (s != _sprite) {
|
||||
// move the sprite to a new random location
|
||||
@@ -188,10 +196,10 @@ public class ViewerSceneViewPanel extends SceneViewPanel
|
||||
protected AnimationManager _animmgr;
|
||||
|
||||
/** The sprite we're manipulating within the view. */
|
||||
protected AmbulatorySprite _sprite;
|
||||
protected MisoCharacterSprite _sprite;
|
||||
|
||||
/** The test sprites that meander about aimlessly. */
|
||||
protected AmbulatorySprite _decoys[];
|
||||
protected MisoCharacterSprite _decoys[];
|
||||
|
||||
/** The context object. */
|
||||
protected ViewerContext _ctx;
|
||||
|
||||
Reference in New Issue
Block a user