commit 91792184fad21e2afa0e8342266340a40b709b43 Author: Leszek Koltunski Date: Fri Sep 10 01:29:55 2021 +0200 Make object scrambling abstract (well, almost - with exception of Square-1 - this theoretically could also be done the generic way, but this would require almost 20000 'ScrambleStates') diff --git a/src/main/java/org/distorted/objects/TwistyBandaged2Bar.java b/src/main/java/org/distorted/objects/TwistyBandaged2Bar.java index ebdfefaf..b1189d75 100644 --- a/src/main/java/org/distorted/objects/TwistyBandaged2Bar.java +++ b/src/main/java/org/distorted/objects/TwistyBandaged2Bar.java @@ -36,13 +36,23 @@ class TwistyBandaged2Bar extends TwistyBandagedAbstract DistortedEffects effects, int[][] moves, Resources res, int scrWidth) { super(size, quat, texture, mesh, effects, moves, ObjectList.BAN2, res, scrWidth); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// - mStates = new ScrambleState[] + ScrambleState[] getScrambleStates() + { + if( mStates==null ) { - new ScrambleState( new int[][] { {} , {0,1,1, 0,-1,1, 2,1,2, 2,-1,2}, {} }), - new ScrambleState( new int[][] { {0,-1,1, 0,1,1, 0,2,1, 2,-1,1, 2,1,1, 2,2,1}, {0,2,1, 2,2,1} , {} }), - new ScrambleState( new int[][] { {}, {0,2,2, 2,2,2} , {0,-1,2, 0,1,2, 0,2,2, 2,-1,2, 2,1,2, 2,2,2} }) - }; + mStates = new ScrambleState[] + { + new ScrambleState( new int[][] { {} , {0,1,1, 0,-1,1, 2,1,2, 2,-1,2}, {} }), + new ScrambleState( new int[][] { {0,-1,1, 0,1,1, 0,2,1, 2,-1,1, 2,1,1, 2,2,1}, {0,2,1, 2,2,1} , {} }), + new ScrambleState( new int[][] { {}, {0,2,2, 2,2,2} , {0,-1,2, 0,1,2, 0,2,2, 2,-1,2, 2,1,2, 2,2,2} }) + }; + } + + return mStates; } /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/objects/TwistyBandaged3Plate.java b/src/main/java/org/distorted/objects/TwistyBandaged3Plate.java index 8796fbcf..e7b6fb35 100644 --- a/src/main/java/org/distorted/objects/TwistyBandaged3Plate.java +++ b/src/main/java/org/distorted/objects/TwistyBandaged3Plate.java @@ -36,26 +36,36 @@ class TwistyBandaged3Plate extends TwistyBandagedAbstract DistortedEffects effects, int[][] moves, Resources res, int scrWidth) { super(size, quat, texture, mesh, effects, moves, ObjectList.BAN3, res, scrWidth); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// - mStates = new ScrambleState[] + ScrambleState[] getScrambleStates() { - new ScrambleState( new int[][] {{ 2,-1, 1, 2, 1, 6 }, { 0,-1, 5, 0, 1, 3 }, { 2,-1, 2, 2, 1, 4 }} ), - new ScrambleState( new int[][] {{ 2, 1, 0 }, { }, { 2, 1,10, 2, 2, 7 }} ), - new ScrambleState( new int[][] {{ }, { 0,-1,11, 0, 2, 8 }, { 2, 1, 0 }} ), - new ScrambleState( new int[][] {{ 2, 1,12, 2, 2, 9 }, { 0,-1, 0 }, { }} ), - new ScrambleState( new int[][] {{ 2,-1,10, 2, 2,13 }, { }, { 2,-1, 0 }} ), - new ScrambleState( new int[][] {{ }, { 0, 1, 0 }, { 2,-1,11, 2, 2,14 }} ), - new ScrambleState( new int[][] {{ 2,-1, 0 }, { 0, 1,12, 0, 2,15 }, { }} ), - new ScrambleState( new int[][] {{ }, { 2,-2, 7, 2,-1, 7, 2, 1, 7, 2, 2, 7}, { 2,-1,10, 2, 2, 1 }} ), - new ScrambleState( new int[][] {{ 0,-2, 8, 0,-1, 8, 0, 1, 8, 0, 2, 8}, { 0, 1,11, 0, 2, 2 }, { }} ), - new ScrambleState( new int[][] {{ 2,-1,12, 2, 2, 3 }, { }, { 0,-2, 9, 0,-1, 9, 0, 1, 9, 0, 2, 9}} ), - new ScrambleState( new int[][] {{ 2,-1,13, 2, 1, 4 }, { 2,-2,10, 2,-1,10, 2, 1,10, 2, 2,10}, { 2,-1, 1, 2, 1, 7 }} ), - new ScrambleState( new int[][] {{ 0,-2,11, 0,-1,11, 0, 1,11, 0, 2,11}, { 0,-1, 8, 0, 1, 2 }, { 2,-1,14, 2, 1, 5 }} ), - new ScrambleState( new int[][] {{ 2,-1, 3, 2, 1, 9 }, { 0,-1, 6, 0, 1,15 }, { 0,-2,12, 0,-1,12, 0, 1,12, 0, 2,12}} ), - new ScrambleState( new int[][] {{ 2, 1,10, 2, 2, 4 }, { 2,-2,13, 2,-1,13, 2, 1,13, 2, 2,13}, { }} ), - new ScrambleState( new int[][] {{ 0,-2,14, 0,-1,14, 0, 1,14, 0, 2,14}, { }, { 2, 1,11, 2, 2, 5 }} ), - new ScrambleState( new int[][] {{ }, { 0,-1,12, 0, 2, 6 }, { 0,-2,15, 0,-1,15, 0, 1,15, 0, 2,15}} ) - }; + if( mStates==null ) + { + mStates = new ScrambleState[] + { + new ScrambleState( new int[][] {{ 2,-1, 1, 2, 1, 6 }, { 0,-1, 5, 0, 1, 3 }, { 2,-1, 2, 2, 1, 4 }} ), + new ScrambleState( new int[][] {{ 2, 1, 0 }, { }, { 2, 1,10, 2, 2, 7 }} ), + new ScrambleState( new int[][] {{ }, { 0,-1,11, 0, 2, 8 }, { 2, 1, 0 }} ), + new ScrambleState( new int[][] {{ 2, 1,12, 2, 2, 9 }, { 0,-1, 0 }, { }} ), + new ScrambleState( new int[][] {{ 2,-1,10, 2, 2,13 }, { }, { 2,-1, 0 }} ), + new ScrambleState( new int[][] {{ }, { 0, 1, 0 }, { 2,-1,11, 2, 2,14 }} ), + new ScrambleState( new int[][] {{ 2,-1, 0 }, { 0, 1,12, 0, 2,15 }, { }} ), + new ScrambleState( new int[][] {{ }, { 2,-2, 7, 2,-1, 7, 2, 1, 7, 2, 2, 7}, { 2,-1,10, 2, 2, 1 }} ), + new ScrambleState( new int[][] {{ 0,-2, 8, 0,-1, 8, 0, 1, 8, 0, 2, 8}, { 0, 1,11, 0, 2, 2 }, { }} ), + new ScrambleState( new int[][] {{ 2,-1,12, 2, 2, 3 }, { }, { 0,-2, 9, 0,-1, 9, 0, 1, 9, 0, 2, 9}} ), + new ScrambleState( new int[][] {{ 2,-1,13, 2, 1, 4 }, { 2,-2,10, 2,-1,10, 2, 1,10, 2, 2,10}, { 2,-1, 1, 2, 1, 7 }} ), + new ScrambleState( new int[][] {{ 0,-2,11, 0,-1,11, 0, 1,11, 0, 2,11}, { 0,-1, 8, 0, 1, 2 }, { 2,-1,14, 2, 1, 5 }} ), + new ScrambleState( new int[][] {{ 2,-1, 3, 2, 1, 9 }, { 0,-1, 6, 0, 1,15 }, { 0,-2,12, 0,-1,12, 0, 1,12, 0, 2,12}} ), + new ScrambleState( new int[][] {{ 2, 1,10, 2, 2, 4 }, { 2,-2,13, 2,-1,13, 2, 1,13, 2, 2,13}, { }} ), + new ScrambleState( new int[][] {{ 0,-2,14, 0,-1,14, 0, 1,14, 0, 2,14}, { }, { 2, 1,11, 2, 2, 5 }} ), + new ScrambleState( new int[][] {{ }, { 0,-1,12, 0, 2, 6 }, { 0,-2,15, 0,-1,15, 0, 1,15, 0, 2,15}} ) + }; + } + + return mStates; } /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/objects/TwistyBandagedAbstract.java b/src/main/java/org/distorted/objects/TwistyBandagedAbstract.java index a410be79..5551b2ce 100644 --- a/src/main/java/org/distorted/objects/TwistyBandagedAbstract.java +++ b/src/main/java/org/distorted/objects/TwistyBandagedAbstract.java @@ -30,8 +30,6 @@ import org.distorted.library.mesh.MeshSquare; import org.distorted.library.type.Static3D; import org.distorted.library.type.Static4D; -import java.util.Random; - /////////////////////////////////////////////////////////////////////////////////////////////////// abstract class TwistyBandagedAbstract extends TwistyObject @@ -63,10 +61,6 @@ abstract class TwistyBandagedAbstract extends TwistyObject private static final int NUM_STICKERS = 4; private int[] mBasicAngle; - private int mCurrState; - private int mIndexExcluded; - private int[][] mScrambleTable; - private int[] mNumOccurences; private Static4D[] mQuats; private ObjectSticker[] mStickers; private Static4D[] mInitQuats; @@ -466,57 +460,9 @@ abstract class TwistyBandagedAbstract extends TwistyObject return getNumLayers(); } -/////////////////////////////////////////////////////////////////////////////////////////////////// - - private void initializeScrambling() - { - int numLayers = getNumLayers(); - - if( mScrambleTable ==null ) - { - mScrambleTable = new int[NUM_AXIS][numLayers]; - } - if( mNumOccurences ==null ) - { - int max=0; - - for (ScrambleState mState : mStates) - { - int tmp = mState.getTotal(-1); - if (max < tmp) max = tmp; - } - - mNumOccurences = new int[max]; - } - - for(int i=0; i. // +/////////////////////////////////////////////////////////////////////////////////////////////////// + +package org.distorted.objects; + +import org.distorted.helpers.ScrambleState; + +import java.util.Random; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + +public class TwistyObjectScrambler + { + private final ScrambleState[] mStates; + private final int mType; + private final int mNumAxis; + private final int mNumLayers; + + // type=0, i.e. main + private int mCurrState; + private int mIndexExcluded; + private int[][] mScrambleTable; + private int[] mNumOccurences; + + // type=1, i.e. the exception: Square-1 + private static final int BASIC_ANGLE = 12; + private static final int LAST_SL = 0; // automatic rotations: last rot was a 'slash' i.e. along ROT_AXIS[1] + private static final int LAST_UP = 1; // last rot was along ROT_AXIS[0], upper layer and forelast was a slash + private static final int LAST_LO = 2; // last rot was along ROT_AXIS[0], lower layer and forelast was a slash + private static final int LAST_UL = 3; // two last rots were along ROT_AXIS[0] (so the next must be a slash) + + private int[][] mPermittedAngles; + private int[] mCornerQuat; + private int mPermittedUp, mPermittedDo; + private int[][] mBadCornerQuats; + private int mLastRot; + private int[][] mQuatMult; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + TwistyObjectScrambler(int type, int numAxis, int numLayers, ScrambleState[] states) + { + mType = type; + mNumAxis = numAxis; + mNumLayers = numLayers; + mStates = states; + + if( mType==1 ) + { + mPermittedAngles = new int[2][BASIC_ANGLE]; + mCornerQuat = new int[8]; + mLastRot = LAST_SL; + } + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// +// QUATS[i]*QUATS[j] = QUATS[QUAT_MULT[i][j]] + + void initializeQuatMult() + { + mQuatMult = new int[][] + { + { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23,}, + { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 0, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 12,}, + { 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 0, 1, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 12, 13,}, + { 3, 4, 5, 6, 7, 8, 9, 10, 11, 0, 1, 2, 15, 16, 17, 18, 19, 20, 21, 22, 23, 12, 13, 14,}, + { 4, 5, 6, 7, 8, 9, 10, 11, 0, 1, 2, 3, 16, 17, 18, 19, 20, 21, 22, 23, 12, 13, 14, 15,}, + { 5, 6, 7, 8, 9, 10, 11, 0, 1, 2, 3, 4, 17, 18, 19, 20, 21, 22, 23, 12, 13, 14, 15, 16,}, + { 6, 7, 8, 9, 10, 11, 0, 1, 2, 3, 4, 5, 18, 19, 20, 21, 22, 23, 12, 13, 14, 15, 16, 17,}, + { 7, 8, 9, 10, 11, 0, 1, 2, 3, 4, 5, 6, 19, 20, 21, 22, 23, 12, 13, 14, 15, 16, 17, 18,}, + { 8, 9, 10, 11, 0, 1, 2, 3, 4, 5, 6, 7, 20, 21, 22, 23, 12, 13, 14, 15, 16, 17, 18, 19,}, + { 9, 10, 11, 0, 1, 2, 3, 4, 5, 6, 7, 8, 21, 22, 23, 12, 13, 14, 15, 16, 17, 18, 19, 20,}, + { 10, 11, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 22, 23, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,}, + { 11, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 23, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22,}, + { 12, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14, 13, 0, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1,}, + { 13, 12, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14, 1, 0, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2,}, + { 14, 13, 12, 23, 22, 21, 20, 19, 18, 17, 16, 15, 2, 1, 0, 11, 10, 9, 8, 7, 6, 5, 4, 3,}, + { 15, 14, 13, 12, 23, 22, 21, 20, 19, 18, 17, 16, 3, 2, 1, 0, 11, 10, 9, 8, 7, 6, 5, 4,}, + { 16, 15, 14, 13, 12, 23, 22, 21, 20, 19, 18, 17, 4, 3, 2, 1, 0, 11, 10, 9, 8, 7, 6, 5,}, + { 17, 16, 15, 14, 13, 12, 23, 22, 21, 20, 19, 18, 5, 4, 3, 2, 1, 0, 11, 10, 9, 8, 7, 6,}, + { 18, 17, 16, 15, 14, 13, 12, 23, 22, 21, 20, 19, 6, 5, 4, 3, 2, 1, 0, 11, 10, 9, 8, 7,}, + { 19, 18, 17, 16, 15, 14, 13, 12, 23, 22, 21, 20, 7, 6, 5, 4, 3, 2, 1, 0, 11, 10, 9, 8,}, + { 20, 19, 18, 17, 16, 15, 14, 13, 12, 23, 22, 21, 8, 7, 6, 5, 4, 3, 2, 1, 0, 11, 10, 9,}, + { 21, 20, 19, 18, 17, 16, 15, 14, 13, 12, 23, 22, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, 11, 10,}, + { 22, 21, 20, 19, 18, 17, 16, 15, 14, 13, 12, 23, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, 11,}, + { 23, 22, 21, 20, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0,} + }; + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + private void initializeScrambling() + { + if( mScrambleTable ==null ) + { + mScrambleTable = new int[mNumAxis][mNumLayers]; + } + if( mNumOccurences ==null ) + { + int max=0; + + for (ScrambleState mState : mStates) + { + int tmp = mState.getTotal(-1); + if (max < tmp) max = tmp; + } + + mNumOccurences = new int[max]; + } + + for(int i=0; i=12)); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + private boolean cornerIsLeft(int index) + { + int q = mCornerQuat[index]; + + switch(index) + { + case 0: + case 4: return ((q>=3 && q<= 7) || (q>=18 && q<=22)); + case 1: + case 5: return ((q>=6 && q<=10) || (q>=15 && q<=19)); + case 2: + case 6: return ((q==0 || q==1 || (q>=9 && q<=11)) || (q>=12 && q<=16)); + case 3: + case 7: return ((q>=0 && q<=4) || (q==12 || q==13 || (q>=21 && q<=23))); + } + + return false; + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + private boolean quatIsBad(int quatIndex, int corner) + { + if( mBadCornerQuats ==null ) + { + // quat indices that make corner cubits bandage the puzzle. + mBadCornerQuats = new int[][] { { 2, 8,17,23}, { 5,11,14,20} }; + } + + int index = (corner%2); + + return ( quatIndex== mBadCornerQuats[index][0] || + quatIndex== mBadCornerQuats[index][1] || + quatIndex== mBadCornerQuats[index][2] || + quatIndex== mBadCornerQuats[index][3] ); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + private boolean isPermittedDo(int angle) + { + if( mQuatMult==null ) initializeQuatMult(); + + for(int corner=0; corner<8; corner++) + { + if( !cornerIsUp(corner) ) + { + int currQuat = mCornerQuat[corner]; + int finalQuat= mQuatMult[angle][currQuat]; + if( quatIsBad(finalQuat,corner) ) return false; + } + } + + return true; + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + private boolean isPermittedUp(int angle) + { + if( mQuatMult==null ) initializeQuatMult(); + + for(int corner=0; corner<8; corner++) + { + if( cornerIsUp(corner) ) + { + int currQuat = mCornerQuat[corner]; + int finalQuat= mQuatMult[angle][currQuat]; + if( quatIsBad(finalQuat,corner) ) return false; + } + } + + return true; + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + private void computePermittedAngles() + { + mPermittedDo = 0; + + for(int angle=0; angle=12)); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - private boolean cornerIsLeft(int index) - { - int q = mCornerQuat[index]; - - switch(index) - { - case 0: - case 4: return ((q>=3 && q<= 7) || (q>=18 && q<=22)); - case 1: - case 5: return ((q>=6 && q<=10) || (q>=15 && q<=19)); - case 2: - case 6: return ((q==0 || q==1 || (q>=9 && q<=11)) || (q>=12 && q<=16)); - case 3: - case 7: return ((q>=0 && q<=4) || (q==12 || q==13 || (q>=21 && q<=23))); - } - - return false; - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - private boolean quatIsBad(int quatIndex, int corner) - { - if( mBadCornerQuats ==null ) - { - // quat indices that make corner cubits bandage the puzzle. - mBadCornerQuats = new int[][] { { 2, 8,17,23}, { 5,11,14,20} }; - } - - int index = (corner%2); - - return ( quatIndex== mBadCornerQuats[index][0] || - quatIndex== mBadCornerQuats[index][1] || - quatIndex== mBadCornerQuats[index][2] || - quatIndex== mBadCornerQuats[index][3] ); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - private boolean isPermittedDo(int angle) - { - if( mQuatMult==null ) initializeQuatMult(); - - for(int corner=0; corner<8; corner++) - { - if( !cornerIsUp(corner) ) - { - int currQuat = mCornerQuat[corner]; - int finalQuat= mQuatMult[angle][currQuat]; - if( quatIsBad(finalQuat,corner) ) return false; - } - } - - return true; - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - private boolean isPermittedUp(int angle) - { - if( mQuatMult==null ) initializeQuatMult(); - - for(int corner=0; corner<8; corner++) - { - if( cornerIsUp(corner) ) - { - int currQuat = mCornerQuat[corner]; - int finalQuat= mQuatMult[angle][currQuat]; - if( quatIsBad(finalQuat,corner) ) return false; - } - } - - return true; - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - private void computePermittedAngles() - { - if( mBasicAngle==null ) initializeBasicAngle(); - - mPermittedDo = 0; - - for(int angle=0; angle