Revision 9283a268
Added by Leszek Koltunski over 1 year ago
| src/main/java/org/distorted/objectlib/main/TwistyObject.java | ||
|---|---|---|
| 928 | 928 |
|
| 929 | 929 |
public int getScrambleType() |
| 930 | 930 |
{
|
| 931 |
return 0;
|
|
| 931 |
return ObjectScrambler.SCRAMBLING_ALGORITHMS;
|
|
| 932 | 932 |
} |
| 933 | 933 |
|
| 934 | 934 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyBandagedCuboid.java | ||
|---|---|---|
| 25 | 25 |
import org.distorted.objectlib.main.InitData; |
| 26 | 26 |
import org.distorted.objectlib.helpers.ObjectShape; |
| 27 | 27 |
import org.distorted.objectlib.main.ObjectType; |
| 28 |
import org.distorted.objectlib.scrambling.ObjectScrambler; |
|
| 28 | 29 |
|
| 29 | 30 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 30 | 31 |
|
| ... | ... | |
| 344 | 345 |
{
|
| 345 | 346 |
if( mPosition==null ) mPosition = getInitData().getPos(); |
| 346 | 347 |
|
| 347 |
return mPosition==POS_5 ? 0 : 2;
|
|
| 348 |
return mPosition==POS_5 ? ObjectScrambler.SCRAMBLING_ALGORITHMS : ObjectScrambler.SCRAMBLING_BANDAGED;
|
|
| 348 | 349 |
} |
| 349 | 350 |
|
| 350 | 351 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyCamouflage.java | ||
|---|---|---|
| 21 | 21 |
import org.distorted.objectlib.main.InitData; |
| 22 | 22 |
import org.distorted.objectlib.main.ObjectSignatures; |
| 23 | 23 |
import org.distorted.objectlib.main.ObjectType; |
| 24 |
import org.distorted.objectlib.scrambling.ObjectScrambler; |
|
| 24 | 25 |
|
| 25 | 26 |
import java.io.InputStream; |
| 26 | 27 |
|
| ... | ... | |
| 137 | 138 |
@Override |
| 138 | 139 |
public int getScrambleType() |
| 139 | 140 |
{
|
| 140 |
return 0;
|
|
| 141 |
return ObjectScrambler.SCRAMBLING_ALGORITHMS;
|
|
| 141 | 142 |
} |
| 142 | 143 |
|
| 143 | 144 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistySquare1.java | ||
|---|---|---|
| 22 | 22 |
import org.distorted.objectlib.main.ObjectSignatures; |
| 23 | 23 |
import org.distorted.objectlib.main.ObjectType; |
| 24 | 24 |
import org.distorted.objectlib.helpers.ObjectShape; |
| 25 |
import org.distorted.objectlib.scrambling.ObjectScrambler; |
|
| 25 | 26 |
|
| 26 | 27 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 27 | 28 |
|
| ... | ... | |
| 42 | 43 |
@Override |
| 43 | 44 |
public int getScrambleType() |
| 44 | 45 |
{
|
| 45 |
return 1; |
|
| 46 |
return ObjectScrambler.SCRAMBLING_SQUARE1;
|
|
| 46 | 47 |
} |
| 47 | 48 |
|
| 48 | 49 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/scrambling/ObjectScrambler.java | ||
|---|---|---|
| 18 | 18 |
|
| 19 | 19 |
public class ObjectScrambler |
| 20 | 20 |
{
|
| 21 |
public static final int SCRAMBLING_ALGORITHMS = 0; |
|
| 22 |
public static final int SCRAMBLING_SQUARE1 = 1; |
|
| 23 |
public static final int SCRAMBLING_BANDAGED = 2; |
|
| 24 |
public static final int SCRAMBLING_TABLEBASES = 3; |
|
| 25 |
|
|
| 21 | 26 |
private final ScrambleState[] mStates; |
| 22 | 27 |
private final int mType; |
| 23 | 28 |
private final int mNumAxis; |
| ... | ... | |
| 610 | 615 |
if( curr==0 ) initializeType2Scrambling(scramble,rnd,total,signature); |
| 611 | 616 |
} |
| 612 | 617 |
|
| 618 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 619 |
// TYPE 3 (tablebases) |
|
| 620 |
|
|
| 621 |
private void randomizeNewScramble3(int[][] scramble, Random rnd, int curr, int total, ObjectSignature signature) |
|
| 622 |
{
|
|
| 623 |
// TODO |
|
| 624 |
} |
|
| 625 |
|
|
| 613 | 626 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 614 | 627 |
// PUBLIC API |
| 615 | 628 |
|
| ... | ... | |
| 617 | 630 |
{
|
| 618 | 631 |
switch(mType) |
| 619 | 632 |
{
|
| 620 |
case 0: randomizeNewScramble0(scramble, rnd, curr); break; |
|
| 621 |
case 1: randomizeNewScramble1(scramble, rnd, curr); break; |
|
| 622 |
case 2: randomizeNewScramble2(scramble, rnd, curr, total, signature); break; |
|
| 633 |
case SCRAMBLING_ALGORITHMS: randomizeNewScramble0(scramble, rnd, curr); break; |
|
| 634 |
case SCRAMBLING_SQUARE1 : randomizeNewScramble1(scramble, rnd, curr); break; |
|
| 635 |
case SCRAMBLING_BANDAGED : randomizeNewScramble2(scramble, rnd, curr, total, signature); break; |
|
| 636 |
case SCRAMBLING_TABLEBASES: randomizeNewScramble3(scramble, rnd, curr, total, signature); break; |
|
| 623 | 637 |
} |
| 624 | 638 |
} |
| 625 | 639 |
} |
Also available in: Unified diff
Constants for scrambling types.