Nixed unused variable references.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@579 ed5b42cb-e716-0410-a449-f6a68f950b19
This commit is contained in:
@@ -114,7 +114,7 @@ public class SpritePanel extends JPanel
|
|||||||
{
|
{
|
||||||
if (_sprite != null) {
|
if (_sprite != null) {
|
||||||
Dimension d = getSize();
|
Dimension d = getSize();
|
||||||
int swid = _sprite.getWidth(), shei = _sprite.getHeight();
|
int shei = _sprite.getHeight();
|
||||||
int x = d.width / 2, y = (d.height + shei) / 2;
|
int x = d.width / 2, y = (d.height + shei) / 2;
|
||||||
_sprite.setLocation(x, y);
|
_sprite.setLocation(x, y);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -371,9 +371,7 @@ public class TimerView
|
|||||||
// Add error to the render completion percent if the interpolation
|
// Add error to the render completion percent if the interpolation
|
||||||
// hasn't finished yet
|
// hasn't finished yet
|
||||||
_renderComplete = _complete;
|
_renderComplete = _complete;
|
||||||
float error = _renderOffset;
|
|
||||||
if (_renderOffsetTime + _transitionTime > now) {
|
if (_renderOffsetTime + _transitionTime > now) {
|
||||||
|
|
||||||
_renderComplete += _renderOffset *
|
_renderComplete += _renderOffset *
|
||||||
(1f - (now - _renderOffsetTime) / (float) _transitionTime);
|
(1f - (now - _renderOffsetTime) / (float) _transitionTime);
|
||||||
_renderComplete = Math.max(0f, Math.min(1f, _renderComplete));
|
_renderComplete = Math.max(0f, Math.min(1f, _renderComplete));
|
||||||
|
|||||||
@@ -332,16 +332,12 @@ public class ImageManager
|
|||||||
public Mirage getMirage (ImageKey key, Rectangle bounds, Colorization[] zations)
|
public Mirage getMirage (ImageKey key, Rectangle bounds, Colorization[] zations)
|
||||||
{
|
{
|
||||||
BufferedImage src = null;
|
BufferedImage src = null;
|
||||||
|
|
||||||
float percentageOfDataBuffer = 1;
|
|
||||||
if (bounds == null) {
|
if (bounds == null) {
|
||||||
// if they specified no bounds, we need to load up the raw image and determine its
|
// 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
|
// bounds so that we can pass those along to the created mirage
|
||||||
src = getImage(key, zations);
|
src = getImage(key, zations);
|
||||||
bounds = new Rectangle(0, 0, src.getWidth(), src.getHeight());
|
bounds = new Rectangle(0, 0, src.getWidth(), src.getHeight());
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return new CachedVolatileMirage(this, key, bounds, zations);
|
return new CachedVolatileMirage(this, key, bounds, zations);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -143,13 +143,11 @@ public class ImageUtil
|
|||||||
// convert the colors to HSV
|
// convert the colors to HSV
|
||||||
float[] hsv = new float[3];
|
float[] hsv = new float[3];
|
||||||
int[] fhsv = new int[3];
|
int[] fhsv = new int[3];
|
||||||
int tpixel = -1;
|
|
||||||
for (int i = 0; i < size; i++) {
|
for (int i = 0; i < size; i++) {
|
||||||
int value = rgbs[i];
|
int value = rgbs[i];
|
||||||
|
|
||||||
// don't fiddle with alpha pixels
|
// don't fiddle with alpha pixels
|
||||||
if ((value & 0xFF000000) == 0) {
|
if ((value & 0xFF000000) == 0) {
|
||||||
tpixel = i;
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -74,7 +74,6 @@ public class Mp3Player extends MusicPlayer
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
AudioFormat sourceFormat = inStream.getFormat();
|
|
||||||
AudioFormat.Encoding targetEnc = AudioFormat.Encoding.PCM_SIGNED;
|
AudioFormat.Encoding targetEnc = AudioFormat.Encoding.PCM_SIGNED;
|
||||||
|
|
||||||
inStream = AudioSystem.getAudioInputStream(targetEnc, inStream);
|
inStream = AudioSystem.getAudioInputStream(targetEnc, inStream);
|
||||||
|
|||||||
@@ -675,7 +675,6 @@ public class SoundManager
|
|||||||
throws IOException, UnsupportedAudioFileException
|
throws IOException, UnsupportedAudioFileException
|
||||||
{
|
{
|
||||||
byte[][] data;
|
byte[][] data;
|
||||||
boolean verbose = _verbose.getValue();
|
|
||||||
synchronized (_clipCache) {
|
synchronized (_clipCache) {
|
||||||
// if we're testing, clear all non-locked sounds every time
|
// if we're testing, clear all non-locked sounds every time
|
||||||
if (isTesting()) {
|
if (isTesting()) {
|
||||||
|
|||||||
@@ -199,7 +199,6 @@ public class BundledTileSetRepository
|
|||||||
throws NoSuchTileSetException, PersistenceException
|
throws NoSuchTileSetException, PersistenceException
|
||||||
{
|
{
|
||||||
waitForBundles();
|
waitForBundles();
|
||||||
TileSet tset = null;
|
|
||||||
Integer tsid = (Integer)_namemap.get(setName);
|
Integer tsid = (Integer)_namemap.get(setName);
|
||||||
if (tsid != null) {
|
if (tsid != null) {
|
||||||
return getTileSet(tsid.intValue());
|
return getTileSet(tsid.intValue());
|
||||||
|
|||||||
@@ -25,7 +25,6 @@ import java.io.File;
|
|||||||
import java.util.Iterator;
|
import java.util.Iterator;
|
||||||
|
|
||||||
import com.threerings.resource.FileResourceBundle;
|
import com.threerings.resource.FileResourceBundle;
|
||||||
import com.threerings.resource.ResourceManager;
|
|
||||||
import com.threerings.resource.ResourceBundle;
|
import com.threerings.resource.ResourceBundle;
|
||||||
|
|
||||||
import com.threerings.media.tile.TileSet;
|
import com.threerings.media.tile.TileSet;
|
||||||
@@ -49,10 +48,6 @@ public class DumpBundle
|
|||||||
System.exit(-1);
|
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++) {
|
for (int i = 0; i < args.length; i++) {
|
||||||
// oh the hackery
|
// oh the hackery
|
||||||
if (args[i].equals("-tiles")) {
|
if (args[i].equals("-tiles")) {
|
||||||
|
|||||||
@@ -109,7 +109,7 @@ public class SceneBlockResolver extends LoopingThread
|
|||||||
}
|
}
|
||||||
|
|
||||||
// queue it up on the AWT thread to complete its resolution
|
// 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() {
|
EventQueue.invokeLater(new Runnable() {
|
||||||
public void run () {
|
public void run () {
|
||||||
// let the block's panel know that it is resolved
|
// let the block's panel know that it is resolved
|
||||||
|
|||||||
@@ -122,7 +122,7 @@ public class FastImageIO
|
|||||||
IntBuffer ibuf = mbuf.asIntBuffer();
|
IntBuffer ibuf = mbuf.asIntBuffer();
|
||||||
int width = ibuf.get();
|
int width = ibuf.get();
|
||||||
int height = ibuf.get();
|
int height = ibuf.get();
|
||||||
int tpixel = ibuf.get();
|
/* int tpixel = */ ibuf.get();
|
||||||
int msize = ibuf.get();
|
int msize = ibuf.get();
|
||||||
|
|
||||||
if (width > Short.MAX_VALUE || width < 0 ||
|
if (width > Short.MAX_VALUE || width < 0 ||
|
||||||
|
|||||||
Reference in New Issue
Block a user