commit abf369862ef111a68813ac5a8c3e1596f5c56fa9 Author: Leszek Koltunski Date: Mon Sep 13 03:15:39 2021 +0200 Add Mirror Cube 2x2 and 3x3. diff --git a/src/main/java/org/distorted/objects/ObjectList.java b/src/main/java/org/distorted/objects/ObjectList.java index c65bdd60..73bb81fa 100644 --- a/src/main/java/org/distorted/objects/ObjectList.java +++ b/src/main/java/org/distorted/objects/ObjectList.java @@ -246,6 +246,16 @@ public enum ObjectList 60 ), + MIRR ( + new int[][] { + {2 , 12, 12, 0, R.drawable.ui_small_cube2, R.drawable.ui_medium_cube2, R.drawable.ui_big_cube2, R.drawable.ui_huge_cube2} , + {3 , 16, 17, 0, R.drawable.ui_small_cube3, R.drawable.ui_medium_cube3, R.drawable.ui_big_cube3, R.drawable.ui_huge_cube3} , + }, + TwistyMirror.class, + new MovementCube(), + 7, + 60 + ), ; public static final int NUM_OBJECTS = values().length; @@ -673,6 +683,7 @@ public enum ObjectList case 17: return new TwistyBandagedEvil (size, quat, texture, mesh, effects, moves, res, scrWidth); case 18: return new TwistySquare1 (size, quat, texture, mesh, effects, moves, res, scrWidth); case 19: return new TwistySquare2 (size, quat, texture, mesh, effects, moves, res, scrWidth); + case 20: return new TwistyMirror (size, quat, texture, mesh, effects, moves, res, scrWidth); } return null; diff --git a/src/main/java/org/distorted/objects/TwistyBandagedAbstract.java b/src/main/java/org/distorted/objects/TwistyBandagedAbstract.java index 5551b2ce..7364dda3 100644 --- a/src/main/java/org/distorted/objects/TwistyBandagedAbstract.java +++ b/src/main/java/org/distorted/objects/TwistyBandagedAbstract.java @@ -296,7 +296,7 @@ abstract class TwistyBandagedAbstract extends TwistyObject } } - return mStickers[face/NUM_FACES]; + return mStickers[face/NUM_FACE_COLORS]; } /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -331,7 +331,7 @@ abstract class TwistyBandagedAbstract extends TwistyObject /////////////////////////////////////////////////////////////////////////////////////////////////// - int getNumFaces() + int getNumFaceColors() { return FACE_COLORS.length; } @@ -450,7 +450,7 @@ abstract class TwistyBandagedAbstract extends TwistyObject boolean reaches = multiplier*position + dim[dimIndex]*0.5f > (numLayers-1)*0.5f; - return reaches ? stickerIndex*NUM_FACES + face : NUM_TEXTURES; + return reaches ? stickerIndex*NUM_FACE_COLORS + face : NUM_TEXTURES; } /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/objects/TwistyCube.java b/src/main/java/org/distorted/objects/TwistyCube.java index a8b38fa0..93934c0e 100644 --- a/src/main/java/org/distorted/objects/TwistyCube.java +++ b/src/main/java/org/distorted/objects/TwistyCube.java @@ -252,7 +252,7 @@ class TwistyCube extends TwistyObject mStickers[0] = new ObjectSticker(STICKERS[0],null,radii,stroke ); } - return mStickers[face/NUM_FACES]; + return mStickers[face/NUM_FACE_COLORS]; } /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -293,7 +293,7 @@ class TwistyCube extends TwistyObject /////////////////////////////////////////////////////////////////////////////////////////////////// - int getNumFaces() + int getNumFaceColors() { return FACE_COLORS.length; } diff --git a/src/main/java/org/distorted/objects/TwistyDiamond.java b/src/main/java/org/distorted/objects/TwistyDiamond.java index eb1fb177..7ed7efab 100644 --- a/src/main/java/org/distorted/objects/TwistyDiamond.java +++ b/src/main/java/org/distorted/objects/TwistyDiamond.java @@ -144,7 +144,7 @@ public class TwistyDiamond extends TwistyObject /////////////////////////////////////////////////////////////////////////////////////////////////// - int getNumFaces() + int getNumFaceColors() { return FACE_COLORS.length; } @@ -502,7 +502,7 @@ public class TwistyDiamond extends TwistyObject mStickers[0] = new ObjectSticker(STICKERS[0],null,radii,stroke); } - return mStickers[face/NUM_FACES]; + return mStickers[face/NUM_FACE_COLORS]; } /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/objects/TwistyDino.java b/src/main/java/org/distorted/objects/TwistyDino.java index a54f7007..94795f53 100644 --- a/src/main/java/org/distorted/objects/TwistyDino.java +++ b/src/main/java/org/distorted/objects/TwistyDino.java @@ -102,7 +102,7 @@ public abstract class TwistyDino extends TwistyObject /////////////////////////////////////////////////////////////////////////////////////////////////// - int getNumFaces() + int getNumFaceColors() { return FACE_COLORS.length; } @@ -213,7 +213,7 @@ public abstract class TwistyDino extends TwistyObject mStickers[0] = new ObjectSticker(STICKERS[0],null,radii,stroke); } - return mStickers[face/NUM_FACES]; + return mStickers[face/NUM_FACE_COLORS]; } /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/objects/TwistyHelicopter.java b/src/main/java/org/distorted/objects/TwistyHelicopter.java index 9ab67662..f45f4be6 100644 --- a/src/main/java/org/distorted/objects/TwistyHelicopter.java +++ b/src/main/java/org/distorted/objects/TwistyHelicopter.java @@ -166,7 +166,7 @@ public class TwistyHelicopter extends TwistyObject /////////////////////////////////////////////////////////////////////////////////////////////////// - int getNumFaces() + int getNumFaceColors() { return FACE_COLORS.length; } @@ -417,7 +417,7 @@ public class TwistyHelicopter extends TwistyObject mStickers[0] = new ObjectSticker(STICKERS[0],null,radii,stroke); } - return mStickers[face/NUM_FACES]; + return mStickers[face/NUM_FACE_COLORS]; } /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/objects/TwistyIvy.java b/src/main/java/org/distorted/objects/TwistyIvy.java index 6f8a1f07..a38cf5f9 100644 --- a/src/main/java/org/distorted/objects/TwistyIvy.java +++ b/src/main/java/org/distorted/objects/TwistyIvy.java @@ -142,7 +142,7 @@ public class TwistyIvy extends TwistyObject /////////////////////////////////////////////////////////////////////////////////////////////////// - int getNumFaces() + int getNumFaceColors() { return FACE_COLORS.length; } @@ -448,7 +448,7 @@ public class TwistyIvy extends TwistyObject for(int s=0; s=0 && cubitface<3 ? mCornerFaceMap[center][cubitface] : NUM_TEXTURES; } - return cubitface==mCenterFaceMap[center] ? center/5 + NUM_FACES*(numLayers-1)/2 : NUM_TEXTURES; + return cubitface==mCenterFaceMap[center] ? center/5 + NUM_FACE_COLORS*(numLayers-1)/2 : NUM_TEXTURES; } /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -712,7 +712,7 @@ public class TwistyKilominx extends TwistyMinx private int getStickerIndex(int face) { - int variant = face/NUM_FACES; + int variant = face/NUM_FACE_COLORS; int numLayers = getNumLayers(); if( variant == (numLayers-1)/2 || numLayers==3 ) return 0; diff --git a/src/main/java/org/distorted/objects/TwistyMegaminx.java b/src/main/java/org/distorted/objects/TwistyMegaminx.java index 5f248e40..81f0ca82 100644 --- a/src/main/java/org/distorted/objects/TwistyMegaminx.java +++ b/src/main/java/org/distorted/objects/TwistyMegaminx.java @@ -529,14 +529,14 @@ public class TwistyMegaminx extends TwistyMinx int variant = edge / numCubitsPerEdge; if( mEdgeMap==null ) initializeEdgeMap(); - return (part==0 || cubitface==((part+1)%2)) ? mEdgeMap[variant][cubitface+2] + ((part+3)/2)*NUM_FACES : NUM_TEXTURES; + return (part==0 || cubitface==((part+1)%2)) ? mEdgeMap[variant][cubitface+2] + ((part+3)/2)*NUM_FACE_COLORS : NUM_TEXTURES; } /////////////////////////////////////////////////////////////////////////////////////////////////// int getCenterColor(int center, int cubitface, int numLayers) { - return cubitface>0 ? NUM_TEXTURES : center + NUM_FACES*(numLayers+1)/2; + return cubitface>0 ? NUM_TEXTURES : center + NUM_FACE_COLORS*(numLayers+1)/2; } /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -607,7 +607,7 @@ public class TwistyMegaminx extends TwistyMinx private int getStickerIndex(int face) { - int variant = face/NUM_FACES; + int variant = face/NUM_FACE_COLORS; if( variant==0 ) return 0; diff --git a/src/main/java/org/distorted/objects/TwistyMinx.java b/src/main/java/org/distorted/objects/TwistyMinx.java index d904e1b8..bb626cc3 100644 --- a/src/main/java/org/distorted/objects/TwistyMinx.java +++ b/src/main/java/org/distorted/objects/TwistyMinx.java @@ -524,7 +524,7 @@ abstract class TwistyMinx extends TwistyObject /////////////////////////////////////////////////////////////////////////////////////////////////// - int getNumFaces() + int getNumFaceColors() { return FACE_COLORS.length; } diff --git a/src/main/java/org/distorted/objects/TwistyMirror.java b/src/main/java/org/distorted/objects/TwistyMirror.java new file mode 100644 index 00000000..8071dbaf --- /dev/null +++ b/src/main/java/org/distorted/objects/TwistyMirror.java @@ -0,0 +1,692 @@ +/////////////////////////////////////////////////////////////////////////////////////////////////// +// Copyright 2019 Leszek Koltunski // +// // +// This file is part of Magic Cube. // +// // +// Magic Cube is free software: you can redistribute it and/or modify // +// it under the terms of the GNU General Public License as published by // +// the Free Software Foundation, either version 2 of the License, or // +// (at your option) any later version. // +// // +// Magic Cube is distributed in the hope that it will be useful, // +// but WITHOUT ANY WARRANTY; without even the implied warranty of // +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // +// GNU General Public License for more details. // +// // +// You should have received a copy of the GNU General Public License // +// along with Magic Cube. If not, see . // +/////////////////////////////////////////////////////////////////////////////////////////////////// + +package org.distorted.objects; + +import android.content.res.Resources; + +import org.distorted.helpers.ObjectShape; +import org.distorted.helpers.ObjectSticker; +import org.distorted.helpers.ScrambleState; +import org.distorted.library.main.DistortedEffects; +import org.distorted.library.main.DistortedTexture; +import org.distorted.library.mesh.MeshSquare; +import org.distorted.library.type.Static3D; +import org.distorted.library.type.Static4D; +import org.distorted.main.R; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + +class TwistyMirror extends TwistyObject +{ + static final Static3D[] ROT_AXIS = new Static3D[] + { + new Static3D(1,0,0), + new Static3D(0,1,0), + new Static3D(0,0,1) + }; + + private static final int[] FACE_COLORS = new int[] { COLOR_WHITE }; + private static final float DX = 0.10f; + private static final float DY = 0.16f; + private static final float DZ = 0.22f; + + private ScrambleState[] mStates; + private Static4D[] mQuats; + private int[] mBasicAngle; + private ObjectSticker[] mStickers; + private float[][] mPositions; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + TwistyMirror(int size, Static4D quat, DistortedTexture texture, MeshSquare mesh, + DistortedEffects effects, int[][] moves, Resources res, int scrWidth) + { + super(size, size, quat, texture, mesh, effects, moves, ObjectList.MIRR, res, scrWidth); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + ScrambleState[] getScrambleStates() + { + if( mStates==null ) + { + int size = getNumLayers(); + int[][] m = new int[16][]; + for(int i=1; i<16; i++) m[i] = createEdges(size,i); + + mStates = new ScrambleState[] + { + new ScrambleState( new int[][] { m[ 1], m[ 2], m[ 3] } ), // 0 + new ScrambleState( new int[][] { null, m[ 4], m[ 5] } ), // x + new ScrambleState( new int[][] { m[ 6], null, m[ 7] } ), // y + new ScrambleState( new int[][] { m[ 8], m[ 8], null } ), // z + new ScrambleState( new int[][] { m[10], null, m[ 7] } ), // xy + new ScrambleState( new int[][] { m[11], m[ 9], null } ), // xz + new ScrambleState( new int[][] { null, m[12], m[ 5] } ), // yx + new ScrambleState( new int[][] { m[ 8], m[13], null } ), // yz + new ScrambleState( new int[][] { null, m[ 4], m[14] } ), // zx + new ScrambleState( new int[][] { m[ 6], null, m[15] } ), // zy + new ScrambleState( new int[][] { null, null, m[ 5] } ), // xyx + new ScrambleState( new int[][] { null, m[ 4], null } ), // xzx + new ScrambleState( new int[][] { null, null, m[ 7] } ), // yxy + new ScrambleState( new int[][] { m[ 6], null, null } ), // yzy + new ScrambleState( new int[][] { null, m[ 9], null } ), // zxz + new ScrambleState( new int[][] { m[ 8], null, null } ), // zyz + }; + } + + return mStates; + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + private int[] createEdges(int size, int vertex) + { + int[] ret = new int[9*size]; + + for(int l=0; l1 ? 6*numLayers*numLayers - 12*numLayers + 8 : 1; + mPositions = new float[numCubits][]; + + float diff = 0.5f*(numLayers-1); + int currentPosition = 0; + + for(int x = 0; x=NUM_TEXTURES ) break; ObjectSticker sticker = retSticker(face); - factory.drawRoundedPolygon(canvas, paint, col*TEXTURE_HEIGHT, row*TEXTURE_HEIGHT, getColor(face%NUM_FACES), sticker); + factory.drawRoundedPolygon(canvas, paint, col*TEXTURE_HEIGHT, row*TEXTURE_HEIGHT, getColor(face%NUM_FACE_COLORS), sticker); face++; } @@ -1285,7 +1285,7 @@ public abstract class TwistyObject extends DistortedNode abstract float getScreenRatio(); abstract float[][] getCubitPositions(int numLayers); abstract Static4D[] getQuats(); - abstract int getNumFaces(); + abstract int getNumFaceColors(); abstract int getNumStickerTypes(int numLayers); abstract int getNumCubitFaces(); abstract ObjectSticker retSticker(int face); diff --git a/src/main/java/org/distorted/objects/TwistyPyraminx.java b/src/main/java/org/distorted/objects/TwistyPyraminx.java index 883651ea..520f754e 100644 --- a/src/main/java/org/distorted/objects/TwistyPyraminx.java +++ b/src/main/java/org/distorted/objects/TwistyPyraminx.java @@ -203,7 +203,7 @@ public class TwistyPyraminx extends TwistyObject /////////////////////////////////////////////////////////////////////////////////////////////////// - int getNumFaces() + int getNumFaceColors() { return FACE_COLORS.length; } @@ -272,7 +272,7 @@ public class TwistyPyraminx extends TwistyObject private int faceColor(int cubit, int axis) { - return CUBITS[cubit].mRotationRow[axis] == 1 ? axis : NUM_FACES; + return CUBITS[cubit].mRotationRow[axis] == 1 ? axis : NUM_TEXTURES; } /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -287,12 +287,12 @@ public class TwistyPyraminx extends TwistyObject case 2: return faceColor(cubit,1); case 5: return faceColor(cubit,3); case 7: return faceColor(cubit,2); - default:return NUM_FACES; + default:return NUM_TEXTURES; } } else { - return cubitface mWeakAct; /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -79,19 +75,17 @@ public class RubikScreenSolver extends RubikScreenAbstract int sizeH = (int)(width*RubikActivity.SOLVER_BMP_H_SIZE); mBitmapSize = Math.min(sizeV,sizeH); - mWeakAct = new WeakReference<>(act); - mSolving = false; - mCurrentObject = ImplementedSolversList.getObject(0); - mCurrentObjectSize = ImplementedSolversList.getObjectSize(0); + ObjectList currentObject= ImplementedSolversList.getObject(0); + int currentObjectSize = ImplementedSolversList.getObjectSize(0); - act.setupObject(mCurrentObject, mCurrentObjectSize, null); + act.setupObject(currentObject, currentObjectSize, null); RubikScreenPlay play = (RubikScreenPlay) ScreenList.PLAY.getScreenClass(); - play.setObjectAndSize(act, mCurrentObject, mCurrentObjectSize); + play.setObjectAndSize(act, currentObject, currentObjectSize); - mFaceColors = ObjectList.retFaceColors(mCurrentObject); + mFaceColors = ObjectList.retFaceColors(currentObject); mNumFaces = mFaceColors!=null ? mFaceColors.length : 0; // TOP //////////////////////////// diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 6643d0cd..d61b6007 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -100,6 +100,8 @@ Square-1 Square-2 Jing Pyraminx + Mirror Cube + Pocket Mirror Fused Cube 2Bar Cube @@ -132,6 +134,8 @@ Vojtech Kopsky, Harel Hrsel, 1999 David Litwin, 1995 Tony Fisher, 1991 + Thomas de Bruin, 2007 + Hidetoshi Takeji, 2006 who knows who knows