commit a31d25de2562cc844da922af6c635529cd593238 Author: Leszek Koltunski Date: Tue Mar 31 12:03:37 2020 +0100 Major progress with Prretty Patterns. Two things remain: 1) looks like sometimes making/backing Moves in a Pattern gets stuck. ( Pattern.mCanRotate! ) 2) we need to add RubikPatternList! diff --git a/src/main/java/org/distorted/dialog/RubikDialogPatternView.java b/src/main/java/org/distorted/dialog/RubikDialogPatternView.java index 62072455..dc181a39 100644 --- a/src/main/java/org/distorted/dialog/RubikDialogPatternView.java +++ b/src/main/java/org/distorted/dialog/RubikDialogPatternView.java @@ -153,7 +153,7 @@ public class RubikDialogPatternView extends FrameLayout implements AdapterView.O state.setPattern(act, mTab, category, ii); int[] sizes = RubikObjectList.CUBE.getSizes(); RubikPattern pattern = RubikPattern.getInstance(); - String moves = pattern.getMoves(mTab, category, ii); + int[][] moves = pattern.getMoves(mTab, category, ii); act.changeObject(RubikObjectList.CUBE,sizes[mTab],moves); mDialog.rememberCategories(); mDialog.dismiss(); diff --git a/src/main/java/org/distorted/magic/RubikActivity.java b/src/main/java/org/distorted/magic/RubikActivity.java index 88dde7cf..82ccf93d 100644 --- a/src/main/java/org/distorted/magic/RubikActivity.java +++ b/src/main/java/org/distorted/magic/RubikActivity.java @@ -193,7 +193,7 @@ public class RubikActivity extends AppCompatActivity /////////////////////////////////////////////////////////////////////////////////////////////////// - public void changeObject(RubikObjectList object, int size, String moves) + public void changeObject(RubikObjectList object, int size, int[][] moves) { RubikSurfaceView view = findViewById(R.id.rubikSurfaceView); RubikPostRender post = view.getPostRender(); diff --git a/src/main/java/org/distorted/magic/RubikPostRender.java b/src/main/java/org/distorted/magic/RubikPostRender.java index bb108826..065ac1fa 100644 --- a/src/main/java/org/distorted/magic/RubikPostRender.java +++ b/src/main/java/org/distorted/magic/RubikPostRender.java @@ -54,7 +54,7 @@ public class RubikPostRender implements EffectListener private long mNewRecord; private int mScreenWidth, mScreenHeight; private SharedPreferences mPreferences; - private String mNextMoves; + private int[][] mNextMoves; private RubikObject mOldObject, mNewObject; private int mScrambleObjectNum; private int mAddRotationAxis, mAddRotationRowBitmap, mAddRotationAngle; @@ -92,7 +92,7 @@ public class RubikPostRender implements EffectListener /////////////////////////////////////////////////////////////////////////////////////////////////// - private void createObjectNow(RubikObjectList object, int size, String moves) + private void createObjectNow(RubikObjectList object, int size, int[][] moves) { boolean firstTime = (mNewObject==null); @@ -161,8 +161,6 @@ public class RubikPostRender implements EffectListener } } -android.util.Log.e("post", "1 canDrag true"); - mCanDrag = true; mCanRotate = false; mCanUI = false; @@ -312,7 +310,7 @@ android.util.Log.e("post", "1 canDrag true"); /////////////////////////////////////////////////////////////////////////////////////////////////// - void changeObject(RubikObjectList object, int size, String moves) + void changeObject(RubikObjectList object, int size, int[][] moves) { if( size>0 ) { diff --git a/src/main/java/org/distorted/object/RubikCube.java b/src/main/java/org/distorted/object/RubikCube.java index 40451737..7cc63a79 100644 --- a/src/main/java/org/distorted/object/RubikCube.java +++ b/src/main/java/org/distorted/object/RubikCube.java @@ -78,7 +78,7 @@ class RubikCube extends RubikObject /////////////////////////////////////////////////////////////////////////////////////////////////// - RubikCube(int size, Static4D quatCur, Static4D quatAcc, DistortedTexture texture, MeshRectangles mesh, DistortedEffects effects, String moves) + RubikCube(int size, Static4D quatCur, Static4D quatAcc, DistortedTexture texture, MeshRectangles mesh, DistortedEffects effects, int[][] moves) { super(size, 60, quatCur,quatAcc,texture,mesh,effects,moves, RubikObjectList.CUBE); } diff --git a/src/main/java/org/distorted/object/RubikObject.java b/src/main/java/org/distorted/object/RubikObject.java index cc175166..a6ee5768 100644 --- a/src/main/java/org/distorted/object/RubikObject.java +++ b/src/main/java/org/distorted/object/RubikObject.java @@ -75,7 +75,7 @@ public abstract class RubikObject extends DistortedNode /////////////////////////////////////////////////////////////////////////////////////////////////// RubikObject(int size, int fov, Static4D quatCur, Static4D quatAcc, DistortedTexture nodeTexture, - MeshRectangles nodeMesh, DistortedEffects nodeEffects, String moves, RubikObjectList list) + MeshRectangles nodeMesh, DistortedEffects nodeEffects, int[][] moves, RubikObjectList list) { super(nodeTexture,nodeEffects,nodeMesh); @@ -221,57 +221,46 @@ public abstract class RubikObject extends DistortedNode } /////////////////////////////////////////////////////////////////////////////////////////////////// -// TODO +// note the minus in front of the sin() - we rotate counterclockwise +// when looking towards the direction where the axis increases in values. - private void setupPosition(String moves) + private Static4D makeQuaternion(int axisIndex, int angleInDegrees) { - android.util.Log.e("object", "initializing: "+moves); -/* - int index,tmp, a1,a2,a3, rv, rc, ra; - - numRotations=0; - initializeVertices(mSize); - - int len=moves.length()/4; - - for(int i=0; i=0 && patternnumMove ) { curMove= 0; - object.initializeObject(moves.substring(0,4*curMove)); + object.initializeObject(null); } else { @@ -214,15 +235,11 @@ public class RubikPattern mCanRotate = false; mObject = object; - String move = moves.substring(4*curMove-4,4*curMove); - int a1=move.charAt(1)-'0'; - int a2=move.charAt(2)-'0'; - int a3=move.charAt(3)-'0'; - - int axis = (10*a1+a2)/32; - int rowBitmap = (10*a1+a2)%32; - int angle = (2-a3)*(360/object.getBasicAngle()); - int numRot = Math.abs(2-a3); + int axis =moves[curMove-1][0]; + int rowBitmap=moves[curMove-1][1]; + int bareAngle=moves[curMove-1][2]; + int angle = bareAngle*(360/object.getBasicAngle()); + int numRot = Math.abs(bareAngle); post.addRotation(this, axis, rowBitmap, angle, numRot*DURATION_MILLIS); } @@ -245,7 +262,7 @@ public class RubikPattern if( curMove<0 ) { curMove=numMove; - object.initializeObject(moves.substring(0,4*curMove)); + object.initializeObject(moves); } else { @@ -254,15 +271,11 @@ public class RubikPattern mCanRotate = false; mObject = object; - String move = moves.substring(4*curMove,4*curMove+4); - int a1=move.charAt(1)-'0'; - int a2=move.charAt(2)-'0'; - int a3=move.charAt(3)-'0'; - - int axis = (10*a1+a2)/32; - int rowBitmap = (10*a1+a2)%32; - int angle = (2-a3)*(360/object.getBasicAngle()); - int numRot = Math.abs(2-a3); + int axis =moves[curMove][0]; + int rowBitmap=moves[curMove][1]; + int bareAngle=moves[curMove][2]; + int angle = bareAngle*(360/object.getBasicAngle()); + int numRot = Math.abs(bareAngle); post.addRotation(this, axis, rowBitmap, -angle, numRot*DURATION_MILLIS); } @@ -276,9 +289,9 @@ public class RubikPattern ///////////////////////////////////////////////////////////// - String getMoves() + int[][] getMoves() { - return moves.substring(0,4*curMove); + return moves; } ///////////////////////////////////////////////////////////// @@ -461,7 +474,7 @@ public class RubikPattern /////////////////////////////////////////////////////////////////////////////////////////////////// - public String getMoves(int size, int cat, int pat) + public int[][] getMoves(int size, int cat, int pat) { if( size>=0 && size=0 && cat< numCategories[size] ) { @@ -469,6 +482,6 @@ public class RubikPattern if( c!=null ) return c.getMoves(pat); } - return ""; + return null; } }