Revision be95dbf5
Added by Leszek Koltunski over 1 year ago
| src/main/java/org/distorted/objectlib/main/TwistyObject.java | ||
|---|---|---|
| 279 | 279 |
|
| 280 | 280 |
int index = getSolvedFunctionIndex(); |
| 281 | 281 |
mSolved = new TwistyObjectSolved(this,mOrigPos,index); |
| 282 |
mSolved.setupSolvedQuats(getSolvedQuats()); |
|
| 282 | 283 |
|
| 283 | 284 |
mEffects.apply(mRotateEffect); |
| 284 | 285 |
mEffects.apply(quatEffect); |
| src/main/java/org/distorted/objectlib/main/TwistyObjectSolved.java | ||
|---|---|---|
| 23 | 23 |
private final float[][] mOrigPos; |
| 24 | 24 |
private final int mNumCubits; |
| 25 | 25 |
private final int mFunctionIndex; |
| 26 |
private final int[][] mSolvedQuats; |
|
| 27 | 26 |
private final int[] mTmpQuats; |
| 28 | 27 |
|
| 28 |
private int[][] mSolvedQuats; |
|
| 29 | 29 |
private int[][] mQuatMult; |
| 30 | 30 |
private int[] mFaceMap; |
| 31 | 31 |
private int[][] mScramble; |
| ... | ... | |
| 382 | 382 |
return solvedQuats; |
| 383 | 383 |
} |
| 384 | 384 |
|
| 385 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 386 |
|
|
| 387 |
void setupSolvedQuats(int[][] quats) |
|
| 388 |
{
|
|
| 389 |
mSolvedQuats = quats; |
|
| 390 |
} |
|
| 391 |
|
|
| 385 | 392 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 386 | 393 |
|
| 387 | 394 |
TwistyObjectSolved(TwistyObject parent, float[][] orig, int index) |
| ... | ... | |
| 393 | 400 |
mNumCubits = orig.length; |
| 394 | 401 |
mFunctionIndex = index; |
| 395 | 402 |
mTmpQuats = new int[mNumQuats]; |
| 396 |
mSolvedQuats = mParent.getSolvedQuats(); |
|
| 397 | 403 |
} |
| 398 | 404 |
|
| 399 | 405 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyTrajber.java | ||
|---|---|---|
| 77 | 77 |
|
| 78 | 78 |
return new int[][] {
|
| 79 | 79 |
{0},
|
| 80 |
{7, 0, 8,20,26,34,41,49, 10,23},
|
|
| 81 |
{7, 4,13,16,29,37,47,54, 10,23},
|
|
| 82 |
{7, 5, 9,17,25,36,45,52, 13,20},
|
|
| 83 |
{7, 1,12,21,30,35,43,51, 13,20},
|
|
| 84 |
{7, 6,11,23,27,38,44,53, 12,22},
|
|
| 85 |
{7, 2,14,19,28,33,42,50, 12,22},
|
|
| 86 |
{7, 3,10,18,24,32,40,48, 15,21},
|
|
| 87 |
{7, 7,15,22,31,39,46,55, 15,21},
|
|
| 80 |
{7, 2, 6,14,26,34,41,49, 10,23},
|
|
| 81 |
{7,10,19,22,29,37,47,54, 10,23},
|
|
| 82 |
{7,11,15,23,28,33,45,52, 13,20},
|
|
| 83 |
{7, 3, 7,18,27,38,43,51, 13,20},
|
|
| 84 |
{7, 5,12,17,30,35,44,53, 12,22},
|
|
| 85 |
{7, 1, 8,20,25,36,42,50, 12,22},
|
|
| 86 |
{7, 0, 9,16,24,32,40,48, 15,21},
|
|
| 87 |
{7, 4,13,21,31,39,46,55, 15,21},
|
|
| 88 | 88 |
}; |
| 89 | 89 |
} |
| 90 | 90 |
} |
Also available in: Unified diff
- fix for the newly introduced TwistyObjectSolved
- fix for the solvedQuats of the Trajber 4x4