Revision 2dffaf22
Added by Leszek Koltunski over 1 year ago
| src/main/java/org/distorted/objectlib/helpers/ObjectSignature.java | ||
|---|---|---|
| 60 | 60 |
} |
| 61 | 61 |
} |
| 62 | 62 |
|
| 63 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 64 |
// built-in objects |
|
| 65 |
|
|
| 66 |
public ObjectSignature(ObjectType type) |
|
| 67 |
{
|
|
| 68 |
mSignature = new long[SIZE]; |
|
| 69 |
mSignature[SIZE-1] = type.ordinal(); |
|
| 70 |
} |
|
| 71 |
|
|
| 72 | 63 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 73 | 64 |
|
| 74 | 65 |
public ObjectSignature(ObjectSignature sig) |
| ... | ... | |
| 89 | 80 |
} |
| 90 | 81 |
|
| 91 | 82 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 92 |
// built-in bandaged 3x3s; objects created from JSON (version1)
|
|
| 83 |
// built-in objects; objects created from JSON (version1)
|
|
| 93 | 84 |
|
| 94 | 85 |
public ObjectSignature(long signature) |
| 95 | 86 |
{
|
| src/main/java/org/distorted/objectlib/main/ObjectSignatures.java | ||
|---|---|---|
| 13 | 13 |
|
| 14 | 14 |
public class ObjectSignatures |
| 15 | 15 |
{
|
| 16 |
public static final int CUBE_2 = ObjectType.CUBE_2.ordinal();
|
|
| 17 |
public static final int CUBE_3 = ObjectType.CUBE_3.ordinal();
|
|
| 18 |
public static final int CUBE_4 = ObjectType.CUBE_4.ordinal();
|
|
| 19 |
public static final int CUBE_5 = ObjectType.CUBE_5.ordinal();
|
|
| 20 |
public static final int CUBE_6 = ObjectType.CUBE_6.ordinal();
|
|
| 21 |
public static final int CUBE_7 = ObjectType.CUBE_7.ordinal();
|
|
| 22 |
public static final int MIRR_2 = ObjectType.MIRR_2.ordinal();
|
|
| 23 |
public static final int MIRR_3 = ObjectType.MIRR_3.ordinal();
|
|
| 24 |
public static final int MIRR_4 = ObjectType.MIRR_4.ordinal();
|
|
| 25 |
public static final int CU_323 = ObjectType.CU_323.ordinal();
|
|
| 26 |
public static final int CU_232 = ObjectType.CU_232.ordinal();
|
|
| 27 |
public static final int CU_343 = ObjectType.CU_343.ordinal();
|
|
| 28 |
public static final int ULTI_2 = ObjectType.ULTI_2.ordinal();
|
|
| 29 |
public static final int KILO_3 = ObjectType.KILO_3.ordinal();
|
|
| 30 |
public static final int KILO_5 = ObjectType.KILO_5.ordinal();
|
|
| 31 |
public static final int MEGA_3 = ObjectType.MEGA_3.ordinal();
|
|
| 32 |
public static final int MEGA_5 = ObjectType.MEGA_5.ordinal();
|
|
| 33 |
public static final int MORP_2 = ObjectType.MORP_2.ordinal();
|
|
| 34 |
public static final int MORP_3 = ObjectType.MORP_3.ordinal();
|
|
| 35 |
public static final int MORP_4 = ObjectType.MORP_4.ordinal();
|
|
| 36 |
public static final int JING_2 = ObjectType.JING_2.ordinal();
|
|
| 37 |
public static final int PYRA_3 = ObjectType.PYRA_3.ordinal();
|
|
| 38 |
public static final int PYRA_4 = ObjectType.PYRA_4.ordinal();
|
|
| 39 |
public static final int PYRA_5 = ObjectType.PYRA_5.ordinal();
|
|
| 40 |
public static final int TRAJ_3 = ObjectType.TRAJ_3.ordinal();
|
|
| 41 |
public static final int TRAJ_4 = ObjectType.TRAJ_4.ordinal();
|
|
| 42 |
public static final int DIAM_2 = ObjectType.DIAM_2.ordinal();
|
|
| 43 |
public static final int DIAM_3 = ObjectType.DIAM_3.ordinal();
|
|
| 44 |
public static final int DIAM_4 = ObjectType.DIAM_4.ordinal();
|
|
| 45 |
public static final int DINO_3 = ObjectType.DINO_3.ordinal();
|
|
| 46 |
public static final int DIN4_3 = ObjectType.DIN4_3.ordinal();
|
|
| 47 |
public static final int REDI_3 = ObjectType.REDI_3.ordinal();
|
|
| 48 |
public static final int HELI_3 = ObjectType.HELI_3.ordinal();
|
|
| 49 |
public static final int SKEW_2 = ObjectType.SKEW_2.ordinal();
|
|
| 50 |
public static final int SKEW_3 = ObjectType.SKEW_3.ordinal();
|
|
| 51 |
public static final int IVY_2 = ObjectType.IVY_2.ordinal();
|
|
| 52 |
public static final int REX_3 = ObjectType.REX_3.ordinal();
|
|
| 53 |
public static final int BAN1_3 = ObjectType.BAN1_3.ordinal();
|
|
| 54 |
public static final int BAN2_3 = ObjectType.BAN2_3.ordinal();
|
|
| 55 |
public static final int BAN3_3 = ObjectType.BAN3_3.ordinal();
|
|
| 56 |
public static final int BAN4_3 = ObjectType.BAN4_3.ordinal();
|
|
| 57 |
public static final int BAN5_4 = ObjectType.BAN5_4.ordinal();
|
|
| 58 |
public static final int BAN6_4 = ObjectType.BAN6_4.ordinal();
|
|
| 59 |
public static final int SQU1_3 = ObjectType.SQU1_3.ordinal();
|
|
| 60 |
public static final int SQU2_3 = ObjectType.SQU2_3.ordinal();
|
|
| 61 |
public static final int WIND_3 = ObjectType.WIND_3.ordinal();
|
|
| 62 |
public static final int FISH_3 = ObjectType.FISH_3.ordinal();
|
|
| 63 |
public static final int CONT_2 = ObjectType.CONT_2.ordinal();
|
|
| 64 |
public static final int AXIS_3 = ObjectType.AXIS_3.ordinal();
|
|
| 65 |
public static final int VOID_3 = ObjectType.VOID_3.ordinal();
|
|
| 66 |
public static final int CRYS_3 = ObjectType.CRYS_3.ordinal();
|
|
| 67 |
public static final int STAR_3 = ObjectType.STAR_3.ordinal();
|
|
| 68 |
public static final int PENT_2 = ObjectType.PENT_2.ordinal();
|
|
| 69 |
public static final int MIXU_3 = ObjectType.MIXU_3.ordinal();
|
|
| 70 |
public static final int MIXP_3 = ObjectType.MIXP_3.ordinal();
|
|
| 71 |
public static final int CRA1_2 = ObjectType.CRA1_2.ordinal();
|
|
| 72 |
public static final int CRA1_3 = ObjectType.CRA1_3.ordinal();
|
|
| 73 |
public static final int CRA2_3 = ObjectType.CRA2_3.ordinal();
|
|
| 74 |
public static final int CRA3_3 = ObjectType.CRA3_3.ordinal();
|
|
| 75 |
public static final int CRA4_3 = ObjectType.CRA4_3.ordinal();
|
|
| 76 |
public static final int CRA5_3 = ObjectType.CRA5_3.ordinal();
|
|
| 77 |
public static final int CRA6_3 = ObjectType.CRA6_3.ordinal();
|
|
| 78 |
public static final int CRA7_3 = ObjectType.CRA7_3.ordinal();
|
|
| 79 |
public static final int CRA8_3 = ObjectType.CRA8_3.ordinal();
|
|
| 80 |
public static final int CRA9_3 = ObjectType.CRA9_3.ordinal();
|
|
| 81 |
public static final int PDUO_2 = ObjectType.PDUO_2.ordinal();
|
|
| 82 |
public static final int PDIA_3 = ObjectType.PDIA_3.ordinal();
|
|
| 83 |
public static final int BALL_4 = ObjectType.BALL_4.ordinal();
|
|
| 84 |
public static final int CA_333 = ObjectType.CA_333.ordinal();
|
|
| 16 |
public static final int CUBE_2 = 0;
|
|
| 17 |
public static final int CUBE_3 = 1;
|
|
| 18 |
public static final int CUBE_4 = 2;
|
|
| 19 |
public static final int CUBE_5 = 3;
|
|
| 20 |
public static final int CUBE_6 = 4;
|
|
| 21 |
public static final int CUBE_7 = 5;
|
|
| 22 |
public static final int MIRR_2 = 6;
|
|
| 23 |
public static final int MIRR_3 = 7;
|
|
| 24 |
public static final int MIRR_4 = 8;
|
|
| 25 |
public static final int CU_323 = 9;
|
|
| 26 |
public static final int CU_232 = 10;
|
|
| 27 |
public static final int CU_343 = 11;
|
|
| 28 |
public static final int ULTI_2 = 12;
|
|
| 29 |
public static final int KILO_3 = 13;
|
|
| 30 |
public static final int KILO_5 = 14;
|
|
| 31 |
public static final int MEGA_3 = 15;
|
|
| 32 |
public static final int MEGA_5 = 16;
|
|
| 33 |
public static final int MORP_2 = 17;
|
|
| 34 |
public static final int MORP_3 = 18;
|
|
| 35 |
public static final int MORP_4 = 19;
|
|
| 36 |
public static final int JING_2 = 20;
|
|
| 37 |
public static final int PYRA_3 = 21;
|
|
| 38 |
public static final int PYRA_4 = 22;
|
|
| 39 |
public static final int PYRA_5 = 23;
|
|
| 40 |
public static final int TRAJ_3 = 24;
|
|
| 41 |
public static final int TRAJ_4 = 25;
|
|
| 42 |
public static final int DIAM_2 = 26;
|
|
| 43 |
public static final int DIAM_3 = 27;
|
|
| 44 |
public static final int DIAM_4 = 28;
|
|
| 45 |
public static final int DINO_3 = 29;
|
|
| 46 |
public static final int DIN4_3 = 30;
|
|
| 47 |
public static final int REDI_3 = 31;
|
|
| 48 |
public static final int HELI_3 = 32;
|
|
| 49 |
public static final int SKEW_2 = 33;
|
|
| 50 |
public static final int SKEW_3 = 34;
|
|
| 51 |
public static final int IVY_2 = 35;
|
|
| 52 |
public static final int REX_3 = 36;
|
|
| 53 |
public static final int BAN1_3 = 37;
|
|
| 54 |
public static final int BAN2_3 = 38;
|
|
| 55 |
public static final int BAN3_3 = 39;
|
|
| 56 |
public static final int BAN4_3 = 40;
|
|
| 57 |
public static final int BAN5_4 = 41;
|
|
| 58 |
public static final int BAN6_4 = 42;
|
|
| 59 |
public static final int SQU1_3 = 43;
|
|
| 60 |
public static final int SQU2_3 = 44;
|
|
| 61 |
public static final int WIND_3 = 45;
|
|
| 62 |
public static final int FISH_3 = 46;
|
|
| 63 |
public static final int CONT_2 = 47;
|
|
| 64 |
public static final int AXIS_3 = 48;
|
|
| 65 |
public static final int VOID_3 = 49;
|
|
| 66 |
public static final int CRYS_3 = 50;
|
|
| 67 |
public static final int STAR_3 = 51;
|
|
| 68 |
public static final int PENT_2 = 52;
|
|
| 69 |
public static final int MIXU_3 = 53;
|
|
| 70 |
public static final int MIXP_3 = 54;
|
|
| 71 |
public static final int CRA1_2 = 55;
|
|
| 72 |
public static final int CRA1_3 = 56;
|
|
| 73 |
public static final int CRA2_3 = 57;
|
|
| 74 |
public static final int CRA3_3 = 58;
|
|
| 75 |
public static final int CRA4_3 = 59;
|
|
| 76 |
public static final int CRA5_3 = 60;
|
|
| 77 |
public static final int CRA6_3 = 61;
|
|
| 78 |
public static final int CRA7_3 = 62;
|
|
| 79 |
public static final int CRA8_3 = 63;
|
|
| 80 |
public static final int CRA9_3 = 64;
|
|
| 81 |
public static final int PDUO_2 = 65;
|
|
| 82 |
public static final int PDIA_3 = 66;
|
|
| 83 |
public static final int BALL_4 = 67;
|
|
| 84 |
public static final int CA_333 = 68;
|
|
| 85 | 85 |
} |
| src/main/java/org/distorted/objectlib/main/ObjectType.java | ||
|---|---|---|
| 98 | 98 |
MIXP_3 ( TwistyMixup3x3Plus.class , 28, R.drawable.mixp_3, true, 70, new InitData(new int[] {3,3,3})),
|
| 99 | 99 |
DINO_3 ( TwistyDino6.class , 10, R.drawable.dino_3, true, 0, new InitData(new int[] {3,3,3,3})),
|
| 100 | 100 |
DIN4_3 ( TwistyDino4.class , 9, R.drawable.din4_3, true, 30, new InitData(new int[] {3,3,3,3})),
|
| 101 |
PDUO_2 ( TwistyPyraminxDuo.class , 4, R.drawable.pduo_2, true, 0, new InitData(new int[] {2,2,2,2})),
|
|
| 102 |
PDIA_3 ( TwistyPyraminxDiamond.class, 12, R.drawable.pdia_3, true, 40, new InitData(new int[] {3,3,3})),
|
|
| 101 | 103 |
|
| 104 |
BALL_4 ( TwistyMasterball.class , 28, R.drawable.ball_4, false, 70, new InitData(new int[] {4,2,2,2,2})),
|
|
| 102 | 105 |
BAN5_4 ( TwistyBandagedCuboid.class , 48, R.drawable.ban5_4, false, 50, new InitData(new int[] {4,4,4}, TwistyBandagedCuboid.POS_5)),
|
| 103 | 106 |
BAN6_4 ( TwistyBandagedCuboid.class ,487, R.drawable.ban6_4, false, 50, new InitData(new int[] {4,4,4}, TwistyBandagedCuboid.POS_6)),
|
| 104 | 107 |
CA_333 ( TwistyCamouflage.class ,487, R.drawable.ca_333, false, 50, new InitData(new int[] {4,4,4}, TwistyCamouflage.CAM_333)),
|
| 105 | 108 |
|
| 106 |
PDUO_2 ( TwistyPyraminxDuo.class , 4, R.drawable.pduo_2, false, 0, new InitData(new int[] {2,2,2,2})),
|
|
| 107 |
PDIA_3 ( TwistyPyraminxDiamond.class, 12, R.drawable.pdia_3, false, 40, new InitData(new int[] {3,3,3})),
|
|
| 108 |
BALL_4 ( TwistyMasterball.class , 28, R.drawable.ball_4, false, 70, new InitData(new int[] {4,2,2,2,2})),
|
|
| 109 |
|
|
| 110 | 109 |
; |
| 111 | 110 |
|
| 112 | 111 |
public static int NUM_OBJECTS; |
| src/main/java/org/distorted/objectlib/objects/TwistyAxis.java | ||
|---|---|---|
| 16 | 16 |
import org.distorted.objectlib.helpers.ObjectShape; |
| 17 | 17 |
import org.distorted.objectlib.helpers.ObjectSignature; |
| 18 | 18 |
import org.distorted.objectlib.helpers.ObjectVertexEffects; |
| 19 |
import org.distorted.objectlib.main.ObjectSignatures; |
|
| 19 | 20 |
import org.distorted.objectlib.scrambling.ScrambleEdgeGenerator; |
| 20 | 21 |
import org.distorted.objectlib.main.InitData; |
| 21 | 22 |
import org.distorted.objectlib.main.ObjectType; |
| ... | ... | |
| 513 | 514 |
|
| 514 | 515 |
public ObjectSignature getSignature() |
| 515 | 516 |
{
|
| 516 |
return new ObjectSignature(ObjectType.AXIS_3);
|
|
| 517 |
return new ObjectSignature(ObjectSignatures.AXIS_3);
|
|
| 517 | 518 |
} |
| 518 | 519 |
|
| 519 | 520 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyCamouflage.java | ||
|---|---|---|
| 19 | 19 |
import org.distorted.objectlib.helpers.ObjectSignature; |
| 20 | 20 |
import org.distorted.objectlib.helpers.ObjectVertexEffects; |
| 21 | 21 |
import org.distorted.objectlib.main.InitData; |
| 22 |
import org.distorted.objectlib.main.ObjectSignatures; |
|
| 22 | 23 |
import org.distorted.objectlib.main.ObjectType; |
| 23 | 24 |
|
| 24 | 25 |
import java.io.InputStream; |
| ... | ... | |
| 457 | 458 |
if( mSignature==null ) |
| 458 | 459 |
{
|
| 459 | 460 |
if( mPosition==null ) mPosition = getInitData().getPos(); |
| 460 |
if( mPosition==CAM_333 ) mSignature = new ObjectSignature(ObjectType.CA_333);
|
|
| 461 |
if( mPosition==CAM_333 ) mSignature = new ObjectSignature(ObjectSignatures.CA_333);
|
|
| 461 | 462 |
} |
| 462 | 463 |
return mSignature; |
| 463 | 464 |
} |
| src/main/java/org/distorted/objectlib/objects/TwistyContainer.java | ||
|---|---|---|
| 18 | 18 |
import org.distorted.objectlib.helpers.ObjectShape; |
| 19 | 19 |
import org.distorted.objectlib.helpers.ObjectSignature; |
| 20 | 20 |
import org.distorted.objectlib.helpers.ObjectVertexEffects; |
| 21 |
import org.distorted.objectlib.main.ObjectSignatures; |
|
| 21 | 22 |
import org.distorted.objectlib.scrambling.ScrambleEdgeGenerator; |
| 22 | 23 |
import org.distorted.objectlib.main.InitData; |
| 23 | 24 |
import org.distorted.objectlib.main.ObjectType; |
| ... | ... | |
| 364 | 365 |
|
| 365 | 366 |
public ObjectSignature getSignature() |
| 366 | 367 |
{
|
| 367 |
return new ObjectSignature(ObjectType.CONT_2);
|
|
| 368 |
return new ObjectSignature(ObjectSignatures.CONT_2);
|
|
| 368 | 369 |
} |
| 369 | 370 |
|
| 370 | 371 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyCrazy2x2.java | ||
|---|---|---|
| 18 | 18 |
import org.distorted.objectlib.helpers.ObjectShape; |
| 19 | 19 |
import org.distorted.objectlib.helpers.ObjectSignature; |
| 20 | 20 |
import org.distorted.objectlib.helpers.ObjectVertexEffects; |
| 21 |
import org.distorted.objectlib.main.ObjectSignatures; |
|
| 21 | 22 |
import org.distorted.objectlib.scrambling.ScrambleEdgeGenerator; |
| 22 | 23 |
import org.distorted.objectlib.main.TwistyObjectCubit; |
| 23 | 24 |
import org.distorted.objectlib.main.InitData; |
| ... | ... | |
| 601 | 602 |
|
| 602 | 603 |
public ObjectSignature getSignature() |
| 603 | 604 |
{
|
| 604 |
return new ObjectSignature(ObjectType.CRA1_2);
|
|
| 605 |
return new ObjectSignature(ObjectSignatures.CRA1_2);
|
|
| 605 | 606 |
} |
| 606 | 607 |
|
| 607 | 608 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyCrazy3x3.java | ||
|---|---|---|
| 20 | 20 |
import org.distorted.objectlib.helpers.ObjectSignature; |
| 21 | 21 |
import org.distorted.objectlib.helpers.ObjectStickerOverride; |
| 22 | 22 |
import org.distorted.objectlib.helpers.ObjectVertexEffects; |
| 23 |
import org.distorted.objectlib.main.ObjectSignatures; |
|
| 23 | 24 |
import org.distorted.objectlib.scrambling.ScrambleEdgeGenerator; |
| 24 | 25 |
import org.distorted.objectlib.main.TwistyObjectCubit; |
| 25 | 26 |
import org.distorted.objectlib.main.InitData; |
| ... | ... | |
| 1015 | 1016 |
|
| 1016 | 1017 |
switch(param) |
| 1017 | 1018 |
{
|
| 1018 |
case CRAZY : return new ObjectSignature(ObjectType.CRA1_3);
|
|
| 1019 |
case MERCURY: return new ObjectSignature(ObjectType.CRA2_3);
|
|
| 1020 |
case VENUS : return new ObjectSignature(ObjectType.CRA3_3);
|
|
| 1021 |
case EARTH : return new ObjectSignature(ObjectType.CRA4_3);
|
|
| 1022 |
case MARS : return new ObjectSignature(ObjectType.CRA5_3);
|
|
| 1023 |
case JUPITER: return new ObjectSignature(ObjectType.CRA6_3);
|
|
| 1024 |
case SATURN : return new ObjectSignature(ObjectType.CRA7_3);
|
|
| 1025 |
case URANUS : return new ObjectSignature(ObjectType.CRA8_3);
|
|
| 1026 |
case NEPTUNE: return new ObjectSignature(ObjectType.CRA9_3);
|
|
| 1019 |
case CRAZY : return new ObjectSignature(ObjectSignatures.CRA1_3);
|
|
| 1020 |
case MERCURY: return new ObjectSignature(ObjectSignatures.CRA2_3);
|
|
| 1021 |
case VENUS : return new ObjectSignature(ObjectSignatures.CRA3_3);
|
|
| 1022 |
case EARTH : return new ObjectSignature(ObjectSignatures.CRA4_3);
|
|
| 1023 |
case MARS : return new ObjectSignature(ObjectSignatures.CRA5_3);
|
|
| 1024 |
case JUPITER: return new ObjectSignature(ObjectSignatures.CRA6_3);
|
|
| 1025 |
case SATURN : return new ObjectSignature(ObjectSignatures.CRA7_3);
|
|
| 1026 |
case URANUS : return new ObjectSignature(ObjectSignatures.CRA8_3);
|
|
| 1027 |
case NEPTUNE: return new ObjectSignature(ObjectSignatures.CRA9_3);
|
|
| 1027 | 1028 |
} |
| 1028 | 1029 |
|
| 1029 | 1030 |
return null; |
| src/main/java/org/distorted/objectlib/objects/TwistyCrystal.java | ||
|---|---|---|
| 19 | 19 |
import org.distorted.objectlib.helpers.ObjectSignature; |
| 20 | 20 |
import org.distorted.objectlib.helpers.ObjectVertexEffects; |
| 21 | 21 |
import org.distorted.objectlib.main.InitData; |
| 22 |
import org.distorted.objectlib.main.ObjectSignatures; |
|
| 22 | 23 |
import org.distorted.objectlib.main.ObjectType; |
| 23 | 24 |
|
| 24 | 25 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| ... | ... | |
| 265 | 266 |
|
| 266 | 267 |
public ObjectSignature getSignature() |
| 267 | 268 |
{
|
| 268 |
return new ObjectSignature(ObjectType.CRYS_3);
|
|
| 269 |
return new ObjectSignature(ObjectSignatures.CRYS_3);
|
|
| 269 | 270 |
} |
| 270 | 271 |
|
| 271 | 272 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyCuboid.java | ||
|---|---|---|
| 21 | 21 |
import org.distorted.objectlib.helpers.ObjectFaceShape; |
| 22 | 22 |
import org.distorted.objectlib.helpers.ObjectSignature; |
| 23 | 23 |
import org.distorted.objectlib.helpers.ObjectVertexEffects; |
| 24 |
import org.distorted.objectlib.main.ObjectSignatures; |
|
| 24 | 25 |
import org.distorted.objectlib.scrambling.ScrambleEdgeGenerator; |
| 25 | 26 |
import org.distorted.objectlib.main.InitData; |
| 26 | 27 |
import org.distorted.objectlib.touchcontrol.TouchControlCuboids; |
| ... | ... | |
| 620 | 621 |
{
|
| 621 | 622 |
case 2: switch(y) |
| 622 | 623 |
{
|
| 623 |
case 2: return new ObjectSignature(ObjectType.CUBE_2);
|
|
| 624 |
case 3: return new ObjectSignature(ObjectType.CU_232);
|
|
| 624 |
case 2: return new ObjectSignature(ObjectSignatures.CUBE_2);
|
|
| 625 |
case 3: return new ObjectSignature(ObjectSignatures.CU_232);
|
|
| 625 | 626 |
} |
| 626 | 627 |
case 3: switch(y) |
| 627 | 628 |
{
|
| 628 |
case 2: return new ObjectSignature(ObjectType.CU_323);
|
|
| 629 |
case 3: return new ObjectSignature(ObjectType.CUBE_3);
|
|
| 630 |
case 4: return new ObjectSignature(ObjectType.CU_343);
|
|
| 629 |
case 2: return new ObjectSignature(ObjectSignatures.CU_323);
|
|
| 630 |
case 3: return new ObjectSignature(ObjectSignatures.CUBE_3);
|
|
| 631 |
case 4: return new ObjectSignature(ObjectSignatures.CU_343);
|
|
| 631 | 632 |
} |
| 632 |
case 4: return new ObjectSignature(ObjectType.CUBE_4);
|
|
| 633 |
case 5: return new ObjectSignature(ObjectType.CUBE_5);
|
|
| 634 |
case 6: return new ObjectSignature(ObjectType.CUBE_6);
|
|
| 635 |
case 7: return new ObjectSignature(ObjectType.CUBE_7);
|
|
| 633 |
case 4: return new ObjectSignature(ObjectSignatures.CUBE_4);
|
|
| 634 |
case 5: return new ObjectSignature(ObjectSignatures.CUBE_5);
|
|
| 635 |
case 6: return new ObjectSignature(ObjectSignatures.CUBE_6);
|
|
| 636 |
case 7: return new ObjectSignature(ObjectSignatures.CUBE_7);
|
|
| 636 | 637 |
} |
| 637 | 638 |
|
| 638 | 639 |
return null; |
| src/main/java/org/distorted/objectlib/objects/TwistyDiamond.java | ||
|---|---|---|
| 21 | 21 |
import org.distorted.objectlib.helpers.ObjectFaceShape; |
| 22 | 22 |
import org.distorted.objectlib.helpers.ObjectSignature; |
| 23 | 23 |
import org.distorted.objectlib.helpers.ObjectVertexEffects; |
| 24 |
import org.distorted.objectlib.main.ObjectSignatures; |
|
| 24 | 25 |
import org.distorted.objectlib.scrambling.ScrambleEdgeGenerator; |
| 25 | 26 |
import org.distorted.objectlib.main.InitData; |
| 26 | 27 |
import org.distorted.objectlib.touchcontrol.TouchControlOctahedron; |
| ... | ... | |
| 513 | 514 |
{
|
| 514 | 515 |
switch(getNumLayers()[0]) |
| 515 | 516 |
{
|
| 516 |
case 2: return new ObjectSignature(ObjectType.DIAM_2);
|
|
| 517 |
case 3: return new ObjectSignature(ObjectType.DIAM_3);
|
|
| 518 |
case 4: return new ObjectSignature(ObjectType.DIAM_4);
|
|
| 517 |
case 2: return new ObjectSignature(ObjectSignatures.DIAM_2);
|
|
| 518 |
case 3: return new ObjectSignature(ObjectSignatures.DIAM_3);
|
|
| 519 |
case 4: return new ObjectSignature(ObjectSignatures.DIAM_4);
|
|
| 519 | 520 |
} |
| 520 | 521 |
|
| 521 | 522 |
return null; |
| src/main/java/org/distorted/objectlib/objects/TwistyDino4.java | ||
|---|---|---|
| 16 | 16 |
|
| 17 | 17 |
import org.distorted.objectlib.helpers.ObjectSignature; |
| 18 | 18 |
import org.distorted.objectlib.main.InitData; |
| 19 |
import org.distorted.objectlib.main.ObjectSignatures; |
|
| 19 | 20 |
import org.distorted.objectlib.main.ObjectType; |
| 20 |
import org.distorted.objectlib.scrambling.ScrambleState; |
|
| 21 | 21 |
|
| 22 | 22 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 23 | 23 |
|
| ... | ... | |
| 99 | 99 |
|
| 100 | 100 |
public ObjectSignature getSignature() |
| 101 | 101 |
{
|
| 102 |
return new ObjectSignature(ObjectType.DIN4_3);
|
|
| 102 |
return new ObjectSignature(ObjectSignatures.DIN4_3);
|
|
| 103 | 103 |
} |
| 104 | 104 |
|
| 105 | 105 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyDino6.java | ||
|---|---|---|
| 16 | 16 |
|
| 17 | 17 |
import org.distorted.objectlib.helpers.ObjectSignature; |
| 18 | 18 |
import org.distorted.objectlib.main.InitData; |
| 19 |
import org.distorted.objectlib.main.ObjectSignatures; |
|
| 19 | 20 |
import org.distorted.objectlib.main.ObjectType; |
| 20 |
import org.distorted.objectlib.scrambling.ScrambleState; |
|
| 21 | 21 |
|
| 22 | 22 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 23 | 23 |
|
| ... | ... | |
| 75 | 75 |
|
| 76 | 76 |
public ObjectSignature getSignature() |
| 77 | 77 |
{
|
| 78 |
return new ObjectSignature(ObjectType.DINO_3);
|
|
| 78 |
return new ObjectSignature(ObjectSignatures.DINO_3);
|
|
| 79 | 79 |
} |
| 80 | 80 |
|
| 81 | 81 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyFisher.java | ||
|---|---|---|
| 16 | 16 |
import org.distorted.objectlib.helpers.ObjectShape; |
| 17 | 17 |
import org.distorted.objectlib.helpers.ObjectSignature; |
| 18 | 18 |
import org.distorted.objectlib.helpers.ObjectVertexEffects; |
| 19 |
import org.distorted.objectlib.main.ObjectSignatures; |
|
| 19 | 20 |
import org.distorted.objectlib.scrambling.ScrambleEdgeGenerator; |
| 20 | 21 |
import org.distorted.objectlib.main.InitData; |
| 21 | 22 |
import org.distorted.objectlib.main.ObjectType; |
| ... | ... | |
| 411 | 412 |
|
| 412 | 413 |
public ObjectSignature getSignature() |
| 413 | 414 |
{
|
| 414 |
return new ObjectSignature(ObjectType.FISH_3);
|
|
| 415 |
return new ObjectSignature(ObjectSignatures.FISH_3);
|
|
| 415 | 416 |
} |
| 416 | 417 |
|
| 417 | 418 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyHelicopter.java | ||
|---|---|---|
| 22 | 22 |
import org.distorted.objectlib.helpers.ObjectSignature; |
| 23 | 23 |
import org.distorted.objectlib.helpers.ObjectVertexEffects; |
| 24 | 24 |
import org.distorted.objectlib.main.InitData; |
| 25 |
import org.distorted.objectlib.main.ObjectSignatures; |
|
| 25 | 26 |
import org.distorted.objectlib.touchcontrol.TouchControlHexahedron; |
| 26 | 27 |
import org.distorted.objectlib.main.ObjectType; |
| 27 | 28 |
import org.distorted.objectlib.helpers.ObjectShape; |
| ... | ... | |
| 364 | 365 |
|
| 365 | 366 |
public ObjectSignature getSignature() |
| 366 | 367 |
{
|
| 367 |
return new ObjectSignature(ObjectType.HELI_3);
|
|
| 368 |
return new ObjectSignature(ObjectSignatures.HELI_3);
|
|
| 368 | 369 |
} |
| 369 | 370 |
|
| 370 | 371 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyIvy.java | ||
|---|---|---|
| 21 | 21 |
import org.distorted.objectlib.helpers.ObjectFaceShape; |
| 22 | 22 |
import org.distorted.objectlib.helpers.ObjectSignature; |
| 23 | 23 |
import org.distorted.objectlib.helpers.ObjectVertexEffects; |
| 24 |
import org.distorted.objectlib.main.ObjectSignatures; |
|
| 24 | 25 |
import org.distorted.objectlib.scrambling.ScrambleEdgeGenerator; |
| 25 | 26 |
import org.distorted.objectlib.main.InitData; |
| 26 | 27 |
import org.distorted.objectlib.touchcontrol.TouchControlHexahedron; |
| ... | ... | |
| 466 | 467 |
|
| 467 | 468 |
public ObjectSignature getSignature() |
| 468 | 469 |
{
|
| 469 |
return new ObjectSignature(ObjectType.IVY_2);
|
|
| 470 |
return new ObjectSignature(ObjectSignatures.IVY_2);
|
|
| 470 | 471 |
} |
| 471 | 472 |
|
| 472 | 473 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyJing.java | ||
|---|---|---|
| 21 | 21 |
import org.distorted.objectlib.helpers.ObjectFaceShape; |
| 22 | 22 |
import org.distorted.objectlib.helpers.ObjectSignature; |
| 23 | 23 |
import org.distorted.objectlib.helpers.ObjectVertexEffects; |
| 24 |
import org.distorted.objectlib.main.ObjectSignatures; |
|
| 24 | 25 |
import org.distorted.objectlib.scrambling.ScrambleEdgeGenerator; |
| 25 | 26 |
import org.distorted.objectlib.main.InitData; |
| 26 | 27 |
import org.distorted.objectlib.touchcontrol.TouchControlTetrahedron; |
| ... | ... | |
| 402 | 403 |
|
| 403 | 404 |
public ObjectSignature getSignature() |
| 404 | 405 |
{
|
| 405 |
return new ObjectSignature(ObjectType.JING_2);
|
|
| 406 |
return new ObjectSignature(ObjectSignatures.JING_2);
|
|
| 406 | 407 |
} |
| 407 | 408 |
|
| 408 | 409 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyKilominx.java | ||
|---|---|---|
| 23 | 23 |
import org.distorted.objectlib.helpers.ObjectSignature; |
| 24 | 24 |
import org.distorted.objectlib.helpers.ObjectVertexEffects; |
| 25 | 25 |
import org.distorted.objectlib.main.InitData; |
| 26 |
import org.distorted.objectlib.main.ObjectSignatures; |
|
| 26 | 27 |
import org.distorted.objectlib.main.ObjectType; |
| 27 | 28 |
import org.distorted.objectlib.helpers.ObjectShape; |
| 28 | 29 |
|
| ... | ... | |
| 612 | 613 |
{
|
| 613 | 614 |
switch(getNumLayers()[0]) |
| 614 | 615 |
{
|
| 615 |
case 3: return new ObjectSignature(ObjectType.KILO_3);
|
|
| 616 |
case 5: return new ObjectSignature(ObjectType.KILO_5);
|
|
| 616 |
case 3: return new ObjectSignature(ObjectSignatures.KILO_3);
|
|
| 617 |
case 5: return new ObjectSignature(ObjectSignatures.KILO_5);
|
|
| 617 | 618 |
} |
| 618 | 619 |
|
| 619 | 620 |
return null; |
| src/main/java/org/distorted/objectlib/objects/TwistyMasterball.java | ||
|---|---|---|
| 20 | 20 |
import org.distorted.objectlib.helpers.ObjectSignature; |
| 21 | 21 |
import org.distorted.objectlib.helpers.ObjectVertexEffects; |
| 22 | 22 |
import org.distorted.objectlib.main.InitData; |
| 23 |
import org.distorted.objectlib.main.ObjectSignatures; |
|
| 23 | 24 |
import org.distorted.objectlib.main.ObjectType; |
| 24 | 25 |
import org.distorted.objectlib.shape.ShapeDiamond; |
| 25 | 26 |
import org.distorted.objectlib.touchcontrol.TouchControlBall; |
| ... | ... | |
| 423 | 424 |
|
| 424 | 425 |
public ObjectSignature getSignature() |
| 425 | 426 |
{
|
| 426 |
return new ObjectSignature(ObjectType.BALL_4);
|
|
| 427 |
return new ObjectSignature(ObjectSignatures.BALL_4);
|
|
| 427 | 428 |
} |
| 428 | 429 |
|
| 429 | 430 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyMegaminx.java | ||
|---|---|---|
| 23 | 23 |
import org.distorted.objectlib.helpers.ObjectSignature; |
| 24 | 24 |
import org.distorted.objectlib.helpers.ObjectVertexEffects; |
| 25 | 25 |
import org.distorted.objectlib.main.InitData; |
| 26 |
import org.distorted.objectlib.main.ObjectSignatures; |
|
| 26 | 27 |
import org.distorted.objectlib.main.ObjectType; |
| 27 | 28 |
import org.distorted.objectlib.helpers.ObjectShape; |
| 28 | 29 |
|
| ... | ... | |
| 509 | 510 |
{
|
| 510 | 511 |
switch(getNumLayers()[0]) |
| 511 | 512 |
{
|
| 512 |
case 3: return new ObjectSignature(ObjectType.MEGA_3);
|
|
| 513 |
case 5: return new ObjectSignature(ObjectType.MEGA_5);
|
|
| 513 |
case 3: return new ObjectSignature(ObjectSignatures.MEGA_3);
|
|
| 514 |
case 5: return new ObjectSignature(ObjectSignatures.MEGA_5);
|
|
| 514 | 515 |
} |
| 515 | 516 |
|
| 516 | 517 |
return null; |
| src/main/java/org/distorted/objectlib/objects/TwistyMirror.java | ||
|---|---|---|
| 21 | 21 |
import org.distorted.objectlib.helpers.ObjectFaceShape; |
| 22 | 22 |
import org.distorted.objectlib.helpers.ObjectSignature; |
| 23 | 23 |
import org.distorted.objectlib.helpers.ObjectVertexEffects; |
| 24 |
import org.distorted.objectlib.main.ObjectSignatures; |
|
| 24 | 25 |
import org.distorted.objectlib.scrambling.ScrambleEdgeGenerator; |
| 25 | 26 |
import org.distorted.objectlib.main.InitData; |
| 26 | 27 |
import org.distorted.objectlib.main.ObjectType; |
| ... | ... | |
| 362 | 363 |
{
|
| 363 | 364 |
switch(getNumLayers()[0]) |
| 364 | 365 |
{
|
| 365 |
case 2: return new ObjectSignature(ObjectType.MIRR_2);
|
|
| 366 |
case 3: return new ObjectSignature(ObjectType.MIRR_3);
|
|
| 367 |
case 4: return new ObjectSignature(ObjectType.MIRR_4);
|
|
| 366 |
case 2: return new ObjectSignature(ObjectSignatures.MIRR_2);
|
|
| 367 |
case 3: return new ObjectSignature(ObjectSignatures.MIRR_3);
|
|
| 368 |
case 4: return new ObjectSignature(ObjectSignatures.MIRR_4);
|
|
| 368 | 369 |
} |
| 369 | 370 |
|
| 370 | 371 |
return null; |
| src/main/java/org/distorted/objectlib/objects/TwistyMixup3x3.java | ||
|---|---|---|
| 17 | 17 |
import org.distorted.objectlib.helpers.ObjectSignature; |
| 18 | 18 |
import org.distorted.objectlib.helpers.ObjectVertexEffects; |
| 19 | 19 |
import org.distorted.objectlib.main.InitData; |
| 20 |
import org.distorted.objectlib.main.ObjectSignatures; |
|
| 20 | 21 |
import org.distorted.objectlib.main.ObjectType; |
| 21 | 22 |
|
| 22 | 23 |
import java.io.InputStream; |
| ... | ... | |
| 223 | 224 |
|
| 224 | 225 |
public ObjectSignature getSignature() |
| 225 | 226 |
{
|
| 226 |
return new ObjectSignature(ObjectType.MIXU_3);
|
|
| 227 |
return new ObjectSignature(ObjectSignatures.MIXU_3);
|
|
| 227 | 228 |
} |
| 228 | 229 |
|
| 229 | 230 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyMixup3x3Plus.java | ||
|---|---|---|
| 19 | 19 |
import org.distorted.objectlib.helpers.ObjectSignature; |
| 20 | 20 |
import org.distorted.objectlib.helpers.ObjectVertexEffects; |
| 21 | 21 |
import org.distorted.objectlib.main.InitData; |
| 22 |
import org.distorted.objectlib.main.ObjectSignatures; |
|
| 22 | 23 |
import org.distorted.objectlib.main.ObjectType; |
| 23 | 24 |
|
| 24 | 25 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| ... | ... | |
| 330 | 331 |
|
| 331 | 332 |
public ObjectSignature getSignature() |
| 332 | 333 |
{
|
| 333 |
return new ObjectSignature(ObjectType.MIXP_3);
|
|
| 334 |
return new ObjectSignature(ObjectSignatures.MIXP_3);
|
|
| 334 | 335 |
} |
| 335 | 336 |
|
| 336 | 337 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyMorphix.java | ||
|---|---|---|
| 17 | 17 |
import org.distorted.objectlib.helpers.ObjectSignature; |
| 18 | 18 |
import org.distorted.objectlib.helpers.ObjectVertexEffects; |
| 19 | 19 |
import org.distorted.objectlib.main.InitData; |
| 20 |
import org.distorted.objectlib.main.ObjectSignatures; |
|
| 20 | 21 |
import org.distorted.objectlib.main.ObjectType; |
| 21 | 22 |
import org.distorted.objectlib.scrambling.ScrambleEdgeGenerator; |
| 22 | 23 |
import org.distorted.objectlib.shape.ShapeTetrahedron; |
| ... | ... | |
| 689 | 690 |
{
|
| 690 | 691 |
switch(getNumLayers()[0]) |
| 691 | 692 |
{
|
| 692 |
case 2: return new ObjectSignature(ObjectType.MORP_2);
|
|
| 693 |
case 3: return new ObjectSignature(ObjectType.MORP_3);
|
|
| 694 |
case 4: return new ObjectSignature(ObjectType.MORP_4);
|
|
| 693 |
case 2: return new ObjectSignature(ObjectSignatures.MORP_2);
|
|
| 694 |
case 3: return new ObjectSignature(ObjectSignatures.MORP_3);
|
|
| 695 |
case 4: return new ObjectSignature(ObjectSignatures.MORP_4);
|
|
| 695 | 696 |
} |
| 696 | 697 |
return null; |
| 697 | 698 |
} |
| src/main/java/org/distorted/objectlib/objects/TwistyPentultimate.java | ||
|---|---|---|
| 17 | 17 |
import org.distorted.objectlib.helpers.ObjectSignature; |
| 18 | 18 |
import org.distorted.objectlib.helpers.ObjectVertexEffects; |
| 19 | 19 |
import org.distorted.objectlib.main.InitData; |
| 20 |
import org.distorted.objectlib.main.ObjectSignatures; |
|
| 20 | 21 |
import org.distorted.objectlib.main.ObjectType; |
| 21 | 22 |
import org.distorted.objectlib.scrambling.ScrambleEdgeGenerator; |
| 22 | 23 |
|
| ... | ... | |
| 377 | 378 |
|
| 378 | 379 |
public ObjectSignature getSignature() |
| 379 | 380 |
{
|
| 380 |
return new ObjectSignature(ObjectType.PENT_2);
|
|
| 381 |
return new ObjectSignature(ObjectSignatures.PENT_2);
|
|
| 381 | 382 |
} |
| 382 | 383 |
|
| 383 | 384 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyPyraminx.java | ||
|---|---|---|
| 22 | 22 |
import org.distorted.objectlib.helpers.ObjectSignature; |
| 23 | 23 |
import org.distorted.objectlib.helpers.ObjectVertexEffects; |
| 24 | 24 |
import org.distorted.objectlib.main.InitData; |
| 25 |
import org.distorted.objectlib.main.ObjectSignatures; |
|
| 25 | 26 |
import org.distorted.objectlib.touchcontrol.TouchControlTetrahedron; |
| 26 | 27 |
import org.distorted.objectlib.main.ObjectType; |
| 27 | 28 |
import org.distorted.objectlib.helpers.ObjectShape; |
| ... | ... | |
| 405 | 406 |
{
|
| 406 | 407 |
switch(getNumLayers()[0]) |
| 407 | 408 |
{
|
| 408 |
case 3: return new ObjectSignature(ObjectType.PYRA_3);
|
|
| 409 |
case 4: return new ObjectSignature(ObjectType.PYRA_4);
|
|
| 410 |
case 5: return new ObjectSignature(ObjectType.PYRA_5);
|
|
| 409 |
case 3: return new ObjectSignature(ObjectSignatures.PYRA_3);
|
|
| 410 |
case 4: return new ObjectSignature(ObjectSignatures.PYRA_4);
|
|
| 411 |
case 5: return new ObjectSignature(ObjectSignatures.PYRA_5);
|
|
| 411 | 412 |
} |
| 412 | 413 |
|
| 413 | 414 |
return null; |
| src/main/java/org/distorted/objectlib/objects/TwistyPyraminxDiamond.java | ||
|---|---|---|
| 20 | 20 |
import org.distorted.objectlib.helpers.ObjectSignature; |
| 21 | 21 |
import org.distorted.objectlib.helpers.ObjectVertexEffects; |
| 22 | 22 |
import org.distorted.objectlib.main.InitData; |
| 23 |
import org.distorted.objectlib.main.ObjectSignatures; |
|
| 23 | 24 |
import org.distorted.objectlib.main.ObjectType; |
| 24 | 25 |
import org.distorted.objectlib.shape.ShapeOctahedron; |
| 25 | 26 |
import org.distorted.objectlib.touchcontrol.TouchControlOctahedron; |
| ... | ... | |
| 380 | 381 |
|
| 381 | 382 |
public ObjectSignature getSignature() |
| 382 | 383 |
{
|
| 383 |
return new ObjectSignature(ObjectType.PDIA_3);
|
|
| 384 |
return new ObjectSignature(ObjectSignatures.PDIA_3);
|
|
| 384 | 385 |
} |
| 385 | 386 |
|
| 386 | 387 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyPyraminxDuo.java | ||
|---|---|---|
| 20 | 20 |
import org.distorted.objectlib.helpers.ObjectSignature; |
| 21 | 21 |
import org.distorted.objectlib.helpers.ObjectVertexEffects; |
| 22 | 22 |
import org.distorted.objectlib.main.InitData; |
| 23 |
import org.distorted.objectlib.main.ObjectSignatures; |
|
| 23 | 24 |
import org.distorted.objectlib.main.ObjectType; |
| 24 | 25 |
import org.distorted.objectlib.shape.ShapeTetrahedron; |
| 25 | 26 |
import org.distorted.objectlib.touchcontrol.TouchControlTetrahedron; |
| ... | ... | |
| 342 | 343 |
|
| 343 | 344 |
public ObjectSignature getSignature() |
| 344 | 345 |
{
|
| 345 |
return new ObjectSignature(ObjectType.PDUO_2);
|
|
| 346 |
return new ObjectSignature(ObjectSignatures.PDUO_2);
|
|
| 346 | 347 |
} |
| 347 | 348 |
|
| 348 | 349 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyRedi.java | ||
|---|---|---|
| 22 | 22 |
import org.distorted.objectlib.helpers.ObjectSignature; |
| 23 | 23 |
import org.distorted.objectlib.helpers.ObjectVertexEffects; |
| 24 | 24 |
import org.distorted.objectlib.main.InitData; |
| 25 |
import org.distorted.objectlib.main.ObjectSignatures; |
|
| 25 | 26 |
import org.distorted.objectlib.touchcontrol.TouchControlHexahedron; |
| 26 | 27 |
import org.distorted.objectlib.main.ObjectType; |
| 27 | 28 |
import org.distorted.objectlib.helpers.ObjectShape; |
| ... | ... | |
| 392 | 393 |
|
| 393 | 394 |
public ObjectSignature getSignature() |
| 394 | 395 |
{
|
| 395 |
return new ObjectSignature(ObjectType.REDI_3);
|
|
| 396 |
return new ObjectSignature(ObjectSignatures.REDI_3);
|
|
| 396 | 397 |
} |
| 397 | 398 |
|
| 398 | 399 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyRex.java | ||
|---|---|---|
| 22 | 22 |
import org.distorted.objectlib.helpers.ObjectSignature; |
| 23 | 23 |
import org.distorted.objectlib.helpers.ObjectVertexEffects; |
| 24 | 24 |
import org.distorted.objectlib.main.InitData; |
| 25 |
import org.distorted.objectlib.main.ObjectSignatures; |
|
| 25 | 26 |
import org.distorted.objectlib.touchcontrol.TouchControlHexahedron; |
| 26 | 27 |
import org.distorted.objectlib.main.ObjectType; |
| 27 | 28 |
import org.distorted.objectlib.helpers.ObjectShape; |
| ... | ... | |
| 401 | 402 |
|
| 402 | 403 |
public ObjectSignature getSignature() |
| 403 | 404 |
{
|
| 404 |
return new ObjectSignature(ObjectType.REX_3);
|
|
| 405 |
return new ObjectSignature(ObjectSignatures.REX_3);
|
|
| 405 | 406 |
} |
| 406 | 407 |
|
| 407 | 408 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistySkewb.java | ||
|---|---|---|
| 21 | 21 |
import org.distorted.objectlib.helpers.ObjectFaceShape; |
| 22 | 22 |
import org.distorted.objectlib.helpers.ObjectSignature; |
| 23 | 23 |
import org.distorted.objectlib.helpers.ObjectVertexEffects; |
| 24 |
import org.distorted.objectlib.main.ObjectSignatures; |
|
| 24 | 25 |
import org.distorted.objectlib.scrambling.ScrambleEdgeGenerator; |
| 25 | 26 |
import org.distorted.objectlib.main.InitData; |
| 26 | 27 |
import org.distorted.objectlib.touchcontrol.TouchControlHexahedron; |
| ... | ... | |
| 528 | 529 |
{
|
| 529 | 530 |
switch(getNumLayers()[0]) |
| 530 | 531 |
{
|
| 531 |
case 2: return new ObjectSignature(ObjectType.SKEW_2);
|
|
| 532 |
case 3: return new ObjectSignature(ObjectType.SKEW_3);
|
|
| 532 |
case 2: return new ObjectSignature(ObjectSignatures.SKEW_2);
|
|
| 533 |
case 3: return new ObjectSignature(ObjectSignatures.SKEW_3);
|
|
| 533 | 534 |
} |
| 534 | 535 |
|
| 535 | 536 |
return null; |
| src/main/java/org/distorted/objectlib/objects/TwistySquare1.java | ||
|---|---|---|
| 19 | 19 |
import org.distorted.objectlib.helpers.ObjectSignature; |
| 20 | 20 |
import org.distorted.objectlib.helpers.ObjectVertexEffects; |
| 21 | 21 |
import org.distorted.objectlib.main.InitData; |
| 22 |
import org.distorted.objectlib.main.ObjectSignatures; |
|
| 22 | 23 |
import org.distorted.objectlib.main.ObjectType; |
| 23 | 24 |
import org.distorted.objectlib.helpers.ObjectShape; |
| 24 | 25 |
|
| ... | ... | |
| 297 | 298 |
|
| 298 | 299 |
public ObjectSignature getSignature() |
| 299 | 300 |
{
|
| 300 |
return new ObjectSignature(ObjectType.SQU1_3);
|
|
| 301 |
return new ObjectSignature(ObjectSignatures.SQU1_3);
|
|
| 301 | 302 |
} |
| 302 | 303 |
|
| 303 | 304 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistySquare2.java | ||
|---|---|---|
| 19 | 19 |
import org.distorted.objectlib.helpers.ObjectSignature; |
| 20 | 20 |
import org.distorted.objectlib.helpers.ObjectVertexEffects; |
| 21 | 21 |
import org.distorted.objectlib.main.InitData; |
| 22 |
import org.distorted.objectlib.main.ObjectSignatures; |
|
| 22 | 23 |
import org.distorted.objectlib.main.ObjectType; |
| 23 | 24 |
import org.distorted.objectlib.helpers.ObjectShape; |
| 24 | 25 |
|
| ... | ... | |
| 328 | 329 |
|
| 329 | 330 |
public ObjectSignature getSignature() |
| 330 | 331 |
{
|
| 331 |
return new ObjectSignature(ObjectType.SQU2_3);
|
|
| 332 |
return new ObjectSignature(ObjectSignatures.SQU2_3);
|
|
| 332 | 333 |
} |
| 333 | 334 |
|
| 334 | 335 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyStarminx.java | ||
|---|---|---|
| 18 | 18 |
import org.distorted.objectlib.helpers.ObjectSignature; |
| 19 | 19 |
import org.distorted.objectlib.helpers.ObjectVertexEffects; |
| 20 | 20 |
import org.distorted.objectlib.main.InitData; |
| 21 |
import org.distorted.objectlib.main.ObjectSignatures; |
|
| 21 | 22 |
import org.distorted.objectlib.main.ObjectType; |
| 22 | 23 |
|
| 23 | 24 |
import java.io.InputStream; |
| ... | ... | |
| 400 | 401 |
|
| 401 | 402 |
public ObjectSignature getSignature() |
| 402 | 403 |
{
|
| 403 |
return new ObjectSignature(ObjectType.STAR_3);
|
|
| 404 |
return new ObjectSignature(ObjectSignatures.STAR_3);
|
|
| 404 | 405 |
} |
| 405 | 406 |
|
| 406 | 407 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyTrajber.java | ||
|---|---|---|
| 16 | 16 |
import org.distorted.objectlib.helpers.ObjectShape; |
| 17 | 17 |
import org.distorted.objectlib.helpers.ObjectSignature; |
| 18 | 18 |
import org.distorted.objectlib.helpers.ObjectVertexEffects; |
| 19 |
import org.distorted.objectlib.main.ObjectSignatures; |
|
| 19 | 20 |
import org.distorted.objectlib.scrambling.ScrambleEdgeGenerator; |
| 20 | 21 |
import org.distorted.objectlib.main.InitData; |
| 21 | 22 |
import org.distorted.objectlib.main.ObjectType; |
| ... | ... | |
| 630 | 631 |
|
| 631 | 632 |
switch(numLayers[0]) |
| 632 | 633 |
{
|
| 633 |
case 3: return new ObjectSignature(ObjectType.TRAJ_3);
|
|
| 634 |
case 4: return new ObjectSignature(ObjectType.TRAJ_4);
|
|
| 634 |
case 3: return new ObjectSignature(ObjectSignatures.TRAJ_3);
|
|
| 635 |
case 4: return new ObjectSignature(ObjectSignatures.TRAJ_4);
|
|
| 635 | 636 |
} |
| 636 | 637 |
|
| 637 | 638 |
return null; |
| src/main/java/org/distorted/objectlib/objects/TwistyUltimate.java | ||
|---|---|---|
| 21 | 21 |
import org.distorted.objectlib.helpers.ObjectFaceShape; |
| 22 | 22 |
import org.distorted.objectlib.helpers.ObjectSignature; |
| 23 | 23 |
import org.distorted.objectlib.helpers.ObjectVertexEffects; |
| 24 |
import org.distorted.objectlib.main.ObjectSignatures; |
|
| 24 | 25 |
import org.distorted.objectlib.scrambling.ScrambleEdgeGenerator; |
| 25 | 26 |
import org.distorted.objectlib.main.InitData; |
| 26 | 27 |
import org.distorted.objectlib.touchcontrol.TouchControlDodecahedron; |
| ... | ... | |
| 398 | 399 |
|
| 399 | 400 |
public ObjectSignature getSignature() |
| 400 | 401 |
{
|
| 401 |
return new ObjectSignature(ObjectType.ULTI_2);
|
|
| 402 |
return new ObjectSignature(ObjectSignatures.ULTI_2);
|
|
| 402 | 403 |
} |
| 403 | 404 |
|
| 404 | 405 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyVoid.java | ||
|---|---|---|
| 17 | 17 |
import org.distorted.objectlib.helpers.ObjectSignature; |
| 18 | 18 |
import org.distorted.objectlib.helpers.ObjectVertexEffects; |
| 19 | 19 |
import org.distorted.objectlib.main.InitData; |
| 20 |
import org.distorted.objectlib.main.ObjectSignatures; |
|
| 20 | 21 |
import org.distorted.objectlib.main.ObjectType; |
| 21 | 22 |
import org.distorted.objectlib.shape.ShapeHexahedron; |
| 22 | 23 |
import org.distorted.objectlib.touchcontrol.TouchControlHexahedron; |
| ... | ... | |
| 474 | 475 |
|
| 475 | 476 |
public ObjectSignature getSignature() |
| 476 | 477 |
{
|
| 477 |
return new ObjectSignature(ObjectType.VOID_3);
|
|
| 478 |
return new ObjectSignature(ObjectSignatures.VOID_3);
|
|
| 478 | 479 |
} |
| 479 | 480 |
|
| 480 | 481 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyWindmill.java | ||
|---|---|---|
| 19 | 19 |
import org.distorted.objectlib.helpers.ObjectShape; |
| 20 | 20 |
import org.distorted.objectlib.helpers.ObjectSignature; |
| 21 | 21 |
import org.distorted.objectlib.helpers.ObjectVertexEffects; |
| 22 |
import org.distorted.objectlib.main.ObjectSignatures; |
|
| 22 | 23 |
import org.distorted.objectlib.scrambling.ScrambleEdgeGenerator; |
| 23 | 24 |
import org.distorted.objectlib.main.InitData; |
| 24 | 25 |
import org.distorted.objectlib.main.ObjectType; |
| ... | ... | |
| 421 | 422 |
|
| 422 | 423 |
public ObjectSignature getSignature() |
| 423 | 424 |
{
|
| 424 |
return new ObjectSignature(ObjectType.WIND_3);
|
|
| 425 |
return new ObjectSignature(ObjectSignatures.WIND_3);
|
|
| 425 | 426 |
} |
| 426 | 427 |
|
| 427 | 428 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
Also available in: Unified diff
- add the Pyraminx Duo solver to the list
- make the signature of an object independent of its location in the ObjectType enum