Revision 731280f7
Added by Leszek Koltunski over 1 year ago
| src/main/java/org/distorted/objectlib/json/JsonReader.java | ||
|---|---|---|
| 24 | 24 |
import org.distorted.objectlib.helpers.ObjectStickerOverride; |
| 25 | 25 |
import org.distorted.objectlib.helpers.ObjectVertexEffects; |
| 26 | 26 |
import org.distorted.objectlib.main.Cubit; |
| 27 |
import org.distorted.objectlib.main.TwistyObject; |
|
| 28 | 27 |
import org.distorted.objectlib.objects.TwistyBandagedCuboid; |
| 28 |
import org.distorted.objectlib.scrambling.ScrambleEdgeGenerator; |
|
| 29 | 29 |
import org.json.JSONArray; |
| 30 | 30 |
import org.json.JSONException; |
| 31 | 31 |
import org.json.JSONObject; |
| ... | ... | |
| 442 | 442 |
|
| 443 | 443 |
for(int alg=0; alg<numAlgs; alg++) |
| 444 | 444 |
{
|
| 445 |
int[] algorithm = mAlgorithms[alg];
|
|
| 446 |
if( algorithm.length>=3 && algorithm[0]==ax && algorithm[1]==layer && algorithm[2]==angle ) return alg;
|
|
| 445 |
int[] a = mAlgorithms[alg]; |
|
| 446 |
if( a.length>=3 && a[0]==ax && a[1]==layer && a[2]==angle ) return alg;
|
|
| 447 | 447 |
} |
| 448 | 448 |
|
| 449 | 449 |
return -1; |
| ... | ... | |
| 502 | 502 |
} |
| 503 | 503 |
} |
| 504 | 504 |
|
| 505 |
mAlgorithms = TwistyObject.staticGetAlgorithms(mBasicAngle);
|
|
| 505 |
mAlgorithms = ScrambleEdgeGenerator.getScramblingAlgorithms(mBasicAngle);
|
|
| 506 | 506 |
mEdges = new int[numStates][]; |
| 507 | 507 |
for(int i=0; i<numStates; i++) mEdges[i] = produceEdge(scramblingData[i]); |
| 508 | 508 |
} |
Also available in: Unified diff
Minor.