Altered character animations to separate standing image from walking

animation images.  Created and made use of basic single- and
multi-image implementations of the MultiFrameImage interface.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@559 542714f4-19e9-0310-aa3c-eee0fc999fb1

src/java/com/threerings/cast/CharacterManager.java

@@ -1,5 +1,5 @@
 //
-// $Id: CharacterManager.java,v 1.3 2001/10/24 00:55:08 shaper Exp $
+// $Id: CharacterManager.java,v 1.4 2001/10/25 18:06:17 shaper Exp $
 
 package com.threerings.miso.scene;
 
@@ -13,6 +13,7 @@ import com.threerings.media.sprite.MultiFrameImage;
 import com.threerings.media.tile.TileManager;
 
 import com.threerings.miso.Log;
+import com.threerings.miso.scene.AmbulatorySprite.CharacterImages;
 import com.threerings.miso.scene.xml.XMLCharacterParser;
 import com.threerings.miso.tile.TileUtil;
 import com.threerings.miso.util.MisoUtil;
@@ -57,10 +58,10 @@ public class CharacterManager
             return null;
         }
 
-	MultiFrameImage[] anims = TileUtil.getAmbulatorySpriteFrames(
+	CharacterImages imgs = TileUtil.getCharacterImages(
             _tilemgr, tsid, info.frameCount);
 
-        AmbulatorySprite sprite = new AmbulatorySprite(_model, 0, 0, anims);
+        AmbulatorySprite sprite = new AmbulatorySprite(_model, 0, 0, imgs);
         sprite.setFrameRate(info.fps);
         sprite.setOrigin(info.origin.x, info.origin.y);
 

src/java/com/threerings/cast/CharacterSprite.java

@@ -1,5 +1,5 @@
 //
-// $Id: CharacterSprite.java,v 1.14 2001/10/24 00:55:08 shaper Exp $
+// $Id: CharacterSprite.java,v 1.15 2001/10/25 18:06:17 shaper Exp $
 
 package com.threerings.miso.scene;
 
@@ -25,17 +25,17 @@ public class AmbulatorySprite extends Sprite implements Traverser
      *
      * @param x the sprite x-position in pixels.
      * @param y the sprite y-position in pixels.
-     * @param anims the set of multi-frame images to use when animating
-     * the sprite in each of the compass directions.
+     * @param images the images used to display the sprite when
+     * standing or walking about.
      */
     public AmbulatorySprite (
-        IsoSceneViewModel model, int x, int y, MultiFrameImage[] anims)
+        IsoSceneViewModel model, int x, int y, CharacterImages images)
     {
         super(x, y);
 
         // keep track of these
         _model = model;
-        _anims = anims;
+        _images = images;
 
         // give ourselves an initial orientation
         setOrientation(DIR_NORTH);
@@ -47,7 +47,11 @@ public class AmbulatorySprite extends Sprite implements Traverser
         super.setOrientation(orient);
 
         // update the sprite frames to reflect the direction
-        setFrames(_anims[_orient]);
+        if (_path == null) {
+            setFrames(_images.standing[_orient]);
+        } else {
+            setFrames(_images.walking[_orient]);
+        }
     }
 
     /**
@@ -106,8 +110,7 @@ public class AmbulatorySprite extends Sprite implements Traverser
     protected void halt ()
     {
         // come to a halt looking settled and at peace
-        _frame = _frames.getFrame(_frameIdx = 0);
-        invalidate();
+        setFrames(_images.standing[_orient]);
 
         // disable walking animation
         setAnimationMode(NO_ANIMATION);
@@ -213,8 +216,21 @@ public class AmbulatorySprite extends Sprite implements Traverser
         buf.append(", finey=").append(_finey);
     }
 
+    /**
+     * A class to hold the images that are used to display the sprite
+     * while walking about.
+     */
+    public static class CharacterImages
+    {
+        /** The images of the sprite standing at rest in each orientation. */
+        public MultiFrameImage standing[];
+
+        /** The images of the sprite walking in each orientation. */
+        public MultiFrameImage walking[];
+    }
+
     /** The animation frames for the sprite facing each direction. */
-    protected MultiFrameImage[] _anims;
+    protected CharacterImages _images;
 
     /** The iso scene view model. */
     protected IsoSceneViewModel _model;