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

Brought things back up to date; pruned imports; made Eclipse suggested

Browse Source 
cleanups.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2972 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Michael Bayne
2004-02-25 14:51:26 +00:00
parent d618d3c771
commit d4595269d5
22 changed files with 90 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/src/java/com/threerings/miso/client/ScrollingFrame.java
+1 -2
View File
@@ -1,9 +1,8 @@
//
// $Id: ScrollingFrame.java,v 1.4 2003/01/31 23:11:07 mdb Exp $
// $Id: ScrollingFrame.java,v 1.5 2004/02/25 14:51:26 mdb Exp $
package com.threerings.miso.client;
import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.Component;
import java.awt.GraphicsConfiguration;
tests/src/java/com/threerings/miso/client/ScrollingScene.java
+1 -4
View File
@@ -1,11 +1,10 @@
//
// $Id: ScrollingScene.java,v 1.13 2003/04/17 19:21:17 mdb Exp $
// $Id: ScrollingScene.java,v 1.14 2004/02/25 14:51:26 mdb Exp $
package com.threerings.miso.client;
import java.awt.Rectangle;
import java.util.Collections;
import java.util.Iterator;
import java.util.Random;
@@ -13,8 +12,6 @@ import com.samskivert.io.PersistenceException;
import com.threerings.media.tile.NoSuchTileException;
import com.threerings.media.tile.NoSuchTileSetException;
import com.threerings.media.tile.ObjectTile;
import com.threerings.media.tile.Tile;
import com.threerings.media.tile.TileSet;
import com.threerings.media.tile.TileSetRepository;
tests/src/java/com/threerings/miso/client/ScrollingTestApp.java
+14 -21
View File
@@ -1,5 +1,5 @@
//
// $Id: ScrollingTestApp.java,v 1.23 2003/04/26 17:56:26 mdb Exp $
// $Id: ScrollingTestApp.java,v 1.24 2004/02/25 14:51:26 mdb Exp $
package com.threerings.miso.client;
@@ -7,11 +7,8 @@ import java.awt.DisplayMode;
import java.awt.GraphicsConfiguration;
import java.awt.GraphicsDevice;
import java.awt.GraphicsEnvironment;
import java.awt.Image;
import java.awt.Point;
import java.io.IOException;
import java.util.Iterator;
import com.samskivert.swing.util.SwingUtil;
import com.samskivert.util.Config;
@@ -21,13 +18,10 @@ import com.threerings.resource.ResourceManager;
import com.threerings.media.FrameManager;
import com.threerings.media.image.ImageManager;
import com.threerings.media.util.LinePath;
import com.threerings.media.util.MultiFrameImage;
import com.threerings.media.util.MultiFrameImageImpl;
import com.threerings.media.util.Path;
import com.threerings.media.sprite.PathCompletedEvent;
import com.threerings.media.sprite.PathAdapter;
import com.threerings.media.sprite.Sprite;
import com.threerings.media.sprite.SpriteEvent;
import com.threerings.media.sprite.SpriteObserver;
import com.threerings.media.tile.bundle.BundledTileSetRepository;
@@ -80,7 +74,8 @@ public class ScrollingTestApp
// we don't need to configure anything
ResourceManager rmgr = new ResourceManager("rsrc");
rmgr.initBundles(null, "config/resource/manager.properties", null);
rmgr.initBundles(
null, "config/resource/manager.properties", null, null);
ImageManager imgr = new ImageManager(rmgr, _frame);
_tilemgr = new MisoTileManager(rmgr, imgr);
_tilemgr.setTileSetRepository(
@@ -123,16 +118,14 @@ public class ScrollingTestApp
", name=" + scname + "].");
}
_ship.addSpriteObserver(new SpriteObserver() {
public void handleEvent (SpriteEvent event) {
if (event instanceof PathCompletedEvent) {
// keep scrolling for a spell
if (++_sidx < DX.length) {
int x = _ship.getX(), y = _ship.getY();
LinePath path = new LinePath(
x, y, x + DX[_sidx], y + DY[_sidx], 30000l);
_ship.move(path);
}
_ship.addSpriteObserver(new PathAdapter() {
public void pathCompleted (Sprite sprite, Path path, long when) {
// keep scrolling for a spell
if (++_sidx < DX.length) {
int x = _ship.getX(), y = _ship.getY();
LinePath lpath = new LinePath(
x, y, x + DX[_sidx], y + DY[_sidx], 30000l);
_ship.move(lpath);
}
}
protected int _sidx = -1;
@@ -141,7 +134,7 @@ public class ScrollingTestApp
});
// make the panel follow the ship around
_panel.setFollowsPathable(_ship);
_panel.setFollowsPathable(_ship, MisoScenePanel.CENTER_ON_PATHABLE);
int x = _ship.getX(), y = _ship.getY();
_ship.move(new LinePath(x, y, x, y + 1000, 3000l));