Revision e8f5f147
Added by Leszek Koltunski almost 4 years ago
| src/main/java/org/distorted/objectlib/objects/TwistyDiamond.java | ||
|---|---|---|
| 50 | 50 |
|
| 51 | 51 |
private ScrambleState[] mStates; |
| 52 | 52 |
private int[] mBasicAngle; |
| 53 |
private int[] mFaceMap; |
|
| 54 | 53 |
private float[][] mCuts; |
| 55 | 54 |
private Static4D[] mQuats; |
| 56 | 55 |
private int[] mTetraToFaceMap; |
| ... | ... | |
| 115 | 114 |
public int[] getSolvedQuats(int cubit, int[] numLayers) |
| 116 | 115 |
{
|
| 117 | 116 |
if( mQuats==null ) initializeQuats(); |
| 118 |
if( mFaceMap==null ) mFaceMap = new int[] {4,0,6,2,7,3,5,1};
|
|
| 119 | 117 |
int status = retCubitSolvedStatus(cubit,numLayers); |
| 120 |
return status<0 ? null : buildSolvedQuats(TouchControlOctahedron.FACE_AXIS[mFaceMap[status]],mQuats);
|
|
| 118 |
return status<0 ? null : buildSolvedQuats(TouchControlOctahedron.FACE_AXIS[status],mQuats);
|
|
| 121 | 119 |
} |
| 122 | 120 |
|
| 123 | 121 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyMinx.java | ||
|---|---|---|
| 59 | 59 |
|
| 60 | 60 |
private ScrambleState[] mStates; |
| 61 | 61 |
private int[] mBasicAngle; |
| 62 |
private int[] mFaceMap; |
|
| 63 | 62 |
private float[][] mCuts; |
| 64 |
Static4D[] mQuats; |
|
| 65 |
float[][] mCenterCoords; |
|
| 66 |
float[][] mCorners; |
|
| 67 |
int[] mQuatEdgeIndices; |
|
| 68 |
int[] mQuatCornerIndices; |
|
| 69 |
int[][] mEdgeMap; |
|
| 70 |
int[][] mCenterMap; |
|
| 71 |
Static4D[] mBasicCornerV, mCurrCornerV; |
|
| 63 |
float[][] mCenterCoords,mCorners; |
|
| 64 |
int[] mQuatEdgeIndices,mQuatCornerIndices; |
|
| 65 |
int[][] mEdgeMap,mCenterMap; |
|
| 66 |
Static4D[] mBasicCornerV, mCurrCornerV, mQuats; |
|
| 72 | 67 |
|
| 73 | 68 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 74 | 69 |
|
| ... | ... | |
| 460 | 455 |
public int[] getSolvedQuats(int cubit, int[] numLayers) |
| 461 | 456 |
{
|
| 462 | 457 |
if( mQuats==null ) initializeQuats(); |
| 463 |
if( mFaceMap==null ) mFaceMap = new int[] {8,10,3,7,1,9,11,2,4,0,5,6};
|
|
| 464 | 458 |
int status = retCubitSolvedStatus(cubit,numLayers); |
| 465 |
return status<0 ? null : buildSolvedQuats(TouchControlDodecahedron.FACE_AXIS[mFaceMap[status]],mQuats);
|
|
| 459 |
return status<0 ? null : buildSolvedQuats(TouchControlDodecahedron.FACE_AXIS[status],mQuats);
|
|
| 466 | 460 |
} |
| 467 | 461 |
|
| 468 | 462 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyTrajber.java | ||
|---|---|---|
| 54 | 54 |
|
| 55 | 55 |
private ScrambleState[] mStates; |
| 56 | 56 |
private int[] mBasicAngle; |
| 57 |
private int[] mFaceMap; |
|
| 58 | 57 |
private float[][] mCuts; |
| 59 | 58 |
private Static4D[] mQuats; |
| 60 | 59 |
private float[][] mCenters; |
| ... | ... | |
| 140 | 139 |
public int[] getSolvedQuats(int cubit, int[] numLayers) |
| 141 | 140 |
{
|
| 142 | 141 |
if( mQuats==null ) initializeQuats(); |
| 143 |
if( mFaceMap==null ) mFaceMap = new int[] {4,0,6,2,7,3,5,1};
|
|
| 144 | 142 |
int status = retCubitSolvedStatus(cubit,numLayers); |
| 145 |
return status<0 ? null : buildSolvedQuats(TouchControlOctahedron.FACE_AXIS[mFaceMap[status]],mQuats);
|
|
| 143 |
return status<0 ? null : buildSolvedQuats(TouchControlOctahedron.FACE_AXIS[status],mQuats);
|
|
| 146 | 144 |
} |
| 147 | 145 |
|
| 148 | 146 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
Also available in: Unified diff
Fix (and simplify!) Diamiond's, Trajber's and Minx'es Solved Quats.