Revision c8bc83d9
Added by Leszek Koltunski over 2 years ago
src/main/java/org/distorted/objectlib/main/TwistyObject.java | ||
---|---|---|
354 | 354 |
} |
355 | 355 |
} |
356 | 356 |
|
357 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
358 |
|
|
359 |
private int getMultQuat(int index1, int index2) |
|
360 |
{ |
|
361 |
if( mQuatMult==null ) |
|
362 |
{ |
|
363 |
mQuatMult = new int[NUM_QUATS][NUM_QUATS]; |
|
364 |
|
|
365 |
for(int i=0; i<NUM_QUATS; i++) |
|
366 |
for(int j=0; j<NUM_QUATS; j++) mQuatMult[i][j] = -1; |
|
367 |
} |
|
368 |
|
|
369 |
if( mQuatMult[index1][index2]==-1 ) |
|
370 |
{ |
|
371 |
mQuatMult[index1][index2] = mulQuat(index1,index2); |
|
372 |
} |
|
373 |
|
|
374 |
return mQuatMult[index1][index2]; |
|
375 |
} |
|
376 |
|
|
357 | 377 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
358 | 378 |
// This is used to build internal data structures for the generic 'isSolved()' |
359 | 379 |
// |
... | ... | |
362 | 382 |
// Color index, i.e. the index into the 'FACE_COLORS' table. |
363 | 383 |
// else (edge or corner cubit, more than one non-black face): return -2. |
364 | 384 |
|
365 |
public int retCubitSolvedStatus(int cubit, int numLayers)
|
|
385 |
protected int retCubitSolvedStatus(int cubit, int numLayers)
|
|
366 | 386 |
{ |
367 | 387 |
int numNonBlack=0, nonBlackIndex=-1, color; |
368 | 388 |
|
... | ... | |
385 | 405 |
|
386 | 406 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
387 | 407 |
|
388 |
public boolean shouldResetTextureMaps()
|
|
408 |
protected boolean shouldResetTextureMaps()
|
|
389 | 409 |
{ |
390 | 410 |
return false; |
391 | 411 |
} |
392 | 412 |
|
393 | 413 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
394 | 414 |
|
395 |
public int[] buildSolvedQuats(Static3D faceAx, Static4D[] quats)
|
|
415 |
protected int[] buildSolvedQuats(Static3D faceAx, Static4D[] quats)
|
|
396 | 416 |
{ |
397 | 417 |
final float MAXD = 0.0001f; |
398 | 418 |
float x = faceAx.get0(); |
... | ... | |
437 | 457 |
|
438 | 458 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
439 | 459 |
|
440 |
private int getMultQuat(int index1, int index2) |
|
441 |
{ |
|
442 |
if( mQuatMult==null ) |
|
443 |
{ |
|
444 |
mQuatMult = new int[NUM_QUATS][NUM_QUATS]; |
|
445 |
|
|
446 |
for(int i=0; i<NUM_QUATS; i++) |
|
447 |
for(int j=0; j<NUM_QUATS; j++) mQuatMult[i][j] = -1; |
|
448 |
} |
|
449 |
|
|
450 |
if( mQuatMult[index1][index2]==-1 ) |
|
451 |
{ |
|
452 |
mQuatMult[index1][index2] = mulQuat(index1,index2); |
|
453 |
} |
|
454 |
|
|
455 |
return mQuatMult[index1][index2]; |
|
456 |
} |
|
457 |
|
|
458 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
459 |
|
|
460 |
public boolean isSolved() |
|
461 |
{ |
|
462 |
if( mSolvedFunctionIndex==0 ) return isSolved0(); |
|
463 |
if( mSolvedFunctionIndex==1 ) return isSolved1(); |
|
464 |
if( mSolvedFunctionIndex==2 ) return isSolved2(); |
|
465 |
if( mSolvedFunctionIndex==3 ) return isSolved3(); |
|
466 |
|
|
467 |
return false; |
|
468 |
} |
|
469 |
|
|
470 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
471 |
|
|
472 |
public boolean isSolved0() |
|
460 |
private boolean isSolved0() |
|
473 | 461 |
{ |
474 | 462 |
int len, q1,q = CUBITS[0].mQuatIndex; |
475 | 463 |
int[] solved; |
... | ... | |
536 | 524 |
// (0,1,4), (2,3,6), (5,9,10), (7,8,11) |
537 | 525 |
// are all the same color. |
538 | 526 |
|
539 |
public boolean isSolved1()
|
|
527 |
private boolean isSolved1()
|
|
540 | 528 |
{ |
541 | 529 |
if( mScramble==null ) |
542 | 530 |
{ |
... | ... | |
587 | 575 |
// Y cubits: 1, 3, 9, 11 |
588 | 576 |
// Z cubits: 4, 5, 6, 7 |
589 | 577 |
|
590 |
public boolean isSolved2()
|
|
578 |
private boolean isSolved2()
|
|
591 | 579 |
{ |
592 | 580 |
int qX = CUBITS[0].mQuatIndex; |
593 | 581 |
int qY = CUBITS[1].mQuatIndex; |
... | ... | |
611 | 599 |
// and all the 12 left and right edges and corners also with the same quat multiplied by |
612 | 600 |
// QUATS[12] - i.e. also upside down. |
613 | 601 |
|
614 |
public boolean isSolved3()
|
|
602 |
private boolean isSolved3()
|
|
615 | 603 |
{ |
616 | 604 |
int index = CUBITS[0].mQuatIndex; |
617 | 605 |
|
... | ... | |
641 | 629 |
return true; |
642 | 630 |
} |
643 | 631 |
|
644 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
645 |
|
|
646 |
public void setObjectRatio(float sizeChange) |
|
647 |
{ |
|
648 |
mObjectScreenRatio *= (1.0f+sizeChange)/2; |
|
649 |
|
|
650 |
if( mObjectScreenRatio>MAX_SIZE_CHANGE) mObjectScreenRatio = MAX_SIZE_CHANGE; |
|
651 |
if( mObjectScreenRatio<MIN_SIZE_CHANGE) mObjectScreenRatio = MIN_SIZE_CHANGE; |
|
652 |
|
|
653 |
float scale = mObjectScreenRatio*mInitScreenRatio*mNodeSize/mRealSize; |
|
654 |
mObjectScale.set(scale,scale,scale); |
|
655 |
} |
|
656 |
|
|
657 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
658 |
|
|
659 |
public float getObjectRatio() |
|
660 |
{ |
|
661 |
return mObjectScreenRatio*mInitScreenRatio; |
|
662 |
} |
|
663 |
|
|
664 | 632 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
665 | 633 |
|
666 | 634 |
int computeRow(float[] pos, int axisIndex) |
... | ... | |
870 | 838 |
return -1; |
871 | 839 |
} |
872 | 840 |
|
873 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
874 |
|
|
875 |
public int getCubitFaceColorIndex(int cubit, int face) |
|
876 |
{ |
|
877 |
Static4D texMap = mMesh.getTextureMap(NUM_FACE_COLORS*cubit + face); |
|
878 |
|
|
879 |
int x = (int)(texMap.get0()/texMap.get2()); |
|
880 |
int y = (int)(texMap.get1()/texMap.get3()); |
|
881 |
|
|
882 |
return (mNumTexRows-1-y)*NUM_STICKERS_IN_ROW + x; |
|
883 |
} |
|
884 |
|
|
885 | 841 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
886 | 842 |
// the getFaceColors + final black in a grid (so that we do not exceed the maximum texture size) |
887 | 843 |
|
... | ... | |
920 | 876 |
} |
921 | 877 |
} |
922 | 878 |
|
879 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
880 |
|
|
881 |
private float getAngle() |
|
882 |
{ |
|
883 |
int pointNum = mRotationAngle.getNumPoints(); |
|
884 |
|
|
885 |
if( pointNum>=1 ) |
|
886 |
{ |
|
887 |
return mRotationAngle.getPoint(pointNum-1).get0(); |
|
888 |
} |
|
889 |
else |
|
890 |
{ |
|
891 |
FirebaseCrashlytics crashlytics = FirebaseCrashlytics.getInstance(); |
|
892 |
crashlytics.log("points in RotationAngle: "+pointNum); |
|
893 |
return 0; |
|
894 |
} |
|
895 |
} |
|
896 |
|
|
897 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
898 |
|
|
899 |
private void recordQuatsState(String message) |
|
900 |
{ |
|
901 |
StringBuilder quats = new StringBuilder(); |
|
902 |
|
|
903 |
for(int j=0; j<NUM_CUBITS; j++) |
|
904 |
{ |
|
905 |
quats.append(mQuatDebug[j]); |
|
906 |
quats.append(" "); |
|
907 |
} |
|
908 |
|
|
909 |
String name = intGetObjectType(mNumLayers).name(); |
|
910 |
|
|
911 |
if( BuildConfig.DEBUG ) |
|
912 |
{ |
|
913 |
android.util.Log.e("quats" , quats.toString()); |
|
914 |
android.util.Log.e("object", name); |
|
915 |
} |
|
916 |
else |
|
917 |
{ |
|
918 |
Exception ex = new Exception(message); |
|
919 |
FirebaseCrashlytics crashlytics = FirebaseCrashlytics.getInstance(); |
|
920 |
crashlytics.setCustomKey("quats" , quats.toString()); |
|
921 |
crashlytics.setCustomKey("object", name); |
|
922 |
crashlytics.recordException(ex); |
|
923 |
} |
|
924 |
} |
|
925 |
|
|
926 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
927 |
// PUBLIC API |
|
928 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
929 |
|
|
930 |
public boolean isSolved() |
|
931 |
{ |
|
932 |
if( mSolvedFunctionIndex==0 ) return isSolved0(); |
|
933 |
if( mSolvedFunctionIndex==1 ) return isSolved1(); |
|
934 |
if( mSolvedFunctionIndex==2 ) return isSolved2(); |
|
935 |
if( mSolvedFunctionIndex==3 ) return isSolved3(); |
|
936 |
|
|
937 |
return false; |
|
938 |
} |
|
939 |
|
|
940 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
941 |
|
|
942 |
public void setObjectRatio(float sizeChange) |
|
943 |
{ |
|
944 |
mObjectScreenRatio *= (1.0f+sizeChange)/2; |
|
945 |
|
|
946 |
if( mObjectScreenRatio>MAX_SIZE_CHANGE) mObjectScreenRatio = MAX_SIZE_CHANGE; |
|
947 |
if( mObjectScreenRatio<MIN_SIZE_CHANGE) mObjectScreenRatio = MIN_SIZE_CHANGE; |
|
948 |
|
|
949 |
float scale = mObjectScreenRatio*mInitScreenRatio*mNodeSize/mRealSize; |
|
950 |
mObjectScale.set(scale,scale,scale); |
|
951 |
} |
|
952 |
|
|
953 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
954 |
|
|
955 |
public float getObjectRatio() |
|
956 |
{ |
|
957 |
return mObjectScreenRatio*mInitScreenRatio; |
|
958 |
} |
|
959 |
|
|
960 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
961 |
|
|
962 |
public int getCubitFaceColorIndex(int cubit, int face) |
|
963 |
{ |
|
964 |
Static4D texMap = mMesh.getTextureMap(NUM_FACE_COLORS*cubit + face); |
|
965 |
|
|
966 |
int x = (int)(texMap.get0()/texMap.get2()); |
|
967 |
int y = (int)(texMap.get1()/texMap.get3()); |
|
968 |
|
|
969 |
return (mNumTexRows-1-y)*NUM_STICKERS_IN_ROW + x; |
|
970 |
} |
|
971 |
|
|
923 | 972 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
924 | 973 |
|
925 | 974 |
public int getNumLayers() |
... | ... | |
987 | 1036 |
} |
988 | 1037 |
} |
989 | 1038 |
|
990 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
991 |
|
|
992 |
public void recordQuatsState(String message) |
|
993 |
{ |
|
994 |
StringBuilder quats = new StringBuilder(); |
|
995 |
|
|
996 |
for(int j=0; j<NUM_CUBITS; j++) |
|
997 |
{ |
|
998 |
quats.append(mQuatDebug[j]); |
|
999 |
quats.append(" "); |
|
1000 |
} |
|
1001 |
|
|
1002 |
String name = intGetObjectList(mNumLayers).name(); |
|
1003 |
|
|
1004 |
if( BuildConfig.DEBUG ) |
|
1005 |
{ |
|
1006 |
android.util.Log.e("quats" , quats.toString()); |
|
1007 |
android.util.Log.e("object", name); |
|
1008 |
} |
|
1009 |
else |
|
1010 |
{ |
|
1011 |
Exception ex = new Exception(message); |
|
1012 |
FirebaseCrashlytics crashlytics = FirebaseCrashlytics.getInstance(); |
|
1013 |
crashlytics.setCustomKey("quats" , quats.toString()); |
|
1014 |
crashlytics.setCustomKey("object", name); |
|
1015 |
crashlytics.recordException(ex); |
|
1016 |
} |
|
1017 |
} |
|
1018 |
|
|
1019 | 1039 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
1020 | 1040 |
|
1021 | 1041 |
public void releaseResources() |
... | ... | |
1165 | 1185 |
return 0; |
1166 | 1186 |
} |
1167 | 1187 |
|
1168 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
1169 |
|
|
1170 |
private float getAngle() |
|
1171 |
{ |
|
1172 |
int pointNum = mRotationAngle.getNumPoints(); |
|
1173 |
|
|
1174 |
if( pointNum>=1 ) |
|
1175 |
{ |
|
1176 |
return mRotationAngle.getPoint(pointNum-1).get0(); |
|
1177 |
} |
|
1178 |
else |
|
1179 |
{ |
|
1180 |
FirebaseCrashlytics crashlytics = FirebaseCrashlytics.getInstance(); |
|
1181 |
crashlytics.log("points in RotationAngle: "+pointNum); |
|
1182 |
return 0; |
|
1183 |
} |
|
1184 |
} |
|
1185 |
|
|
1186 | 1188 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
1187 | 1189 |
|
1188 | 1190 |
public synchronized void removeRotationNow() |
... | ... | |
1272 | 1274 |
|
1273 | 1275 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
1274 | 1276 |
|
1275 |
public ObjectType getObjectList()
|
|
1277 |
public ObjectType getObjectType()
|
|
1276 | 1278 |
{ |
1277 |
return intGetObjectList(mNumLayers);
|
|
1279 |
return intGetObjectType(mNumLayers);
|
|
1278 | 1280 |
} |
1279 | 1281 |
|
1280 | 1282 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
... | ... | |
1306 | 1308 |
protected abstract ObjectSticker retSticker(int face); |
1307 | 1309 |
protected abstract int getFaceColor(int cubit, int cubitface, int numLayers); |
1308 | 1310 |
protected abstract int getResource(int mNumLayers); |
1309 |
protected abstract ObjectType intGetObjectList(int numLayers);
|
|
1311 |
protected abstract ObjectType intGetObjectType(int numLayers);
|
|
1310 | 1312 |
|
1311 | 1313 |
public abstract Movement getMovement(); |
1312 | 1314 |
public abstract Static3D[] getRotationAxis(); |
src/main/java/org/distorted/objectlib/objects/TwistyBandaged2Bar.java | ||
---|---|---|
115 | 115 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
116 | 116 |
// PUBLIC API |
117 | 117 |
|
118 |
public ObjectType intGetObjectList(int numLayers)
|
|
118 |
public ObjectType intGetObjectType(int numLayers)
|
|
119 | 119 |
{ |
120 | 120 |
return ObjectType.BAN2_3; |
121 | 121 |
} |
src/main/java/org/distorted/objectlib/objects/TwistyBandaged3Plate.java | ||
---|---|---|
122 | 122 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
123 | 123 |
// PUBLIC API |
124 | 124 |
|
125 |
public ObjectType intGetObjectList(int numLayers)
|
|
125 |
public ObjectType intGetObjectType(int numLayers)
|
|
126 | 126 |
{ |
127 | 127 |
return ObjectType.BAN3_3; |
128 | 128 |
} |
src/main/java/org/distorted/objectlib/objects/TwistyBandagedEvil.java | ||
---|---|---|
246 | 246 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
247 | 247 |
// PUBLIC API |
248 | 248 |
|
249 |
public ObjectType intGetObjectList(int numLayers)
|
|
249 |
public ObjectType intGetObjectType(int numLayers)
|
|
250 | 250 |
{ |
251 | 251 |
return ObjectType.BAN4_3; |
252 | 252 |
} |
src/main/java/org/distorted/objectlib/objects/TwistyBandagedFused.java | ||
---|---|---|
115 | 115 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
116 | 116 |
// PUBLIC APi |
117 | 117 |
|
118 |
public ObjectType intGetObjectList(int numLayers)
|
|
118 |
public ObjectType intGetObjectType(int numLayers)
|
|
119 | 119 |
{ |
120 | 120 |
return ObjectType.BAN1_3; |
121 | 121 |
} |
src/main/java/org/distorted/objectlib/objects/TwistyCube.java | ||
---|---|---|
396 | 396 |
|
397 | 397 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
398 | 398 |
|
399 |
public ObjectType intGetObjectList(int numLayers)
|
|
399 |
public ObjectType intGetObjectType(int numLayers)
|
|
400 | 400 |
{ |
401 | 401 |
switch(numLayers) |
402 | 402 |
{ |
src/main/java/org/distorted/objectlib/objects/TwistyDiamond.java | ||
---|---|---|
538 | 538 |
|
539 | 539 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
540 | 540 |
|
541 |
public ObjectType intGetObjectList(int numLayers)
|
|
541 |
public ObjectType intGetObjectType(int numLayers)
|
|
542 | 542 |
{ |
543 | 543 |
switch(numLayers) |
544 | 544 |
{ |
src/main/java/org/distorted/objectlib/objects/TwistyDino4.java | ||
---|---|---|
91 | 91 |
|
92 | 92 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
93 | 93 |
|
94 |
public boolean shouldResetTextureMaps()
|
|
94 |
protected boolean shouldResetTextureMaps()
|
|
95 | 95 |
{ |
96 | 96 |
return true; |
97 | 97 |
} |
98 | 98 |
|
99 | 99 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
100 | 100 |
|
101 |
public ObjectType intGetObjectList(int numLayers)
|
|
101 |
public ObjectType intGetObjectType(int numLayers)
|
|
102 | 102 |
{ |
103 | 103 |
return ObjectType.DIN4_3; |
104 | 104 |
} |
src/main/java/org/distorted/objectlib/objects/TwistyDino6.java | ||
---|---|---|
100 | 100 |
|
101 | 101 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
102 | 102 |
|
103 |
public ObjectType intGetObjectList(int numLayers)
|
|
103 |
public ObjectType intGetObjectType(int numLayers)
|
|
104 | 104 |
{ |
105 | 105 |
return ObjectType.DINO_3; |
106 | 106 |
} |
src/main/java/org/distorted/objectlib/objects/TwistyHelicopter.java | ||
---|---|---|
458 | 458 |
|
459 | 459 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
460 | 460 |
|
461 |
public ObjectType intGetObjectList(int numLayers)
|
|
461 |
public ObjectType intGetObjectType(int numLayers)
|
|
462 | 462 |
{ |
463 | 463 |
return ObjectType.HELI_3; |
464 | 464 |
} |
src/main/java/org/distorted/objectlib/objects/TwistyIvy.java | ||
---|---|---|
485 | 485 |
|
486 | 486 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
487 | 487 |
|
488 |
public ObjectType intGetObjectList(int numLayers)
|
|
488 |
public ObjectType intGetObjectType(int numLayers)
|
|
489 | 489 |
{ |
490 | 490 |
return ObjectType.IVY_2; |
491 | 491 |
} |
src/main/java/org/distorted/objectlib/objects/TwistyJing.java | ||
---|---|---|
444 | 444 |
|
445 | 445 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
446 | 446 |
|
447 |
public ObjectType intGetObjectList(int numLayers)
|
|
447 |
public ObjectType intGetObjectType(int numLayers)
|
|
448 | 448 |
{ |
449 | 449 |
return ObjectType.JING_2; |
450 | 450 |
} |
src/main/java/org/distorted/objectlib/objects/TwistyKilominx.java | ||
---|---|---|
696 | 696 |
|
697 | 697 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
698 | 698 |
|
699 |
public ObjectType intGetObjectList(int numLayers)
|
|
699 |
public ObjectType intGetObjectType(int numLayers)
|
|
700 | 700 |
{ |
701 | 701 |
switch(numLayers) |
702 | 702 |
{ |
src/main/java/org/distorted/objectlib/objects/TwistyMegaminx.java | ||
---|---|---|
603 | 603 |
|
604 | 604 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
605 | 605 |
|
606 |
public ObjectType intGetObjectList(int numLayers)
|
|
606 |
public ObjectType intGetObjectType(int numLayers)
|
|
607 | 607 |
{ |
608 | 608 |
switch(numLayers) |
609 | 609 |
{ |
src/main/java/org/distorted/objectlib/objects/TwistyMirror.java | ||
---|---|---|
631 | 631 |
|
632 | 632 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
633 | 633 |
|
634 |
public ObjectType intGetObjectList(int numLayers)
|
|
634 |
public ObjectType intGetObjectType(int numLayers)
|
|
635 | 635 |
{ |
636 | 636 |
switch(numLayers) |
637 | 637 |
{ |
src/main/java/org/distorted/objectlib/objects/TwistyPyraminx.java | ||
---|---|---|
422 | 422 |
|
423 | 423 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
424 | 424 |
|
425 |
public ObjectType intGetObjectList(int numLayers)
|
|
425 |
public ObjectType intGetObjectType(int numLayers)
|
|
426 | 426 |
{ |
427 | 427 |
switch(numLayers) |
428 | 428 |
{ |
src/main/java/org/distorted/objectlib/objects/TwistyRedi.java | ||
---|---|---|
455 | 455 |
|
456 | 456 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
457 | 457 |
|
458 |
public ObjectType intGetObjectList(int numLayers)
|
|
458 |
public ObjectType intGetObjectType(int numLayers)
|
|
459 | 459 |
{ |
460 | 460 |
return ObjectType.REDI_3; |
461 | 461 |
} |
src/main/java/org/distorted/objectlib/objects/TwistyRex.java | ||
---|---|---|
488 | 488 |
|
489 | 489 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
490 | 490 |
|
491 |
public ObjectType intGetObjectList(int numLayers)
|
|
491 |
public ObjectType intGetObjectType(int numLayers)
|
|
492 | 492 |
{ |
493 | 493 |
return ObjectType.REX_3; |
494 | 494 |
} |
src/main/java/org/distorted/objectlib/objects/TwistySkewb.java | ||
---|---|---|
597 | 597 |
|
598 | 598 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
599 | 599 |
|
600 |
public ObjectType intGetObjectList(int numLayers)
|
|
600 |
public ObjectType intGetObjectType(int numLayers)
|
|
601 | 601 |
{ |
602 | 602 |
switch(numLayers) |
603 | 603 |
{ |
src/main/java/org/distorted/objectlib/objects/TwistySquare1.java | ||
---|---|---|
350 | 350 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
351 | 351 |
// PUBLIC API |
352 | 352 |
|
353 |
public ObjectType intGetObjectList(int numLayers)
|
|
353 |
public ObjectType intGetObjectType(int numLayers)
|
|
354 | 354 |
{ |
355 | 355 |
return ObjectType.SQU1_3; |
356 | 356 |
} |
src/main/java/org/distorted/objectlib/objects/TwistySquare2.java | ||
---|---|---|
383 | 383 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
384 | 384 |
// PUBLIC API |
385 | 385 |
|
386 |
public ObjectType intGetObjectList(int numLayers)
|
|
386 |
public ObjectType intGetObjectType(int numLayers)
|
|
387 | 387 |
{ |
388 | 388 |
return ObjectType.SQU2_3; |
389 | 389 |
} |
src/main/java/org/distorted/objectlib/objects/TwistyUltimate.java | ||
---|---|---|
443 | 443 |
|
444 | 444 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
445 | 445 |
|
446 |
public ObjectType intGetObjectList(int numLayers)
|
|
446 |
public ObjectType intGetObjectType(int numLayers)
|
|
447 | 447 |
{ |
448 | 448 |
return ObjectType.ULTI_2; |
449 | 449 |
} |
Also available in: Unified diff
Simplify TwistyObject's API.