Revision 5f54927b
Added by Leszek Koltunski over 2 years ago
| src/main/java/org/distorted/objectlib/json/JsonReader.java | ||
|---|---|---|
| 75 | 75 |
private int mScrambleType, mNumScrambles; |
| 76 | 76 |
private int[] mColor; |
| 77 | 77 |
private int mInternalColor; |
| 78 |
private ObjectType mType; |
|
| 79 | 78 |
private boolean mResetMaps; |
| 80 | 79 |
private String mTutorialObject; |
| 81 | 80 |
private String[][] mTutorials; |
| 81 |
private long mSignature; |
|
| 82 | 82 |
|
| 83 | 83 |
private static JsonReader mThis; |
| 84 | 84 |
|
| ... | ... | |
| 110 | 110 |
mResetMaps = object.getBoolean("resetmaps");
|
| 111 | 111 |
mNumFaces = object.getInt("num_faces");
|
| 112 | 112 |
|
| 113 |
int ordinal = ObjectType.getOrdinal(mShortName); |
|
| 114 |
mType = ordinal>=0 ? ObjectType.getObject(ordinal) : null; |
|
| 113 |
try |
|
| 114 |
{
|
|
| 115 |
mSignature = object.getLong("signature");
|
|
| 116 |
} |
|
| 117 |
catch(JSONException ex) |
|
| 118 |
{
|
|
| 119 |
// objects older than Feb 2022 do not have the 'signature' field. They all use the ObjectType.ordinal |
|
| 120 |
// as their signature. |
|
| 121 |
mSignature = ObjectType.getOrdinal(mShortName); |
|
| 122 |
} |
|
| 115 | 123 |
} |
| 116 | 124 |
|
| 117 | 125 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| ... | ... | |
| 874 | 882 |
|
| 875 | 883 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 876 | 884 |
|
| 877 |
public ObjectType intGetObjectType()
|
|
| 885 |
public long getSignature()
|
|
| 878 | 886 |
{
|
| 879 |
return mType;
|
|
| 887 |
return mSignature;
|
|
| 880 | 888 |
} |
| 881 | 889 |
|
| 882 | 890 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/json/JsonWriter.java | ||
|---|---|---|
| 350 | 350 |
|
| 351 | 351 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 352 | 352 |
|
| 353 |
private JSONObject generateMetadata(TwistyObject object) throws JSONException |
|
| 353 |
private JSONObject generateMetadata(TwistyObject object, int ordinal) throws JSONException
|
|
| 354 | 354 |
{
|
| 355 | 355 |
JSONObject metadata = new JSONObject(); |
| 356 | 356 |
|
| 357 |
ObjectType type = object.getObjectType();
|
|
| 357 |
ObjectType type = ObjectType.getObject(ordinal);
|
|
| 358 | 358 |
|
| 359 | 359 |
metadata.put("longname" , object.getObjectName() );
|
| 360 | 360 |
metadata.put("inventor" , object.getInventor());
|
| ... | ... | |
| 362 | 362 |
metadata.put("complexity" , object.getComplexity());
|
| 363 | 363 |
metadata.put("size" , object.getSize() );
|
| 364 | 364 |
metadata.put("scrambles" , type.getNumScramble() );
|
| 365 |
metadata.put("shortname" , type.name() );
|
|
| 365 |
metadata.put("shortname" , object.getShortName() );
|
|
| 366 | 366 |
metadata.put("resetmaps" , object.shouldResetTextureMaps() );
|
| 367 | 367 |
metadata.put("num_faces" , object.getNumFaces() );
|
| 368 |
metadata.put("signature" , object.getSignature() );
|
|
| 368 | 369 |
|
| 369 | 370 |
return metadata; |
| 370 | 371 |
} |
| ... | ... | |
| 549 | 550 |
|
| 550 | 551 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 551 | 552 |
|
| 552 |
public String createObjectString(TwistyObject object) throws JSONException |
|
| 553 |
public String createObjectString(TwistyObject object,int ordinal) throws JSONException
|
|
| 553 | 554 |
{
|
| 554 | 555 |
JSONObject json = new JSONObject(); |
| 555 | 556 |
|
| 556 |
JSONObject metadata = generateMetadata(object); |
|
| 557 |
JSONObject metadata = generateMetadata(object,ordinal);
|
|
| 557 | 558 |
JSONObject mesh = generateMesh(object); |
| 558 | 559 |
JSONArray axis = generateAxis(object); |
| 559 | 560 |
JSONArray quats = generateQuats(object); |
| ... | ... | |
| 585 | 586 |
if( tuts!=null ) |
| 586 | 587 |
{
|
| 587 | 588 |
JSONObject json = new JSONObject(); |
| 588 |
ObjectType type = object.getObjectType(); |
|
| 589 | 589 |
JSONArray tutorials = new JSONArray(); |
| 590 | 590 |
|
| 591 | 591 |
for(String[] tut : tuts) |
| ... | ... | |
| 607 | 607 |
|
| 608 | 608 |
json.put("major" , VERSION_EXTRAS_MAJOR);
|
| 609 | 609 |
json.put("minor" , VERSION_EXTRAS_MINOR);
|
| 610 |
json.put("object" , type.name() );
|
|
| 610 |
json.put("object" , object.getShortName() );
|
|
| 611 | 611 |
json.put("tutorials" , tutorials);
|
| 612 | 612 |
|
| 613 | 613 |
return json.toString(); |
| src/main/java/org/distorted/objectlib/main/TwistyJson.java | ||
|---|---|---|
| 277 | 277 |
|
| 278 | 278 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 279 | 279 |
|
| 280 |
public ObjectType intGetObjectType(int[] numLayers)
|
|
| 280 |
public int getNumScramble()
|
|
| 281 | 281 |
{
|
| 282 |
return mReader.intGetObjectType(); |
|
| 282 |
return mReader.getNumScrambles(); |
|
| 283 |
} |
|
| 284 |
|
|
| 285 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 286 |
|
|
| 287 |
public long getSignature() |
|
| 288 |
{
|
|
| 289 |
return mReader.getSignature(); |
|
| 283 | 290 |
} |
| 284 | 291 |
|
| 285 | 292 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/main/TwistyObject.java | ||
|---|---|---|
| 1484 | 1484 |
return mNode; |
| 1485 | 1485 |
} |
| 1486 | 1486 |
|
| 1487 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 1488 |
|
|
| 1489 |
public ObjectType getObjectType() |
|
| 1490 |
{
|
|
| 1491 |
return intGetObjectType(mNumLayers); |
|
| 1492 |
} |
|
| 1493 |
|
|
| 1494 | 1487 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 1495 | 1488 |
|
| 1496 | 1489 |
public int getNumStickerTypes() |
| ... | ... | |
| 1536 | 1529 |
return mTouchControl; |
| 1537 | 1530 |
} |
| 1538 | 1531 |
|
| 1539 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 1540 |
|
|
| 1541 |
public String getShortName() |
|
| 1542 |
{
|
|
| 1543 |
return getObjectType().name(); |
|
| 1544 |
} |
|
| 1545 |
|
|
| 1546 | 1532 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 1547 | 1533 |
|
| 1548 | 1534 |
protected void setReader(JsonReader reader) |
| ... | ... | |
| 1551 | 1537 |
} |
| 1552 | 1538 |
|
| 1553 | 1539 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 1554 |
|
|
| 1555 |
protected abstract ObjectType intGetObjectType(int[] numLayers); |
|
| 1556 |
|
|
| 1557 | 1540 |
// for JSON only |
| 1558 | 1541 |
public abstract int getTouchControlType(); |
| 1559 | 1542 |
public abstract int getTouchControlSplit(); |
| ... | ... | |
| 1575 | 1558 |
public abstract int getNumFaceColors(); |
| 1576 | 1559 |
public abstract float getScreenRatio(); |
| 1577 | 1560 |
public abstract int getColor(int face); |
| 1561 |
public abstract String getShortName(); |
|
| 1562 |
public abstract long getSignature(); |
|
| 1578 | 1563 |
|
| 1579 | 1564 |
// not only for JSON |
| 1580 | 1565 |
public abstract Static3D[] getRotationAxis(); |
| src/main/java/org/distorted/objectlib/objects/TwistyAxis.java | ||
|---|---|---|
| 471 | 471 |
|
| 472 | 472 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 473 | 473 |
|
| 474 |
public int[] getBasicAngles()
|
|
| 474 |
public String getShortName()
|
|
| 475 | 475 |
{
|
| 476 |
if( mBasicAngle ==null ) mBasicAngle = new int[] { 4,4,4 };
|
|
| 477 |
return mBasicAngle; |
|
| 476 |
return ObjectType.AXIS_3.name(); |
|
| 478 | 477 |
} |
| 479 | 478 |
|
| 480 | 479 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 481 | 480 |
|
| 482 |
public ObjectType intGetObjectType(int[] numLayers)
|
|
| 481 |
public long getSignature()
|
|
| 483 | 482 |
{
|
| 484 |
return ObjectType.AXIS_3; |
|
| 483 |
return ObjectType.AXIS_3.ordinal(); |
|
| 484 |
} |
|
| 485 |
|
|
| 486 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 487 |
|
|
| 488 |
public int[] getBasicAngles() |
|
| 489 |
{
|
|
| 490 |
if( mBasicAngle ==null ) mBasicAngle = new int[] { 4,4,4 };
|
|
| 491 |
return mBasicAngle; |
|
| 485 | 492 |
} |
| 486 | 493 |
|
| 487 | 494 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyBandaged2Bar.java | ||
|---|---|---|
| 102 | 102 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 103 | 103 |
// PUBLIC API |
| 104 | 104 |
|
| 105 |
public ObjectType intGetObjectType(int[] numLayers)
|
|
| 105 |
public String getShortName()
|
|
| 106 | 106 |
{
|
| 107 |
return ObjectType.BAN2_3; |
|
| 107 |
return ObjectType.BAN2_3.name(); |
|
| 108 |
} |
|
| 109 |
|
|
| 110 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 111 |
|
|
| 112 |
public long getSignature() |
|
| 113 |
{
|
|
| 114 |
return ObjectType.BAN2_3.ordinal(); |
|
| 108 | 115 |
} |
| 109 | 116 |
|
| 110 | 117 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyBandaged3Plate.java | ||
|---|---|---|
| 107 | 107 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 108 | 108 |
// PUBLIC API |
| 109 | 109 |
|
| 110 |
public ObjectType intGetObjectType(int[] numLayers)
|
|
| 110 |
public String getShortName()
|
|
| 111 | 111 |
{
|
| 112 |
return ObjectType.BAN3_3; |
|
| 112 |
return ObjectType.BAN3_3.name(); |
|
| 113 |
} |
|
| 114 |
|
|
| 115 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 116 |
|
|
| 117 |
public long getSignature() |
|
| 118 |
{
|
|
| 119 |
return ObjectType.BAN3_3.ordinal(); |
|
| 113 | 120 |
} |
| 114 | 121 |
|
| 115 | 122 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyBandagedBiCube.java | ||
|---|---|---|
| 231 | 231 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 232 | 232 |
// PUBLIC API |
| 233 | 233 |
|
| 234 |
public ObjectType intGetObjectType(int[] numLayers)
|
|
| 234 |
public String getShortName()
|
|
| 235 | 235 |
{
|
| 236 |
return ObjectType.BAN4_3; |
|
| 236 |
return ObjectType.BAN4_3.name(); |
|
| 237 |
} |
|
| 238 |
|
|
| 239 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 240 |
|
|
| 241 |
public long getSignature() |
|
| 242 |
{
|
|
| 243 |
return ObjectType.BAN4_3.ordinal(); |
|
| 237 | 244 |
} |
| 238 | 245 |
|
| 239 | 246 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyBandagedFused.java | ||
|---|---|---|
| 104 | 104 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 105 | 105 |
// PUBLIC APi |
| 106 | 106 |
|
| 107 |
public ObjectType intGetObjectType(int[] numLayers)
|
|
| 107 |
public String getShortName()
|
|
| 108 | 108 |
{
|
| 109 |
return ObjectType.BAN1_3; |
|
| 109 |
return ObjectType.BAN1_3.name(); |
|
| 110 |
} |
|
| 111 |
|
|
| 112 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 113 |
|
|
| 114 |
public long getSignature() |
|
| 115 |
{
|
|
| 116 |
return ObjectType.BAN1_3.ordinal(); |
|
| 110 | 117 |
} |
| 111 | 118 |
|
| 112 | 119 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyBandagedGeneric.java | ||
|---|---|---|
| 1 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 2 |
// Copyright 2021 Leszek Koltunski // |
|
| 3 |
// // |
|
| 4 |
// This file is part of Magic Cube. // |
|
| 5 |
// // |
|
| 6 |
// Magic Cube is free software: you can redistribute it and/or modify // |
|
| 7 |
// it under the terms of the GNU General Public License as published by // |
|
| 8 |
// the Free Software Foundation, either version 2 of the License, or // |
|
| 9 |
// (at your option) any later version. // |
|
| 10 |
// // |
|
| 11 |
// Magic Cube is distributed in the hope that it will be useful, // |
|
| 12 |
// but WITHOUT ANY WARRANTY; without even the implied warranty of // |
|
| 13 |
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // |
|
| 14 |
// GNU General Public License for more details. // |
|
| 15 |
// // |
|
| 16 |
// You should have received a copy of the GNU General Public License // |
|
| 17 |
// along with Magic Cube. If not, see <http://www.gnu.org/licenses/>. // |
|
| 18 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 19 |
|
|
| 20 |
package org.distorted.objectlib.objects; |
|
| 21 |
|
|
| 22 |
import org.distorted.library.type.Static3D; |
|
| 23 |
import org.distorted.library.type.Static4D; |
|
| 24 |
import org.distorted.objectlib.scrambling.ScrambleState; |
|
| 25 |
import org.distorted.objectlib.scrambling.ScrambleStateBandaged3x3; |
|
| 26 |
|
|
| 27 |
import java.io.InputStream; |
|
| 28 |
|
|
| 29 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 30 |
|
|
| 31 |
public class TwistyBandagedGeneric extends TwistyBandagedAbstract |
|
| 32 |
{
|
|
| 33 |
private static long mSignature; |
|
| 34 |
|
|
| 35 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 36 |
|
|
| 37 |
public TwistyBandagedGeneric(int[] numL, int meshState, Static4D quat, Static3D move, float scale, InputStream stream) |
|
| 38 |
{
|
|
| 39 |
super(numL, meshState, quat, move, scale, stream); |
|
| 40 |
} |
|
| 41 |
|
|
| 42 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 43 |
// Andreas signature of a bandaged 3x3 |
|
| 44 |
|
|
| 45 |
public static void setSignature(long sig) |
|
| 46 |
{
|
|
| 47 |
mSignature = sig; |
|
| 48 |
} |
|
| 49 |
|
|
| 50 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 51 |
|
|
| 52 |
public ScrambleState[] getScrambleStates() |
|
| 53 |
{
|
|
| 54 |
if( mStates==null ) |
|
| 55 |
{
|
|
| 56 |
mStates = ScrambleStateBandaged3x3.computeGraph(mSignature); |
|
| 57 |
} |
|
| 58 |
|
|
| 59 |
return mStates; |
|
| 60 |
} |
|
| 61 |
|
|
| 62 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 63 |
|
|
| 64 |
float[][] getPositions() |
|
| 65 |
{
|
|
| 66 |
if( POSITIONS==null ) |
|
| 67 |
{
|
|
| 68 |
POSITIONS = new float[][] |
|
| 69 |
{
|
|
| 70 |
{-1.0f, -1.0f, +0.0f,
|
|
| 71 |
-1.0f, -1.0f, +1.0f, |
|
| 72 |
-1.0f, 0.0f, +0.0f, |
|
| 73 |
-1.0f, 0.0f, +1.0f, |
|
| 74 |
0.0f, -1.0f, +0.0f, |
|
| 75 |
0.0f, -1.0f, +1.0f, |
|
| 76 |
0.0f, 0.0f, +0.0f, |
|
| 77 |
0.0f, 0.0f, +1.0f}, |
|
| 78 |
{-1.0f, +1.0f, +1.0f},
|
|
| 79 |
{-1.0f, +1.0f, +0.0f},
|
|
| 80 |
{-1.0f, +1.0f, -1.0f},
|
|
| 81 |
{ 0.0f, +1.0f, +1.0f},
|
|
| 82 |
{ 0.0f, +1.0f, +0.0f},
|
|
| 83 |
{ 0.0f, +1.0f, -1.0f},
|
|
| 84 |
{ 1.0f, +1.0f, +1.0f},
|
|
| 85 |
{ 1.0f, +1.0f, +0.0f},
|
|
| 86 |
{ 1.0f, +1.0f, -1.0f},
|
|
| 87 |
{ 1.0f, 0.0f, +1.0f},
|
|
| 88 |
{ 1.0f, 0.0f, +0.0f},
|
|
| 89 |
{ 1.0f, 0.0f, -1.0f},
|
|
| 90 |
{ 1.0f, -1.0f, +1.0f},
|
|
| 91 |
{ 1.0f, -1.0f, +0.0f},
|
|
| 92 |
{ 1.0f, -1.0f, -1.0f},
|
|
| 93 |
{-1.0f, -1.0f, -1.0f},
|
|
| 94 |
{-1.0f, 0.0f, -1.0f},
|
|
| 95 |
{ 0.0f, -1.0f, -1.0f},
|
|
| 96 |
{ 0.0f, 0.0f, -1.0f}
|
|
| 97 |
}; |
|
| 98 |
} |
|
| 99 |
return POSITIONS; |
|
| 100 |
} |
|
| 101 |
|
|
| 102 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 103 |
|
|
| 104 |
int[] getQuatIndices() |
|
| 105 |
{
|
|
| 106 |
if( QUAT_INDICES==null ) QUAT_INDICES = new int[] { 0 };
|
|
| 107 |
return QUAT_INDICES; |
|
| 108 |
} |
|
| 109 |
|
|
| 110 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 111 |
// PUBLIC APi |
|
| 112 |
|
|
| 113 |
public String getShortName() |
|
| 114 |
{
|
|
| 115 |
return ""+mSignature; |
|
| 116 |
} |
|
| 117 |
|
|
| 118 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 119 |
|
|
| 120 |
public long getSignature() |
|
| 121 |
{
|
|
| 122 |
return mSignature; |
|
| 123 |
} |
|
| 124 |
|
|
| 125 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 126 |
|
|
| 127 |
public String getObjectName() |
|
| 128 |
{
|
|
| 129 |
return ""; |
|
| 130 |
} |
|
| 131 |
|
|
| 132 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 133 |
|
|
| 134 |
public String getInventor() |
|
| 135 |
{
|
|
| 136 |
return "??"; |
|
| 137 |
} |
|
| 138 |
|
|
| 139 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 140 |
|
|
| 141 |
public int getYearOfInvention() |
|
| 142 |
{
|
|
| 143 |
return 0; |
|
| 144 |
} |
|
| 145 |
|
|
| 146 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 147 |
|
|
| 148 |
public int getComplexity() |
|
| 149 |
{
|
|
| 150 |
return 4; |
|
| 151 |
} |
|
| 152 |
|
|
| 153 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 154 |
|
|
| 155 |
public String[][] getTutorials() |
|
| 156 |
{
|
|
| 157 |
return null; |
|
| 158 |
} |
|
| 159 |
} |
|
| src/main/java/org/distorted/objectlib/objects/TwistyContainer.java | ||
|---|---|---|
| 325 | 325 |
|
| 326 | 326 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 327 | 327 |
|
| 328 |
public ObjectType intGetObjectType(int[] numLayers)
|
|
| 328 |
public String getShortName()
|
|
| 329 | 329 |
{
|
| 330 |
return ObjectType.CONT_2; |
|
| 330 |
return ObjectType.CONT_2.name(); |
|
| 331 |
} |
|
| 332 |
|
|
| 333 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 334 |
|
|
| 335 |
public long getSignature() |
|
| 336 |
{
|
|
| 337 |
return ObjectType.CONT_2.ordinal(); |
|
| 331 | 338 |
} |
| 332 | 339 |
|
| 333 | 340 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyCuboid.java | ||
|---|---|---|
| 654 | 654 |
|
| 655 | 655 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 656 | 656 |
|
| 657 |
public int[] getBasicAngles()
|
|
| 657 |
public String getShortName()
|
|
| 658 | 658 |
{
|
| 659 |
if( mBasicAngle==null ) |
|
| 660 |
{
|
|
| 661 |
int[] num = getNumLayers(); |
|
| 662 |
int x = num[1]==num[2] ? 4 : 2; |
|
| 663 |
int y = num[0]==num[2] ? 4 : 2; |
|
| 664 |
int z = num[0]==num[1] ? 4 : 2; |
|
| 659 |
int[] numLayers = getNumLayers(); |
|
| 665 | 660 |
|
| 666 |
mBasicAngle = new int[] { x,y,z };
|
|
| 661 |
int x = numLayers[0]; |
|
| 662 |
int y = numLayers[1]; |
|
| 663 |
|
|
| 664 |
switch(x) |
|
| 665 |
{
|
|
| 666 |
case 2: switch(y) |
|
| 667 |
{
|
|
| 668 |
case 2: return ObjectType.CUBE_2.name(); |
|
| 669 |
case 3: return ObjectType.CU_232.name(); |
|
| 670 |
} |
|
| 671 |
case 3: switch(y) |
|
| 672 |
{
|
|
| 673 |
case 2: return ObjectType.CU_323.name(); |
|
| 674 |
case 3: return ObjectType.CUBE_3.name(); |
|
| 675 |
case 4: return ObjectType.CU_343.name(); |
|
| 676 |
} |
|
| 677 |
case 4: return ObjectType.CUBE_4.name(); |
|
| 678 |
case 5: return ObjectType.CUBE_5.name(); |
|
| 679 |
case 6: return ObjectType.CUBE_6.name(); |
|
| 680 |
case 7: return ObjectType.CUBE_7.name(); |
|
| 667 | 681 |
} |
| 668 |
return mBasicAngle; |
|
| 682 |
|
|
| 683 |
return ObjectType.CUBE_3.name(); |
|
| 669 | 684 |
} |
| 670 | 685 |
|
| 671 | 686 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 672 | 687 |
|
| 673 |
public ObjectType intGetObjectType(int[] numLayers)
|
|
| 688 |
public long getSignature()
|
|
| 674 | 689 |
{
|
| 690 |
int[] numLayers = getNumLayers(); |
|
| 691 |
|
|
| 675 | 692 |
int x = numLayers[0]; |
| 676 | 693 |
int y = numLayers[1]; |
| 677 | 694 |
|
| ... | ... | |
| 679 | 696 |
{
|
| 680 | 697 |
case 2: switch(y) |
| 681 | 698 |
{
|
| 682 |
case 2: return ObjectType.CUBE_2; |
|
| 683 |
case 3: return ObjectType.CU_232; |
|
| 699 |
case 2: return ObjectType.CUBE_2.ordinal();
|
|
| 700 |
case 3: return ObjectType.CU_232.ordinal();
|
|
| 684 | 701 |
} |
| 685 | 702 |
case 3: switch(y) |
| 686 | 703 |
{
|
| 687 |
case 2: return ObjectType.CU_323; |
|
| 688 |
case 3: return ObjectType.CUBE_3; |
|
| 689 |
case 4: return ObjectType.CU_343; |
|
| 704 |
case 2: return ObjectType.CU_323.ordinal();
|
|
| 705 |
case 3: return ObjectType.CUBE_3.ordinal();
|
|
| 706 |
case 4: return ObjectType.CU_343.ordinal();
|
|
| 690 | 707 |
} |
| 691 |
case 4: return ObjectType.CUBE_4; |
|
| 692 |
case 5: return ObjectType.CUBE_5; |
|
| 693 |
case 6: return ObjectType.CUBE_6; |
|
| 694 |
case 7: return ObjectType.CUBE_7; |
|
| 708 |
case 4: return ObjectType.CUBE_4.ordinal();
|
|
| 709 |
case 5: return ObjectType.CUBE_5.ordinal();
|
|
| 710 |
case 6: return ObjectType.CUBE_6.ordinal();
|
|
| 711 |
case 7: return ObjectType.CUBE_7.ordinal();
|
|
| 695 | 712 |
} |
| 696 | 713 |
|
| 697 |
return ObjectType.CUBE_3; |
|
| 714 |
return ObjectType.CUBE_3.ordinal(); |
|
| 715 |
} |
|
| 716 |
|
|
| 717 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 718 |
|
|
| 719 |
public int[] getBasicAngles() |
|
| 720 |
{
|
|
| 721 |
if( mBasicAngle==null ) |
|
| 722 |
{
|
|
| 723 |
int[] num = getNumLayers(); |
|
| 724 |
int x = num[1]==num[2] ? 4 : 2; |
|
| 725 |
int y = num[0]==num[2] ? 4 : 2; |
|
| 726 |
int z = num[0]==num[1] ? 4 : 2; |
|
| 727 |
|
|
| 728 |
mBasicAngle = new int[] { x,y,z };
|
|
| 729 |
} |
|
| 730 |
return mBasicAngle; |
|
| 698 | 731 |
} |
| 699 | 732 |
|
| 700 | 733 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| ... | ... | |
| 703 | 736 |
{
|
| 704 | 737 |
int[] numLayers = getNumLayers(); |
| 705 | 738 |
|
| 706 |
switch(intGetObjectType(numLayers)) |
|
| 739 |
int x = numLayers[0]; |
|
| 740 |
int y = numLayers[1]; |
|
| 741 |
|
|
| 742 |
switch(x) |
|
| 707 | 743 |
{
|
| 708 |
case CUBE_2: return "Pocket Cube"; |
|
| 709 |
case CU_232: return "Slim Tower"; |
|
| 710 |
case CUBE_3: return "Rubik Cube"; |
|
| 711 |
case CU_323: return "2x2x3 Cuboid"; |
|
| 712 |
case CU_343: return "3x3x4 Cuboid"; |
|
| 713 |
case CUBE_4: return "Rubik's Revenge"; |
|
| 714 |
case CUBE_5: return "Professor's Cube"; |
|
| 715 |
case CUBE_6: return "6x6 Cube"; |
|
| 716 |
case CUBE_7: return "7x7 Cube"; |
|
| 744 |
case 2: switch(y) |
|
| 745 |
{
|
|
| 746 |
case 2: return "Pocket Cube"; |
|
| 747 |
case 3: return "Slim Tower"; |
|
| 748 |
} |
|
| 749 |
case 3: switch(y) |
|
| 750 |
{
|
|
| 751 |
case 2: return "2x2x3 Cuboid"; |
|
| 752 |
case 3: return "Rubik Cube"; |
|
| 753 |
case 4: return "3x3x4 Cuboid"; |
|
| 754 |
} |
|
| 755 |
case 4: return "Rubik's Revenge"; |
|
| 756 |
case 5: return "Professor's Cube"; |
|
| 757 |
case 6: return "6x6 Cube"; |
|
| 758 |
case 7: return "7x7 Cube"; |
|
| 717 | 759 |
} |
| 760 |
|
|
| 718 | 761 |
return "Rubik Cube"; |
| 719 | 762 |
} |
| 720 | 763 |
|
| ... | ... | |
| 724 | 767 |
{
|
| 725 | 768 |
int[] numLayers = getNumLayers(); |
| 726 | 769 |
|
| 727 |
switch(intGetObjectType(numLayers)) |
|
| 770 |
int x = numLayers[0]; |
|
| 771 |
int y = numLayers[1]; |
|
| 772 |
|
|
| 773 |
switch(x) |
|
| 728 | 774 |
{
|
| 729 |
case CUBE_2: return "Larry Nichols"; |
|
| 730 |
case CU_232: return "Katsuhiko Okamoto"; |
|
| 731 |
case CUBE_3: return "Ernő Rubik"; |
|
| 732 |
case CU_323: return "Unknown"; |
|
| 733 |
case CU_343: return "Cube4You"; |
|
| 734 |
case CUBE_4: return "Péter Sebestény"; |
|
| 735 |
case CUBE_5: return "Udo Krell"; |
|
| 736 |
case CUBE_6: |
|
| 737 |
case CUBE_7: return "Panagiotis Verdes"; |
|
| 775 |
case 2: switch(y) |
|
| 776 |
{
|
|
| 777 |
case 2: return "Larry Nichols"; |
|
| 778 |
case 3: return "Katsuhiko Okamoto"; |
|
| 779 |
} |
|
| 780 |
case 3: switch(y) |
|
| 781 |
{
|
|
| 782 |
case 2: return "Unknown"; |
|
| 783 |
case 3: return "Ernő Rubik"; |
|
| 784 |
case 4: return "Cube4You"; |
|
| 785 |
} |
|
| 786 |
case 4: return "Péter Sebestény"; |
|
| 787 |
case 5: return "Udo Krell"; |
|
| 788 |
case 6: |
|
| 789 |
case 7: return "Panagiotis Verdes"; |
|
| 738 | 790 |
} |
| 739 | 791 |
|
| 740 | 792 |
return "Ernő Rubik"; |
| ... | ... | |
| 746 | 798 |
{
|
| 747 | 799 |
int[] numLayers = getNumLayers(); |
| 748 | 800 |
|
| 749 |
switch(intGetObjectType(numLayers)) |
|
| 801 |
int x = numLayers[0]; |
|
| 802 |
int y = numLayers[1]; |
|
| 803 |
|
|
| 804 |
switch(x) |
|
| 750 | 805 |
{
|
| 751 |
case CUBE_2: return 1970; |
|
| 752 |
case CU_232: return 2001; |
|
| 753 |
case CUBE_3: return 1974; |
|
| 754 |
case CU_323: return 0; |
|
| 755 |
case CU_343: return 2009; |
|
| 756 |
case CUBE_4: return 1981; |
|
| 757 |
case CUBE_5: return 2002; |
|
| 758 |
case CUBE_6: |
|
| 759 |
case CUBE_7: return 2008; |
|
| 806 |
case 2: switch(y) |
|
| 807 |
{
|
|
| 808 |
case 2: return 1970; |
|
| 809 |
case 3: return 2001; |
|
| 810 |
} |
|
| 811 |
case 3: switch(y) |
|
| 812 |
{
|
|
| 813 |
case 2: return 0; |
|
| 814 |
case 3: return 1974; |
|
| 815 |
case 4: return 2009; |
|
| 816 |
} |
|
| 817 |
case 4: return 1981; |
|
| 818 |
case 5: return 2002; |
|
| 819 |
case 6: |
|
| 820 |
case 7: return 2008; |
|
| 760 | 821 |
} |
| 761 | 822 |
|
| 762 | 823 |
return 1974; |
| ... | ... | |
| 768 | 829 |
{
|
| 769 | 830 |
int[] numLayers = getNumLayers(); |
| 770 | 831 |
|
| 771 |
switch(intGetObjectType(numLayers)) |
|
| 832 |
int x = numLayers[0]; |
|
| 833 |
int y = numLayers[1]; |
|
| 834 |
|
|
| 835 |
switch(x) |
|
| 772 | 836 |
{
|
| 773 |
case CUBE_2: |
|
| 774 |
case CU_232: return 1; |
|
| 775 |
case CUBE_3: |
|
| 776 |
case CU_323: return 2; |
|
| 777 |
case CU_343: |
|
| 778 |
case CUBE_4: return 3; |
|
| 779 |
case CUBE_5: |
|
| 780 |
case CUBE_6: |
|
| 781 |
case CUBE_7: return 4; |
|
| 837 |
case 2: switch(y) |
|
| 838 |
{
|
|
| 839 |
case 2: |
|
| 840 |
case 3: return 1; |
|
| 841 |
} |
|
| 842 |
case 3: switch(y) |
|
| 843 |
{
|
|
| 844 |
case 2: |
|
| 845 |
case 3: return 2; |
|
| 846 |
case 4: return 3; |
|
| 847 |
} |
|
| 848 |
case 4: return 3; |
|
| 849 |
case 5: |
|
| 850 |
case 6: |
|
| 851 |
case 7: return 4; |
|
| 782 | 852 |
} |
| 853 |
|
|
| 783 | 854 |
return 2; |
| 784 | 855 |
} |
| 785 | 856 |
|
| ... | ... | |
| 789 | 860 |
{
|
| 790 | 861 |
int[] numLayers = getNumLayers(); |
| 791 | 862 |
|
| 792 |
switch(intGetObjectType(numLayers)) |
|
| 863 |
int x = numLayers[0]; |
|
| 864 |
int y = numLayers[1]; |
|
| 865 |
|
|
| 866 |
switch(x) |
|
| 793 | 867 |
{
|
| 794 |
case CUBE_2: return new String[][] {
|
|
| 868 |
case 2: switch(y) |
|
| 869 |
{
|
|
| 870 |
case 2: return new String[][] {
|
|
| 795 | 871 |
{"gb","rJlh5p2wAKA","How to Solve a 2x2 Rubik's Cube","Z3"},
|
| 796 | 872 |
{"es","f85wqJTIDlw","Resolver cubo de Rubik 2X2","Cuby"},
|
| 797 | 873 |
{"ru","azC6P3VYFkc","Как собрать кубик 2Х2","Е Бондаренко"},
|
| ... | ... | |
| 802 | 878 |
{"kr","wTMsdWKq6No","2x2 큐브 공식을 이해하는 해법","듀나메스 큐브 해법연구소"},
|
| 803 | 879 |
// {"tw","CfOCXxhCb8U","2x2魔術方塊復原","1hrBLD"},
|
| 804 | 880 |
}; |
| 805 |
case CU_232: return new String[][] {
|
|
| 881 |
case 3: return new String[][] {
|
|
| 806 | 882 |
{"gb","6dYOrUgFCsc","How to Solve the 2x2x3","Z3"},
|
| 807 | 883 |
{"es","5-ePFYnnY9k","Cuboid 2x2x3 Tutorial","Cubo da Loucura"},
|
| 808 | 884 |
{"ru","cT4CEQwgFKA","Как собрать Cuboid 2x2x3","YG Cuber"},
|
| ... | ... | |
| 812 | 888 |
{"br","W6cp_1Q9SeY","Como resolver o cubóide 2x2x3","Pedro Filho"},
|
| 813 | 889 |
{"kr","DIaUaxQbJhw","2x2x3 해법","듀나메스 큐브 해법연구소"},
|
| 814 | 890 |
}; |
| 815 |
case CUBE_3: return new String[][] {
|
|
| 891 |
} |
|
| 892 |
case 3: switch(y) |
|
| 893 |
{
|
|
| 894 |
case 2: return new String[][] {
|
|
| 895 |
{"gb","pbv652cE1AU","How To Solve the 3x3x2 ","JRCuber"},
|
|
| 896 |
{"es","RtDbnDxXPrs","Cuboid 3x3x2 Tutorial","Cubo da Loucura"},
|
|
| 897 |
{"ru","n5-fa1fd2cQ","Как собрать кубоид 3х3х2","RubicsGuide"},
|
|
| 898 |
{"fr","z6xToKiu38M","Résolution du 3x3x2","asthalis"},
|
|
| 899 |
{"de","3qI55VS5MrY","2x3x3 - Tutorial","GerCubing"},
|
|
| 900 |
{"pl","KSs928xIwKg","3x3x2 cube Tutorial PL","MrUK"},
|
|
| 901 |
{"br","RnjJBXOp9DA","Como resolver o cubóide 3x3x2","Pedro Filho"},
|
|
| 902 |
{"kr","E3Oj8bKcTO4","2x3x3 큐보이드해법","듀나메스 큐브 해법연구소"},
|
|
| 903 |
}; |
|
| 904 |
case 3: return new String[][] {
|
|
| 816 | 905 |
{"gb","-8ohoCKN0Zw","How to Solve a Rubik's Cube","Z3"},
|
| 817 | 906 |
{"es","GyY0OxDk5lI","Resolver cubo de Rubik 3x3","Cuby"},
|
| 818 | 907 |
{"ru","5S2eq81FRzI","Как собрать кубик рубика","Е Бондаренко"},
|
| ... | ... | |
| 825 | 914 |
{"kr","V5eeKu9abCc","3x3 큐브 기초해법 (파트3)","듀나메스 큐브 해법연구소"},
|
| 826 | 915 |
// {"tw","76NmRQx5CLA","魔術方塊教學","1hrBLD"},
|
| 827 | 916 |
}; |
| 828 |
case CU_323: return new String[][] {
|
|
| 829 |
{"gb","pbv652cE1AU","How To Solve the 3x3x2 ","JRCuber"},
|
|
| 830 |
{"es","RtDbnDxXPrs","Cuboid 3x3x2 Tutorial","Cubo da Loucura"},
|
|
| 831 |
{"ru","n5-fa1fd2cQ","Как собрать кубоид 3х3х2","RubicsGuide"},
|
|
| 832 |
{"fr","z6xToKiu38M","Résolution du 3x3x2","asthalis"},
|
|
| 833 |
{"de","3qI55VS5MrY","2x3x3 - Tutorial","GerCubing"},
|
|
| 834 |
{"pl","KSs928xIwKg","3x3x2 cube Tutorial PL","MrUK"},
|
|
| 835 |
{"br","RnjJBXOp9DA","Como resolver o cubóide 3x3x2","Pedro Filho"},
|
|
| 836 |
{"kr","E3Oj8bKcTO4","2x3x3 큐보이드해법","듀나메스 큐브 해법연구소"},
|
|
| 837 |
}; |
|
| 838 |
case CU_343: return new String[][] {
|
|
| 917 |
case 4: return new String[][] {
|
|
| 839 | 918 |
{"gb","nh8DqpMM3Ro","How to solve the 3x3x4","BeardedCubing"},
|
| 840 | 919 |
{"es","nfeJ1q_OoHU","Cuboid 3x3x4 Tutorial","Cubo da Loucura"},
|
| 841 | 920 |
{"ru","NCdQRMKWf-8","Как собрать Cuboid 3x3x4","YG Cuber"},
|
| ... | ... | |
| 844 | 923 |
{"pl","YaPi8UGLKQQ","3x3x4 cube Tutorial PL","MrUK"},
|
| 845 | 924 |
{"kr","-kp5r7iXV0M","3x3x4 큐보이드해법","듀나메스 큐브 해법연구소"},
|
| 846 | 925 |
}; |
| 847 |
case CUBE_4: return new String[][] {
|
|
| 926 |
} |
|
| 927 |
case 4: return new String[][] {
|
|
| 848 | 928 |
{"gb","RR77Md71Ymc","How to Solve the 4x4 Rubik's Cube","Z3"},
|
| 849 | 929 |
{"es","d_4xk1r9hxU","Resolver cubo de Rubik 4x4","Cuby"},
|
| 850 | 930 |
{"ru","v5ytiOyTFSA","Как собрать кубик 4х4","Алексей Ярыгин"},
|
| ... | ... | |
| 859 | 939 |
// {"tw","PZvc5XJ2bLY","4x4魔術方塊復原#4","1hrBLD"},
|
| 860 | 940 |
// {"tw","97vDE29lu2o","4x4魔術方塊復原#5","1hrBLD"},
|
| 861 | 941 |
}; |
| 862 |
case CUBE_5: return new String[][] {
|
|
| 942 |
case 5: return new String[][] {
|
|
| 863 | 943 |
{"gb","zMkNkXHzQts","How to Solve the 5x5 Rubik's Cube","Z3"},
|
| 864 | 944 |
{"es","6uaq-xfFs98","Resolver cubo de Rubik 5x5","Cuby"},
|
| 865 | 945 |
{"ru","UtKsyLk45uA","Как собрать кубик 5x5","Алексей Ярыгин"},
|
| ... | ... | |
| 869 | 949 |
{"br","WQospjKXfvQ","Como resolver cubo 5x5","Pedro Filho"},
|
| 870 | 950 |
{"kr","D46qDaBFWNM","[555큐브]믿고보는영상!","Playon U온돌차"},
|
| 871 | 951 |
}; |
| 872 |
case CUBE_6: return new String[][] {
|
|
| 952 |
case 6: return new String[][] {
|
|
| 873 | 953 |
{"gb","SkZ9UadAOvQ","How to Solve the 6x6 Rubik's Cube","JPerm"},
|
| 874 | 954 |
{"es","9X-mW6wbnQQ","Resolver cubo de Rubik 6x6","Cuby"},
|
| 875 | 955 |
{"ru","yqEIek_l-44","Как собрать кубик Рубика 6х6","Алексей Ярыгин"},
|
| ... | ... | |
| 878 | 958 |
{"pl","ZB4ROiJUb1o","Jak ułożyć kostkę 6x6x6","DżoDżo"},
|
| 879 | 959 |
{"kr","ZUyDa2_dVFU","6x6 큐브 맞추는 방법","iamzoone"},
|
| 880 | 960 |
}; |
| 881 |
case CUBE_7: return new String[][] {
|
|
| 961 |
case 7: return new String[][] {
|
|
| 882 | 962 |
{"gb","xpI7jKs4bWQ","7x7 Centers (1/2)","CubeSkills"},
|
| 883 | 963 |
{"gb","xpI7jKs4bWQ","7x7 Edges & 3x3 Stage (2/2)","CubeSkills"},
|
| 884 | 964 |
{"es","q43XpYapOR8","Resolver cubo de Rubik 7x7","Cuby"},
|
| ... | ... | |
| 889 | 969 |
{"kr","3wynYMk4eZk","7x7 큐브 맞추는 방법","iamzoone"},
|
| 890 | 970 |
}; |
| 891 | 971 |
} |
| 972 |
|
|
| 892 | 973 |
return null; |
| 893 | 974 |
} |
| 894 | 975 |
} |
| src/main/java/org/distorted/objectlib/objects/TwistyDiamond.java | ||
|---|---|---|
| 480 | 480 |
|
| 481 | 481 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 482 | 482 |
|
| 483 |
public ObjectType intGetObjectType(int[] numLayers)
|
|
| 483 |
public String getShortName()
|
|
| 484 | 484 |
{
|
| 485 |
switch(numLayers[0]) |
|
| 485 |
switch(getNumLayers()[0]) |
|
| 486 |
{
|
|
| 487 |
case 2: return ObjectType.DIAM_2.name(); |
|
| 488 |
case 3: return ObjectType.DIAM_3.name(); |
|
| 489 |
case 4: return ObjectType.DIAM_4.name(); |
|
| 490 |
} |
|
| 491 |
|
|
| 492 |
return ObjectType.DIAM_2.name(); |
|
| 493 |
} |
|
| 494 |
|
|
| 495 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 496 |
|
|
| 497 |
public long getSignature() |
|
| 498 |
{
|
|
| 499 |
switch(getNumLayers()[0]) |
|
| 486 | 500 |
{
|
| 487 |
case 2: return ObjectType.DIAM_2; |
|
| 488 |
case 3: return ObjectType.DIAM_3; |
|
| 489 |
case 4: return ObjectType.DIAM_4; |
|
| 501 |
case 2: return ObjectType.DIAM_2.ordinal();
|
|
| 502 |
case 3: return ObjectType.DIAM_3.ordinal();
|
|
| 503 |
case 4: return ObjectType.DIAM_4.ordinal();
|
|
| 490 | 504 |
} |
| 491 | 505 |
|
| 492 |
return ObjectType.DIAM_2; |
|
| 506 |
return ObjectType.DIAM_2.ordinal();
|
|
| 493 | 507 |
} |
| 494 | 508 |
|
| 495 | 509 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyDino4.java | ||
|---|---|---|
| 98 | 98 |
|
| 99 | 99 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 100 | 100 |
|
| 101 |
public ObjectType intGetObjectType(int[] numLayers)
|
|
| 101 |
public String getShortName()
|
|
| 102 | 102 |
{
|
| 103 |
return ObjectType.DIN4_3; |
|
| 103 |
return ObjectType.DIN4_3.name(); |
|
| 104 |
} |
|
| 105 |
|
|
| 106 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 107 |
|
|
| 108 |
public long getSignature() |
|
| 109 |
{
|
|
| 110 |
return ObjectType.DIN4_3.ordinal(); |
|
| 104 | 111 |
} |
| 105 | 112 |
|
| 106 | 113 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyDino6.java | ||
|---|---|---|
| 74 | 74 |
|
| 75 | 75 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 76 | 76 |
|
| 77 |
public ObjectType intGetObjectType(int[] numLayers)
|
|
| 77 |
public String getShortName()
|
|
| 78 | 78 |
{
|
| 79 |
return ObjectType.DINO_3; |
|
| 79 |
return ObjectType.DINO_3.name(); |
|
| 80 |
} |
|
| 81 |
|
|
| 82 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 83 |
|
|
| 84 |
public long getSignature() |
|
| 85 |
{
|
|
| 86 |
return ObjectType.DINO_3.ordinal(); |
|
| 80 | 87 |
} |
| 81 | 88 |
|
| 82 | 89 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyFisher.java | ||
|---|---|---|
| 390 | 390 |
|
| 391 | 391 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 392 | 392 |
|
| 393 |
public ObjectType intGetObjectType(int[] numLayers)
|
|
| 393 |
public String getShortName()
|
|
| 394 | 394 |
{
|
| 395 |
return ObjectType.FISH_3; |
|
| 395 |
return ObjectType.FISH_3.name(); |
|
| 396 |
} |
|
| 397 |
|
|
| 398 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 399 |
|
|
| 400 |
public long getSignature() |
|
| 401 |
{
|
|
| 402 |
return ObjectType.FISH_3.ordinal(); |
|
| 396 | 403 |
} |
| 397 | 404 |
|
| 398 | 405 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyHelicopter.java | ||
|---|---|---|
| 316 | 316 |
|
| 317 | 317 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 318 | 318 |
|
| 319 |
public ObjectType intGetObjectType(int[] numLayers)
|
|
| 319 |
public String getShortName()
|
|
| 320 | 320 |
{
|
| 321 |
return ObjectType.HELI_3; |
|
| 321 |
return ObjectType.HELI_3.name(); |
|
| 322 |
} |
|
| 323 |
|
|
| 324 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 325 |
|
|
| 326 |
public long getSignature() |
|
| 327 |
{
|
|
| 328 |
return ObjectType.HELI_3.ordinal(); |
|
| 322 | 329 |
} |
| 323 | 330 |
|
| 324 | 331 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyIvy.java | ||
|---|---|---|
| 434 | 434 |
|
| 435 | 435 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 436 | 436 |
|
| 437 |
public ObjectType intGetObjectType(int[] numLayers)
|
|
| 437 |
public String getShortName()
|
|
| 438 | 438 |
{
|
| 439 |
return ObjectType.IVY_2; |
|
| 439 |
return ObjectType.IVY_2.name(); |
|
| 440 |
} |
|
| 441 |
|
|
| 442 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 443 |
|
|
| 444 |
public long getSignature() |
|
| 445 |
{
|
|
| 446 |
return ObjectType.IVY_2.ordinal(); |
|
| 440 | 447 |
} |
| 441 | 448 |
|
| 442 | 449 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyJing.java | ||
|---|---|---|
| 356 | 356 |
|
| 357 | 357 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 358 | 358 |
|
| 359 |
public ObjectType intGetObjectType(int[] numLayers)
|
|
| 359 |
public String getShortName()
|
|
| 360 | 360 |
{
|
| 361 |
return ObjectType.JING_2; |
|
| 361 |
return ObjectType.JING_2.name(); |
|
| 362 |
} |
|
| 363 |
|
|
| 364 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 365 |
|
|
| 366 |
public long getSignature() |
|
| 367 |
{
|
|
| 368 |
return ObjectType.JING_2.ordinal(); |
|
| 362 | 369 |
} |
| 363 | 370 |
|
| 364 | 371 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyKilominx.java | ||
|---|---|---|
| 555 | 555 |
|
| 556 | 556 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 557 | 557 |
|
| 558 |
public ObjectType intGetObjectType(int[] numLayers)
|
|
| 558 |
public String getShortName()
|
|
| 559 | 559 |
{
|
| 560 |
switch(numLayers[0]) |
|
| 560 |
switch(getNumLayers()[0]) |
|
| 561 |
{
|
|
| 562 |
case 3: return ObjectType.KILO_3.name(); |
|
| 563 |
case 5: return ObjectType.KILO_5.name(); |
|
| 564 |
} |
|
| 565 |
|
|
| 566 |
return ObjectType.KILO_3.name(); |
|
| 567 |
} |
|
| 568 |
|
|
| 569 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 570 |
|
|
| 571 |
public long getSignature() |
|
| 572 |
{
|
|
| 573 |
switch(getNumLayers()[0]) |
|
| 561 | 574 |
{
|
| 562 |
case 3: return ObjectType.KILO_3; |
|
| 563 |
case 5: return ObjectType.KILO_5; |
|
| 575 |
case 3: return ObjectType.KILO_3.ordinal();
|
|
| 576 |
case 5: return ObjectType.KILO_5.ordinal();
|
|
| 564 | 577 |
} |
| 565 | 578 |
|
| 566 |
return ObjectType.KILO_3; |
|
| 579 |
return ObjectType.KILO_3.ordinal();
|
|
| 567 | 580 |
} |
| 568 | 581 |
|
| 569 | 582 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyMegaminx.java | ||
|---|---|---|
| 478 | 478 |
|
| 479 | 479 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 480 | 480 |
|
| 481 |
public ObjectType intGetObjectType(int[] numLayers)
|
|
| 481 |
public String getShortName()
|
|
| 482 | 482 |
{
|
| 483 |
switch(numLayers[0]) |
|
| 483 |
switch(getNumLayers()[0]) |
|
| 484 |
{
|
|
| 485 |
case 3: return ObjectType.MEGA_3.name(); |
|
| 486 |
case 5: return ObjectType.MEGA_5.name(); |
|
| 487 |
} |
|
| 488 |
|
|
| 489 |
return ObjectType.MEGA_3.name(); |
|
| 490 |
} |
|
| 491 |
|
|
| 492 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 493 |
|
|
| 494 |
public long getSignature() |
|
| 495 |
{
|
|
| 496 |
switch(getNumLayers()[0]) |
|
| 484 | 497 |
{
|
| 485 |
case 3: return ObjectType.MEGA_3; |
|
| 486 |
case 5: return ObjectType.MEGA_5; |
|
| 498 |
case 3: return ObjectType.MEGA_3.ordinal();
|
|
| 499 |
case 5: return ObjectType.MEGA_5.ordinal();
|
|
| 487 | 500 |
} |
| 488 |
return ObjectType.MEGA_3; |
|
| 501 |
|
|
| 502 |
return ObjectType.MEGA_3.ordinal(); |
|
| 489 | 503 |
} |
| 490 | 504 |
|
| 491 | 505 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyMirror.java | ||
|---|---|---|
| 377 | 377 |
|
| 378 | 378 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 379 | 379 |
|
| 380 |
public ObjectType intGetObjectType(int[] numLayers)
|
|
| 380 |
public String getShortName()
|
|
| 381 | 381 |
{
|
| 382 |
switch(numLayers[0]) |
|
| 382 |
switch(getNumLayers()[0]) |
|
| 383 |
{
|
|
| 384 |
case 2: return ObjectType.MIRR_2.name(); |
|
| 385 |
case 3: return ObjectType.MIRR_3.name(); |
|
| 386 |
case 4: return ObjectType.MIRR_4.name(); |
|
| 387 |
} |
|
| 388 |
|
|
| 389 |
return ObjectType.MIRR_2.name(); |
|
| 390 |
} |
|
| 391 |
|
|
| 392 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 393 |
|
|
| 394 |
public long getSignature() |
|
| 395 |
{
|
|
| 396 |
switch(getNumLayers()[0]) |
|
| 383 | 397 |
{
|
| 384 |
case 2: return ObjectType.MIRR_2; |
|
| 385 |
case 3: return ObjectType.MIRR_3; |
|
| 386 |
case 4: return ObjectType.MIRR_4; |
|
| 398 |
case 2: return ObjectType.MIRR_2.ordinal();
|
|
| 399 |
case 3: return ObjectType.MIRR_3.ordinal();
|
|
| 400 |
case 4: return ObjectType.MIRR_4.ordinal();
|
|
| 387 | 401 |
} |
| 388 | 402 |
|
| 389 |
return ObjectType.MIRR_2; |
|
| 403 |
return ObjectType.MIRR_2.ordinal();
|
|
| 390 | 404 |
} |
| 391 | 405 |
|
| 392 | 406 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyMorphix.java | ||
|---|---|---|
| 287 | 287 |
|
| 288 | 288 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 289 | 289 |
|
| 290 |
public ObjectType intGetObjectType(int[] numLayers)
|
|
| 290 |
public String getShortName()
|
|
| 291 | 291 |
{
|
| 292 |
return ObjectType.MORP_2; |
|
| 292 |
return ObjectType.MORP_2.name(); |
|
| 293 |
} |
|
| 294 |
|
|
| 295 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 296 |
|
|
| 297 |
public long getSignature() |
|
| 298 |
{
|
|
| 299 |
return ObjectType.MORP_2.ordinal(); |
|
| 293 | 300 |
} |
| 294 | 301 |
|
| 295 | 302 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyPyraminx.java | ||
|---|---|---|
| 365 | 365 |
|
| 366 | 366 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 367 | 367 |
|
| 368 |
public ObjectType intGetObjectType(int[] numLayers)
|
|
| 368 |
public String getShortName()
|
|
| 369 | 369 |
{
|
| 370 |
switch(numLayers[0]) |
|
| 370 |
switch(getNumLayers()[0]) |
|
| 371 |
{
|
|
| 372 |
case 3: return ObjectType.PYRA_3.name(); |
|
| 373 |
case 4: return ObjectType.PYRA_4.name(); |
|
| 374 |
case 5: return ObjectType.PYRA_5.name(); |
|
| 375 |
} |
|
| 376 |
|
|
| 377 |
return ObjectType.PYRA_3.name(); |
|
| 378 |
} |
|
| 379 |
|
|
| 380 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 381 |
|
|
| 382 |
public long getSignature() |
|
| 383 |
{
|
|
| 384 |
switch(getNumLayers()[0]) |
|
| 371 | 385 |
{
|
| 372 |
case 3: return ObjectType.PYRA_3; |
|
| 373 |
case 4: return ObjectType.PYRA_4; |
|
| 374 |
case 5: return ObjectType.PYRA_5; |
|
| 386 |
case 3: return ObjectType.PYRA_3.ordinal();
|
|
| 387 |
case 4: return ObjectType.PYRA_4.ordinal();
|
|
| 388 |
case 5: return ObjectType.PYRA_5.ordinal();
|
|
| 375 | 389 |
} |
| 376 | 390 |
|
| 377 |
return ObjectType.PYRA_3; |
|
| 391 |
return ObjectType.PYRA_3.ordinal();
|
|
| 378 | 392 |
} |
| 379 | 393 |
|
| 380 | 394 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyRedi.java | ||
|---|---|---|
| 358 | 358 |
|
| 359 | 359 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 360 | 360 |
|
| 361 |
public ObjectType intGetObjectType(int[] numLayers)
|
|
| 361 |
public String getShortName()
|
|
| 362 | 362 |
{
|
| 363 |
return ObjectType.REDI_3; |
|
| 363 |
return ObjectType.REDI_3.name(); |
|
| 364 |
} |
|
| 365 |
|
|
| 366 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 367 |
|
|
| 368 |
public long getSignature() |
|
| 369 |
{
|
|
| 370 |
return ObjectType.REDI_3.ordinal(); |
|
| 364 | 371 |
} |
| 365 | 372 |
|
| 366 | 373 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyRex.java | ||
|---|---|---|
| 384 | 384 |
|
| 385 | 385 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 386 | 386 |
|
| 387 |
public ObjectType intGetObjectType(int[] numLayers)
|
|
| 387 |
public String getShortName()
|
|
| 388 | 388 |
{
|
| 389 |
return ObjectType.REX_3; |
|
| 389 |
return ObjectType.REX_3.name(); |
|
| 390 |
} |
|
| 391 |
|
|
| 392 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 393 |
|
|
| 394 |
public long getSignature() |
|
| 395 |
{
|
|
| 396 |
return ObjectType.REX_3.ordinal(); |
|
| 390 | 397 |
} |
| 391 | 398 |
|
| 392 | 399 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistySkewb.java | ||
|---|---|---|
| 483 | 483 |
|
| 484 | 484 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 485 | 485 |
|
| 486 |
public ObjectType intGetObjectType(int[] numLayers)
|
|
| 486 |
public String getShortName()
|
|
| 487 | 487 |
{
|
| 488 |
switch(numLayers[0]) |
|
| 488 |
switch(getNumLayers()[0]) |
|
| 489 |
{
|
|
| 490 |
case 2: return ObjectType.SKEW_2.name(); |
|
| 491 |
case 3: return ObjectType.SKEW_3.name(); |
|
| 492 |
} |
|
| 493 |
|
|
| 494 |
return ObjectType.SKEW_2.name(); |
|
| 495 |
} |
|
| 496 |
|
|
| 497 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 498 |
|
|
| 499 |
public long getSignature() |
|
| 500 |
{
|
|
| 501 |
switch(getNumLayers()[0]) |
|
| 489 | 502 |
{
|
| 490 |
case 2: return ObjectType.SKEW_2; |
|
| 491 |
case 3: return ObjectType.SKEW_3; |
|
| 503 |
case 2: return ObjectType.SKEW_2.ordinal();
|
|
| 504 |
case 3: return ObjectType.SKEW_3.ordinal();
|
|
| 492 | 505 |
} |
| 493 | 506 |
|
| 494 |
return ObjectType.SKEW_2; |
|
| 507 |
return ObjectType.SKEW_2.ordinal();
|
|
| 495 | 508 |
} |
| 496 | 509 |
|
| 497 | 510 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistySquare1.java | ||
|---|---|---|
| 263 | 263 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 264 | 264 |
// PUBLIC API |
| 265 | 265 |
|
| 266 |
public ObjectType intGetObjectType(int[] numLayers)
|
|
| 266 |
public String getShortName()
|
|
| 267 | 267 |
{
|
| 268 |
return ObjectType.SQU1_3; |
|
| 268 |
return ObjectType.SQU1_3.name(); |
|
| 269 |
} |
|
| 270 |
|
|
| 271 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 272 |
|
|
| 273 |
public long getSignature() |
|
| 274 |
{
|
|
| 275 |
return ObjectType.SQU1_3.ordinal(); |
|
| 269 | 276 |
} |
| 270 | 277 |
|
| 271 | 278 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistySquare2.java | ||
|---|---|---|
| 297 | 297 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 298 | 298 |
// PUBLIC API |
| 299 | 299 |
|
| 300 |
public ObjectType intGetObjectType(int[] numLayers)
|
|
| 300 |
public String getShortName()
|
|
| 301 | 301 |
{
|
| 302 |
return ObjectType.SQU2_3; |
|
| 302 |
return ObjectType.SQU2_3.name(); |
|
| 303 |
} |
|
| 304 |
|
|
| 305 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 306 |
|
|
| 307 |
public long getSignature() |
|
| 308 |
{
|
|
| 309 |
return ObjectType.SQU2_3.ordinal(); |
|
| 303 | 310 |
} |
| 304 | 311 |
|
| 305 | 312 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyTrajber.java | ||
|---|---|---|
| 392 | 392 |
|
| 393 | 393 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 394 | 394 |
|
| 395 |
public ObjectType intGetObjectType(int[] numLayers)
|
|
| 395 |
public String getShortName()
|
|
| 396 | 396 |
{
|
| 397 |
return ObjectType.TRAJ_3; |
|
| 397 |
return ObjectType.TRAJ_3.name(); |
|
| 398 |
} |
|
| 399 |
|
|
| 400 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 401 |
|
|
| 402 |
public long getSignature() |
|
| 403 |
{
|
|
| 404 |
return ObjectType.TRAJ_3.ordinal(); |
|
| 398 | 405 |
} |
| 399 | 406 |
|
| 400 | 407 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyUltimate.java | ||
|---|---|---|
| 356 | 356 |
|
| 357 | 357 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 358 | 358 |
|
| 359 |
public ObjectType intGetObjectType(int[] numLayers)
|
|
| 359 |
public String getShortName()
|
|
| 360 | 360 |
{
|
| 361 |
return ObjectType.ULTI_2; |
|
| 361 |
return ObjectType.ULTI_2.name(); |
|
| 362 |
} |
|
| 363 |
|
|
| 364 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 365 |
|
|
| 366 |
public long getSignature() |
|
| 367 |
{
|
|
| 368 |
return ObjectType.ULTI_2.ordinal(); |
|
| 362 | 369 |
} |
| 363 | 370 |
|
| 364 | 371 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyVoid.java | ||
|---|---|---|
| 395 | 395 |
|
| 396 | 396 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 397 | 397 |
|
| 398 |
public ObjectType intGetObjectType(int[] numLayers)
|
|
| 398 |
public String getShortName()
|
|
| 399 | 399 |
{
|
| 400 |
return ObjectType.VOID_3; |
|
| 400 |
return ObjectType.VOID_3.name(); |
|
| 401 |
} |
|
| 402 |
|
|
| 403 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 404 |
|
|
| 405 |
public long getSignature() |
|
| 406 |
{
|
|
| 407 |
return ObjectType.VOID_3.ordinal(); |
|
| 401 | 408 |
} |
| 402 | 409 |
|
| 403 | 410 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/objects/TwistyWindmill.java | ||
|---|---|---|
| 405 | 405 |
|
| 406 | 406 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 407 | 407 |
|
| 408 |
public ObjectType intGetObjectType(int[] numLayers)
|
|
| 408 |
public String getShortName()
|
|
| 409 | 409 |
{
|
| 410 |
return ObjectType.WIND_3; |
|
| 410 |
return ObjectType.WIND_3.name(); |
|
| 411 |
} |
|
| 412 |
|
|
| 413 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 414 |
|
|
| 415 |
public long getSignature() |
|
| 416 |
{
|
|
| 417 |
return ObjectType.WIND_3.ordinal(); |
|
| 411 | 418 |
} |
| 412 | 419 |
|
| 413 | 420 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objectlib/scrambling/ScrambleStateBandaged3x3.java | ||
|---|---|---|
| 43 | 43 |
|
| 44 | 44 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 45 | 45 |
|
| 46 |
public ScrambleStateBandaged3x3(long id)
|
|
| 46 |
private ScrambleStateBandaged3x3(long id)
|
|
| 47 | 47 |
{
|
| 48 | 48 |
mDistance = -1; |
| 49 | 49 |
mID = id; |
| ... | ... | |
| 52 | 52 |
|
| 53 | 53 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 54 | 54 |
|
| 55 |
public static void computeGraph(long id) |
|
| 55 |
private long getID() |
|
| 56 |
{
|
|
| 57 |
return mID; |
|
| 58 |
} |
|
| 59 |
|
|
| 60 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 61 |
|
|
| 62 |
private void setID(long id) |
|
| 63 |
{
|
|
| 64 |
mID = id; |
|
| 65 |
} |
|
| 66 |
|
|
| 67 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 68 |
|
|
| 69 |
private long getMove(int index) |
|
| 70 |
{
|
|
| 71 |
return (index>=0 && index<NUM_MOVES) ? mMoves[index] : INVALID_MOVE; |
|
| 72 |
} |
|
| 73 |
|
|
| 74 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 75 |
|
|
| 76 |
private int numAxis() |
|
| 77 |
{
|
|
| 78 |
int num = 0; |
|
| 79 |
|
|
| 80 |
if( mMoves[ 0]!=INVALID_MOVE || mMoves[ 1]!=INVALID_MOVE || mMoves[ 2]!=INVALID_MOVE || |
|
| 81 |
mMoves[ 3]!=INVALID_MOVE || mMoves[ 4]!=INVALID_MOVE || mMoves[ 5]!=INVALID_MOVE || |
|
| 82 |
mMoves[ 6]!=INVALID_MOVE || mMoves[ 7]!=INVALID_MOVE || mMoves[ 8]!=INVALID_MOVE ) num++; |
|
| 83 |
|
|
| 84 |
if( mMoves[ 9]!=INVALID_MOVE || mMoves[10]!=INVALID_MOVE || mMoves[11]!=INVALID_MOVE || |
|
Also available in: Unified diff
Preparation for local creation of puzzles: remove the 'ObjectType' enum from TwistyObject class.