commit 7ee895405463e69bce3e32f4d49c1a4661c2aa83 Author: Leszek Koltunski Date: Sun Sep 26 22:12:34 2021 +0200 Remove redundant variable. diff --git a/src/main/java/org/distorted/objects/Movement.java b/src/main/java/org/distorted/objects/Movement.java index 3c2f9a3d..be8cff97 100644 --- a/src/main/java/org/distorted/objects/Movement.java +++ b/src/main/java/org/distorted/objects/Movement.java @@ -50,7 +50,6 @@ public abstract class Movement private float[][] mTouchBorders, mA, mB; private final int mType; - private final int[] mNumEnabled; private final int[][][] mEnabled; /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -62,7 +61,7 @@ public abstract class Movement /////////////////////////////////////////////////////////////////////////////////////////////////// Movement(Static3D[] rotAxis, Static3D[] faceAxis, float[][] cuts, boolean[][] rotatable, - float distance3D, int size, int type, int[] numEnabled, int[][][] enabled) + float distance3D, int size, int type, int[][][] enabled) { mPoint = new float[3]; mCamera= new float[3]; @@ -72,7 +71,6 @@ public abstract class Movement mMove2D = new float[2]; mType = type; - mNumEnabled = numEnabled; mEnabled = enabled; mFaceAxis = faceAxis; @@ -402,7 +400,7 @@ public abstract class Movement { int part = returnPart(mType,face,touchPoint); - int num = mNumEnabled[face]; + int num = mEnabled[face][0].length; enabled[0] = num; System.arraycopy(mEnabled[face][part], 0, enabled, 1, num); } diff --git a/src/main/java/org/distorted/objects/Movement12.java b/src/main/java/org/distorted/objects/Movement12.java index f92ffb38..910fa84a 100644 --- a/src/main/java/org/distorted/objects/Movement12.java +++ b/src/main/java/org/distorted/objects/Movement12.java @@ -53,9 +53,9 @@ class Movement12 extends Movement /////////////////////////////////////////////////////////////////////////////////////////////////// - Movement12(Static3D[] rotAxis,float[][] cuts, boolean[][] rotatable, int size, int type, int[] numEnabled, int[][][] enabled) + Movement12(Static3D[] rotAxis,float[][] cuts, boolean[][] rotatable, int size, int type, int[][][] enabled) { - super(rotAxis, FACE_AXIS, cuts,rotatable,DIST3D, size, type, numEnabled, enabled); + super(rotAxis, FACE_AXIS, cuts,rotatable,DIST3D, size, type, enabled); } /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/objects/Movement4.java b/src/main/java/org/distorted/objects/Movement4.java index 8bf1e7cb..dbccd4ed 100644 --- a/src/main/java/org/distorted/objects/Movement4.java +++ b/src/main/java/org/distorted/objects/Movement4.java @@ -39,9 +39,9 @@ class Movement4 extends Movement /////////////////////////////////////////////////////////////////////////////////////////////////// - Movement4(Static3D[] rotAxis,float[][] cuts, boolean[][] rotatable, int size, int type, int[] numEnabled, int[][][] enabled) + Movement4(Static3D[] rotAxis,float[][] cuts, boolean[][] rotatable, int size, int type, int[][][] enabled) { - super(rotAxis, FACE_AXIS, cuts, rotatable, DIST3D, size, type, numEnabled, enabled); + super(rotAxis, FACE_AXIS, cuts, rotatable, DIST3D, size, type, enabled); } /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/objects/Movement6.java b/src/main/java/org/distorted/objects/Movement6.java index 9225052a..4ea12b47 100644 --- a/src/main/java/org/distorted/objects/Movement6.java +++ b/src/main/java/org/distorted/objects/Movement6.java @@ -38,9 +38,9 @@ class Movement6 extends Movement /////////////////////////////////////////////////////////////////////////////////////////////////// - Movement6(Static3D[] rotAxis,float[][] cuts, boolean[][] rotatable, int size, int type, int[] numEnabled, int[][][] enabled) + Movement6(Static3D[] rotAxis,float[][] cuts, boolean[][] rotatable, int size, int type, int[][][] enabled) { - super(rotAxis, FACE_AXIS, cuts, rotatable, DIST3D, size, type, numEnabled, enabled); + super(rotAxis, FACE_AXIS, cuts, rotatable, DIST3D, size, type, enabled); } /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/objects/Movement8.java b/src/main/java/org/distorted/objects/Movement8.java index cd3397dc..32afaa60 100644 --- a/src/main/java/org/distorted/objects/Movement8.java +++ b/src/main/java/org/distorted/objects/Movement8.java @@ -39,9 +39,9 @@ class Movement8 extends Movement /////////////////////////////////////////////////////////////////////////////////////////////////// - Movement8(Static3D[] rotAxis,float[][] cuts, boolean[][] rotatable, int size, int type, int[] numEnabled, int[][][] enabled) + Movement8(Static3D[] rotAxis,float[][] cuts, boolean[][] rotatable, int size, int type, int[][][] enabled) { - super(rotAxis, FACE_AXIS, cuts, rotatable, DIST3D, size, type, numEnabled, enabled); + super(rotAxis, FACE_AXIS, cuts, rotatable, DIST3D, size, type, enabled); } /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/objects/TwistyBandagedAbstract.java b/src/main/java/org/distorted/objects/TwistyBandagedAbstract.java index 7c3a1f8d..e7381c74 100644 --- a/src/main/java/org/distorted/objects/TwistyBandagedAbstract.java +++ b/src/main/java/org/distorted/objects/TwistyBandagedAbstract.java @@ -53,8 +53,6 @@ abstract class TwistyBandagedAbstract extends Twisty6 {2,2,2} }; - private static final int[] NUM_ENABLED = {2,2,2,2,2,2}; - private static final int[][][] ENABLED = new int[][][] { {{1,2}},{{1,2}},{{0,2}},{{0,2}},{{0,1}},{{0,1}}, @@ -466,7 +464,7 @@ abstract class TwistyBandagedAbstract extends Twisty6 int numLayers = getNumLayers(); if( mCuts==null ) getCuts(numLayers); getLayerRotatable(numLayers); - mMovement = new Movement6(ROT_AXIS,mCuts,mLayerRotatable,numLayers,TYPE_NOT_SPLIT,NUM_ENABLED,ENABLED); + mMovement = new Movement6(ROT_AXIS,mCuts,mLayerRotatable,numLayers,TYPE_NOT_SPLIT,ENABLED); } return mMovement; } diff --git a/src/main/java/org/distorted/objects/TwistyCube.java b/src/main/java/org/distorted/objects/TwistyCube.java index 98abe32a..f1b6557b 100644 --- a/src/main/java/org/distorted/objects/TwistyCube.java +++ b/src/main/java/org/distorted/objects/TwistyCube.java @@ -44,8 +44,6 @@ class TwistyCube extends Twisty6 new Static3D(0,0,1) }; - private static final int[] NUM_ENABLED = {2,2,2,2,2,2}; - private static final int[][][] ENABLED = new int[][][] { {{1,2}},{{1,2}},{{0,2}},{{0,2}},{{0,1}},{{0,1}}, @@ -363,7 +361,7 @@ class TwistyCube extends Twisty6 int numLayers = getNumLayers(); if( mCuts==null ) getCuts(numLayers); getLayerRotatable(numLayers); - mMovement = new Movement6(ROT_AXIS,mCuts,mLayerRotatable,numLayers,TYPE_NOT_SPLIT,NUM_ENABLED,ENABLED); + mMovement = new Movement6(ROT_AXIS,mCuts,mLayerRotatable,numLayers,TYPE_NOT_SPLIT,ENABLED); } return mMovement; } diff --git a/src/main/java/org/distorted/objects/TwistyDiamond.java b/src/main/java/org/distorted/objects/TwistyDiamond.java index 73fca157..2bc947d2 100644 --- a/src/main/java/org/distorted/objects/TwistyDiamond.java +++ b/src/main/java/org/distorted/objects/TwistyDiamond.java @@ -46,8 +46,6 @@ public class TwistyDiamond extends Twisty8 new Static3D( 0,-SQ3/3,+SQ6/3) }; - private static final int[] NUM_ENABLED = {3,3,3,3,3,3,3,3}; - private static final int[][][] ENABLED = new int[][][] { {{1,2,3}},{{1,2,3}},{{0,2,3}},{{0,2,3}},{{0,1,3}},{{0,1,3}},{{0,1,2}},{{0,1,2}} @@ -506,7 +504,7 @@ public class TwistyDiamond extends Twisty8 int numLayers = getNumLayers(); if( mCuts==null ) getCuts(numLayers); getLayerRotatable(numLayers); - mMovement = new Movement8(ROT_AXIS,mCuts,mLayerRotatable,numLayers,TYPE_NOT_SPLIT,NUM_ENABLED,ENABLED); + mMovement = new Movement8(ROT_AXIS,mCuts,mLayerRotatable,numLayers,TYPE_NOT_SPLIT,ENABLED); } return mMovement; } diff --git a/src/main/java/org/distorted/objects/TwistyDino.java b/src/main/java/org/distorted/objects/TwistyDino.java index d67de040..17896bc3 100644 --- a/src/main/java/org/distorted/objects/TwistyDino.java +++ b/src/main/java/org/distorted/objects/TwistyDino.java @@ -45,8 +45,6 @@ public abstract class TwistyDino extends Twisty6 new Static3D(+SQ3/3,-SQ3/3,-SQ3/3) }; - private static final int[] NUM_ENABLED = {2,2,2,2,2,2}; - private static final int[][][] ENABLED = new int[][][] { {{0,1},{3,1},{2,3},{0,2}}, @@ -240,7 +238,7 @@ public abstract class TwistyDino extends Twisty6 int numLayers = getNumLayers(); if( mCuts==null ) getCuts(numLayers); getLayerRotatable(numLayers); - mMovement = new Movement6(ROT_AXIS,mCuts,mLayerRotatable,numLayers,TYPE_SPLIT_CORNER,NUM_ENABLED,ENABLED); + mMovement = new Movement6(ROT_AXIS,mCuts,mLayerRotatable,numLayers,TYPE_SPLIT_CORNER,ENABLED); } return mMovement; } diff --git a/src/main/java/org/distorted/objects/TwistyHelicopter.java b/src/main/java/org/distorted/objects/TwistyHelicopter.java index c0c159e1..894c7134 100644 --- a/src/main/java/org/distorted/objects/TwistyHelicopter.java +++ b/src/main/java/org/distorted/objects/TwistyHelicopter.java @@ -48,8 +48,6 @@ public class TwistyHelicopter extends Twisty6 new Static3D(-SQ2/2, -SQ2/2, 0) }; - private static final int[] NUM_ENABLED = {2,2,2,2,2,2}; - private static final int[][][] ENABLED = new int[][][] { {{2,5},{2,4},{3,4},{3,5}}, @@ -433,7 +431,7 @@ public class TwistyHelicopter extends Twisty6 int numLayers = getNumLayers(); if( mCuts==null ) getCuts(numLayers); getLayerRotatable(numLayers); - mMovement = new Movement6(ROT_AXIS,mCuts,mLayerRotatable,numLayers,TYPE_SPLIT_EDGE,NUM_ENABLED,ENABLED); + mMovement = new Movement6(ROT_AXIS,mCuts,mLayerRotatable,numLayers,TYPE_SPLIT_EDGE,ENABLED); } return mMovement; } diff --git a/src/main/java/org/distorted/objects/TwistyIvy.java b/src/main/java/org/distorted/objects/TwistyIvy.java index 698c914e..8c828cda 100644 --- a/src/main/java/org/distorted/objects/TwistyIvy.java +++ b/src/main/java/org/distorted/objects/TwistyIvy.java @@ -45,8 +45,6 @@ public class TwistyIvy extends Twisty6 new Static3D(+SQ3/3,-SQ3/3,-SQ3/3) }; - private static final int[] NUM_ENABLED = {1,1,1,1,1,1}; - private static final int[][][] ENABLED = new int[][][] { {{0},{3},{3},{0}}, @@ -460,7 +458,7 @@ public class TwistyIvy extends Twisty6 int numLayers = getNumLayers(); if( mCuts==null ) getCuts(numLayers); getLayerRotatable(numLayers); - mMovement = new Movement6(ROT_AXIS,mCuts,mLayerRotatable,numLayers,TYPE_SPLIT_CORNER,NUM_ENABLED,ENABLED); + mMovement = new Movement6(ROT_AXIS,mCuts,mLayerRotatable,numLayers,TYPE_SPLIT_CORNER,ENABLED); } return mMovement; } diff --git a/src/main/java/org/distorted/objects/TwistyJing.java b/src/main/java/org/distorted/objects/TwistyJing.java index 7573b9fc..8c4e07b1 100644 --- a/src/main/java/org/distorted/objects/TwistyJing.java +++ b/src/main/java/org/distorted/objects/TwistyJing.java @@ -45,8 +45,6 @@ public class TwistyJing extends Twisty4 new Static3D(-SQ6/3,+SQ3/3, 0), }; - private static final int[] NUM_ENABLED = {3,3,3,3}; - private static final int[][][] ENABLED = new int[][][] { {{1,2,3}},{{0,2,3}},{{0,1,3}},{{0,1,2}} @@ -419,7 +417,7 @@ public class TwistyJing extends Twisty4 int numLayers = getNumLayers(); if( mCuts==null ) getCuts(numLayers); getLayerRotatable(numLayers); - mMovement = new Movement4(ROT_AXIS,mCuts,mLayerRotatable,numLayers,TYPE_NOT_SPLIT,NUM_ENABLED,ENABLED); + mMovement = new Movement4(ROT_AXIS,mCuts,mLayerRotatable,numLayers,TYPE_NOT_SPLIT,ENABLED); } return mMovement; } diff --git a/src/main/java/org/distorted/objects/TwistyMinx.java b/src/main/java/org/distorted/objects/TwistyMinx.java index 03787276..c92b8db1 100644 --- a/src/main/java/org/distorted/objects/TwistyMinx.java +++ b/src/main/java/org/distorted/objects/TwistyMinx.java @@ -59,8 +59,6 @@ abstract class TwistyMinx extends Twisty12 new Static3D( SIN54/LEN, 0 , -C2/LEN ) }; - private static final int[] NUM_ENABLED = {2,2,2,2,2,2,2,2,2,2,2,2}; - private static final int[][][] ENABLED = new int[][][] { {{2,3},{3,5},{1,5},{1,4},{2,4}}, @@ -609,7 +607,7 @@ abstract class TwistyMinx extends Twisty12 int numLayers = getNumLayers(); if( mCuts==null ) getCuts(numLayers); getLayerRotatable(numLayers); - mMovement = new Movement12(ROT_AXIS,mCuts,mLayerRotatable,numLayers,TYPE_SPLIT_EDGE,NUM_ENABLED,ENABLED); + mMovement = new Movement12(ROT_AXIS,mCuts,mLayerRotatable,numLayers,TYPE_SPLIT_EDGE,ENABLED); } return mMovement; } diff --git a/src/main/java/org/distorted/objects/TwistyMirror.java b/src/main/java/org/distorted/objects/TwistyMirror.java index 22830b54..f60918f0 100644 --- a/src/main/java/org/distorted/objects/TwistyMirror.java +++ b/src/main/java/org/distorted/objects/TwistyMirror.java @@ -44,8 +44,6 @@ class TwistyMirror extends Twisty6 new Static3D(0,0,1) }; - private static final int[] NUM_ENABLED = {2,2,2,2,2,2}; - private static final int[][][] ENABLED = new int[][][] { {{1,2}},{{1,2}},{{0,2}},{{0,2}},{{0,1}},{{0,1}}, @@ -663,7 +661,7 @@ class TwistyMirror extends Twisty6 int numLayers = getNumLayers(); if( mCuts==null ) getCuts(numLayers); getLayerRotatable(numLayers); - mMovement = new Movement6(ROT_AXIS,mCuts,mLayerRotatable,numLayers,TYPE_NOT_SPLIT,NUM_ENABLED,ENABLED); + mMovement = new Movement6(ROT_AXIS,mCuts,mLayerRotatable,numLayers,TYPE_NOT_SPLIT,ENABLED); } return mMovement; } diff --git a/src/main/java/org/distorted/objects/TwistyPyraminx.java b/src/main/java/org/distorted/objects/TwistyPyraminx.java index b7cea39b..3272c37f 100644 --- a/src/main/java/org/distorted/objects/TwistyPyraminx.java +++ b/src/main/java/org/distorted/objects/TwistyPyraminx.java @@ -45,8 +45,6 @@ public class TwistyPyraminx extends Twisty4 new Static3D(-SQ6/3,+SQ3/3, 0), }; - private static final int[] NUM_ENABLED = {3,3,3,3}; - private static final int[][][] ENABLED = new int[][][] { {{1,2,3}},{{0,2,3}},{{0,1,3}},{{0,1,2}} @@ -390,7 +388,7 @@ public class TwistyPyraminx extends Twisty4 int numLayers = getNumLayers(); if( mCuts==null ) getCuts(numLayers); getLayerRotatable(numLayers); - mMovement = new Movement4(ROT_AXIS,mCuts,mLayerRotatable,numLayers,TYPE_NOT_SPLIT,NUM_ENABLED,ENABLED); + mMovement = new Movement4(ROT_AXIS,mCuts,mLayerRotatable,numLayers,TYPE_NOT_SPLIT,ENABLED); } return mMovement; } diff --git a/src/main/java/org/distorted/objects/TwistyRedi.java b/src/main/java/org/distorted/objects/TwistyRedi.java index fe564771..349f5082 100644 --- a/src/main/java/org/distorted/objects/TwistyRedi.java +++ b/src/main/java/org/distorted/objects/TwistyRedi.java @@ -45,8 +45,6 @@ public class TwistyRedi extends Twisty6 new Static3D(+SQ3/3,-SQ3/3,-SQ3/3) }; - private static final int[] NUM_ENABLED = {2,2,2,2,2,2}; - private static final int[][][] ENABLED = new int[][][] { {{0,1},{3,1},{2,3},{0,2}}, @@ -430,7 +428,7 @@ public class TwistyRedi extends Twisty6 int numLayers = getNumLayers(); if( mCuts==null ) getCuts(numLayers); getLayerRotatable(numLayers); - mMovement = new Movement6(ROT_AXIS,mCuts,mLayerRotatable,numLayers,TYPE_SPLIT_CORNER,NUM_ENABLED,ENABLED); + mMovement = new Movement6(ROT_AXIS,mCuts,mLayerRotatable,numLayers,TYPE_SPLIT_CORNER,ENABLED); } return mMovement; } diff --git a/src/main/java/org/distorted/objects/TwistyRex.java b/src/main/java/org/distorted/objects/TwistyRex.java index 4fb56860..0ec1323e 100644 --- a/src/main/java/org/distorted/objects/TwistyRex.java +++ b/src/main/java/org/distorted/objects/TwistyRex.java @@ -45,8 +45,6 @@ public class TwistyRex extends Twisty6 new Static3D(+SQ3/3,-SQ3/3,-SQ3/3) }; - private static final int[] NUM_ENABLED = {2,2,2,2,2,2}; - private static final int[][][] ENABLED = new int[][][] { {{0,1},{3,1},{2,3},{0,2}}, @@ -463,7 +461,7 @@ public class TwistyRex extends Twisty6 int numLayers = getNumLayers(); if( mCuts==null ) getCuts(numLayers); getLayerRotatable(numLayers); - mMovement = new Movement6(ROT_AXIS,mCuts,mLayerRotatable,numLayers,TYPE_SPLIT_CORNER,NUM_ENABLED,ENABLED); + mMovement = new Movement6(ROT_AXIS,mCuts,mLayerRotatable,numLayers,TYPE_SPLIT_CORNER,ENABLED); } return mMovement; } diff --git a/src/main/java/org/distorted/objects/TwistySkewb.java b/src/main/java/org/distorted/objects/TwistySkewb.java index 2fd0226e..dc532e19 100644 --- a/src/main/java/org/distorted/objects/TwistySkewb.java +++ b/src/main/java/org/distorted/objects/TwistySkewb.java @@ -45,8 +45,6 @@ public class TwistySkewb extends Twisty6 new Static3D(+SQ3/3,-SQ3/3,-SQ3/3) }; - private static final int[] NUM_ENABLED = {2,2,2,2,2,2}; - private static final int[][][] ENABLED = new int[][][] { {{0,1},{3,1},{2,3},{0,2}}, @@ -566,7 +564,7 @@ public class TwistySkewb extends Twisty6 int numLayers = getNumLayers(); if( mCuts==null ) getCuts(numLayers); getLayerRotatable(numLayers); - mMovement = new Movement6(ROT_AXIS,mCuts,mLayerRotatable,2*numLayers-2,TYPE_SPLIT_CORNER,NUM_ENABLED,ENABLED); + mMovement = new Movement6(ROT_AXIS,mCuts,mLayerRotatable,2*numLayers-2,TYPE_SPLIT_CORNER,ENABLED); } return mMovement; } diff --git a/src/main/java/org/distorted/objects/TwistySquare.java b/src/main/java/org/distorted/objects/TwistySquare.java index 3ac29cf0..a1e5fbc0 100644 --- a/src/main/java/org/distorted/objects/TwistySquare.java +++ b/src/main/java/org/distorted/objects/TwistySquare.java @@ -48,8 +48,6 @@ abstract class TwistySquare extends Twisty6 new Static3D(0,-1,0), }; - private static final int[] NUM_ENABLED = {1,1,1,1,2,2}; - private static final int[][][] ENABLED = new int[][][] { {{0}},{{0}},{{1}},{{1}},{{0,1}},{{0,1}} @@ -164,7 +162,7 @@ abstract class TwistySquare extends Twisty6 int numLayers = getNumLayers(); if( mCuts==null ) getCuts(numLayers); getLayerRotatable(numLayers); - mMovement = new Movement6(ROT_AXIS,mCuts,mLayerRotatable,numLayers,TYPE_NOT_SPLIT,NUM_ENABLED,ENABLED); + mMovement = new Movement6(ROT_AXIS,mCuts,mLayerRotatable,numLayers,TYPE_NOT_SPLIT,ENABLED); } return mMovement; } diff --git a/src/main/java/org/distorted/objects/TwistyUltimate.java b/src/main/java/org/distorted/objects/TwistyUltimate.java index f4d40758..70ab3a73 100644 --- a/src/main/java/org/distorted/objects/TwistyUltimate.java +++ b/src/main/java/org/distorted/objects/TwistyUltimate.java @@ -53,8 +53,6 @@ class TwistyUltimate extends Twisty12 new Static3D( 0,C,-B) }; - private static final int[] NUM_ENABLED = {2,2,2,2,2,2,2,2,2,2,2,2}; - private static final int[][][] ENABLED = new int[][][] { {{2,3}},{{1,3}},{{1,3}},{{2,3}},{{0,3}},{{0,2}},{{0,2}},{{0,3}},{{1,2}},{{0,1}},{{0,1}},{{1,2}} @@ -418,7 +416,7 @@ class TwistyUltimate extends Twisty12 int numLayers = getNumLayers(); if( mCuts==null ) getCuts(numLayers); getLayerRotatable(numLayers); - mMovement = new Movement12(ROT_AXIS,mCuts,mLayerRotatable,numLayers,TYPE_NOT_SPLIT,NUM_ENABLED,ENABLED); + mMovement = new Movement12(ROT_AXIS,mCuts,mLayerRotatable,numLayers,TYPE_NOT_SPLIT,ENABLED); } return mMovement; }