From 3fad5fb5693f47ab22ef37413bbde8291df2ceae Mon Sep 17 00:00:00 2001 From: Michael Bayne Date: Sat, 26 Jul 2008 22:04:15 +0000 Subject: [PATCH] Nixed unused variable references. git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@579 ed5b42cb-e716-0410-a449-f6a68f950b19 --- src/java/com/threerings/cast/builder/SpritePanel.java | 2 +- src/java/com/threerings/media/TimerView.java | 2 -- src/java/com/threerings/media/image/ImageManager.java | 4 ---- src/java/com/threerings/media/image/ImageUtil.java | 2 -- src/java/com/threerings/media/sound/Mp3Player.java | 1 - src/java/com/threerings/media/sound/SoundManager.java | 1 - .../media/tile/bundle/BundledTileSetRepository.java | 1 - .../com/threerings/media/tile/bundle/tools/DumpBundle.java | 5 ----- src/java/com/threerings/miso/client/SceneBlockResolver.java | 2 +- src/java/com/threerings/resource/FastImageIO.java | 2 +- 10 files changed, 3 insertions(+), 19 deletions(-) diff --git a/src/java/com/threerings/cast/builder/SpritePanel.java b/src/java/com/threerings/cast/builder/SpritePanel.java index 83d479ca..3ebb4aa3 100644 --- a/src/java/com/threerings/cast/builder/SpritePanel.java +++ b/src/java/com/threerings/cast/builder/SpritePanel.java @@ -114,7 +114,7 @@ public class SpritePanel extends JPanel { if (_sprite != null) { Dimension d = getSize(); - int swid = _sprite.getWidth(), shei = _sprite.getHeight(); + int shei = _sprite.getHeight(); int x = d.width / 2, y = (d.height + shei) / 2; _sprite.setLocation(x, y); } diff --git a/src/java/com/threerings/media/TimerView.java b/src/java/com/threerings/media/TimerView.java index 4e6472ca..f61aa998 100644 --- a/src/java/com/threerings/media/TimerView.java +++ b/src/java/com/threerings/media/TimerView.java @@ -371,9 +371,7 @@ public class TimerView // Add error to the render completion percent if the interpolation // hasn't finished yet _renderComplete = _complete; - float error = _renderOffset; if (_renderOffsetTime + _transitionTime > now) { - _renderComplete += _renderOffset * (1f - (now - _renderOffsetTime) / (float) _transitionTime); _renderComplete = Math.max(0f, Math.min(1f, _renderComplete)); diff --git a/src/java/com/threerings/media/image/ImageManager.java b/src/java/com/threerings/media/image/ImageManager.java index 3a1926a7..f581a5a8 100644 --- a/src/java/com/threerings/media/image/ImageManager.java +++ b/src/java/com/threerings/media/image/ImageManager.java @@ -332,16 +332,12 @@ public class ImageManager public Mirage getMirage (ImageKey key, Rectangle bounds, Colorization[] zations) { BufferedImage src = null; - - float percentageOfDataBuffer = 1; if (bounds == null) { // if they specified no bounds, we need to load up the raw image and determine its // bounds so that we can pass those along to the created mirage src = getImage(key, zations); bounds = new Rectangle(0, 0, src.getWidth(), src.getHeight()); - } - return new CachedVolatileMirage(this, key, bounds, zations); } diff --git a/src/java/com/threerings/media/image/ImageUtil.java b/src/java/com/threerings/media/image/ImageUtil.java index 0e77a03d..e07efbfa 100644 --- a/src/java/com/threerings/media/image/ImageUtil.java +++ b/src/java/com/threerings/media/image/ImageUtil.java @@ -143,13 +143,11 @@ public class ImageUtil // convert the colors to HSV float[] hsv = new float[3]; int[] fhsv = new int[3]; - int tpixel = -1; for (int i = 0; i < size; i++) { int value = rgbs[i]; // don't fiddle with alpha pixels if ((value & 0xFF000000) == 0) { - tpixel = i; continue; } diff --git a/src/java/com/threerings/media/sound/Mp3Player.java b/src/java/com/threerings/media/sound/Mp3Player.java index c1f1c77f..36809cc2 100644 --- a/src/java/com/threerings/media/sound/Mp3Player.java +++ b/src/java/com/threerings/media/sound/Mp3Player.java @@ -74,7 +74,6 @@ public class Mp3Player extends MusicPlayer return; } - AudioFormat sourceFormat = inStream.getFormat(); AudioFormat.Encoding targetEnc = AudioFormat.Encoding.PCM_SIGNED; inStream = AudioSystem.getAudioInputStream(targetEnc, inStream); diff --git a/src/java/com/threerings/media/sound/SoundManager.java b/src/java/com/threerings/media/sound/SoundManager.java index 1fd27428..3f41e1e5 100644 --- a/src/java/com/threerings/media/sound/SoundManager.java +++ b/src/java/com/threerings/media/sound/SoundManager.java @@ -675,7 +675,6 @@ public class SoundManager throws IOException, UnsupportedAudioFileException { byte[][] data; - boolean verbose = _verbose.getValue(); synchronized (_clipCache) { // if we're testing, clear all non-locked sounds every time if (isTesting()) { diff --git a/src/java/com/threerings/media/tile/bundle/BundledTileSetRepository.java b/src/java/com/threerings/media/tile/bundle/BundledTileSetRepository.java index d665fba3..1d7d6988 100644 --- a/src/java/com/threerings/media/tile/bundle/BundledTileSetRepository.java +++ b/src/java/com/threerings/media/tile/bundle/BundledTileSetRepository.java @@ -199,7 +199,6 @@ public class BundledTileSetRepository throws NoSuchTileSetException, PersistenceException { waitForBundles(); - TileSet tset = null; Integer tsid = (Integer)_namemap.get(setName); if (tsid != null) { return getTileSet(tsid.intValue()); diff --git a/src/java/com/threerings/media/tile/bundle/tools/DumpBundle.java b/src/java/com/threerings/media/tile/bundle/tools/DumpBundle.java index a88ff2cc..927c4ebc 100644 --- a/src/java/com/threerings/media/tile/bundle/tools/DumpBundle.java +++ b/src/java/com/threerings/media/tile/bundle/tools/DumpBundle.java @@ -25,7 +25,6 @@ import java.io.File; import java.util.Iterator; import com.threerings.resource.FileResourceBundle; -import com.threerings.resource.ResourceManager; import com.threerings.resource.ResourceBundle; import com.threerings.media.tile.TileSet; @@ -49,10 +48,6 @@ public class DumpBundle System.exit(-1); } - // create a resource and image manager in case they want to dump - // the tiles - ResourceManager rmgr = new ResourceManager("rsrc"); - for (int i = 0; i < args.length; i++) { // oh the hackery if (args[i].equals("-tiles")) { diff --git a/src/java/com/threerings/miso/client/SceneBlockResolver.java b/src/java/com/threerings/miso/client/SceneBlockResolver.java index 558246fb..1c41f452 100644 --- a/src/java/com/threerings/miso/client/SceneBlockResolver.java +++ b/src/java/com/threerings/miso/client/SceneBlockResolver.java @@ -109,7 +109,7 @@ public class SceneBlockResolver extends LoopingThread } // queue it up on the AWT thread to complete its resolution - final boolean report = (_queue.size() == 0); +// final boolean report = (_queue.size() == 0); EventQueue.invokeLater(new Runnable() { public void run () { // let the block's panel know that it is resolved diff --git a/src/java/com/threerings/resource/FastImageIO.java b/src/java/com/threerings/resource/FastImageIO.java index 05127c78..34b2ed04 100644 --- a/src/java/com/threerings/resource/FastImageIO.java +++ b/src/java/com/threerings/resource/FastImageIO.java @@ -122,7 +122,7 @@ public class FastImageIO IntBuffer ibuf = mbuf.asIntBuffer(); int width = ibuf.get(); int height = ibuf.get(); - int tpixel = ibuf.get(); + /* int tpixel = */ ibuf.get(); int msize = ibuf.get(); if (width > Short.MAX_VALUE || width < 0 ||