Revision 0cdd9b6c
Added by Leszek Koltunski about 3 years ago
| src/main/java/org/distorted/objectlib/effects/fastscramble/FastScrambleEffect.java | ||
|---|---|---|
| 100 | 100 |
{
|
| 101 | 101 |
mScrambles = new int[mNumScrambles][3]; |
| 102 | 102 |
|
| 103 |
synchronized(mLock)
|
|
| 103 |
if( mObject!=null )
|
|
| 104 | 104 |
{
|
| 105 |
synchronized(mLock) |
|
| 106 |
{
|
|
| 107 |
for(int scramble=0; scramble<mNumScrambles; scramble++) |
|
| 108 |
{
|
|
| 109 |
mObject.randomizeNewScramble(mScrambles, mRnd, scramble, mNumScrambles); |
|
| 110 |
} |
|
| 111 |
} |
|
| 112 |
|
|
| 105 | 113 |
for(int scramble=0; scramble<mNumScrambles; scramble++) |
| 106 | 114 |
{
|
| 107 |
mObject.randomizeNewScramble(mScrambles, mRnd, scramble, mNumScrambles); |
|
| 115 |
int row = mScrambles[scramble][1]; |
|
| 116 |
mScrambles[scramble][1] = (1<<row); |
|
| 108 | 117 |
} |
| 109 | 118 |
} |
| 110 | 119 |
} |
| src/main/java/org/distorted/objectlib/scrambling/ScrambleStateBandagedCuboid.java | ||
|---|---|---|
| 326 | 326 |
if( moveIndex<size ) |
| 327 | 327 |
{
|
| 328 | 328 |
scramble[0] = axis; |
| 329 |
scramble[1] = 1<<(moveIndex % mSize[axis]);
|
|
| 329 |
scramble[1] = moveIndex % mSize[axis];
|
|
| 330 | 330 |
|
| 331 | 331 |
if( mTurns[axis]==3 ) |
| 332 | 332 |
{
|
Also available in: Unified diff
Important bugfix for fast scrambling!