Revision e17d01c2
Added by Leszek Koltunski 12 months ago
| src/main/java/org/distorted/objectlib/json/JsonReader.java | ||
|---|---|---|
| 534 | 534 |
JSONArray jsonAlg = jsonAlgorithms.getJSONArray(i); |
| 535 | 535 |
int numEntries = jsonAlg.length(); |
| 536 | 536 |
mAlgorithms[i] = new int[numEntries]; |
| 537 |
for(int j=0; j<numEntries; j++) mAlgorithms[i][j] = (1<<jsonAlg.getInt(j)); |
|
| 537 |
for(int j=0; j<numEntries; j++) |
|
| 538 |
{
|
|
| 539 |
int entry = jsonAlg.getInt(j); |
|
| 540 |
mAlgorithms[i][j] = ( (j%3)==1 ? (1<<entry) : entry ); |
|
| 541 |
} |
|
| 538 | 542 |
} |
| 539 | 543 |
|
| 540 | 544 |
JSONArray jsonEdges = object.getJSONArray("edges");
|
| src/main/java/org/distorted/objectlib/scrambling/ScrambleState.java | ||
|---|---|---|
| 43 | 43 |
|
| 44 | 44 |
private int getScrambleValue(int[] alg, int[][] scrambleTable) |
| 45 | 45 |
{
|
| 46 |
int l=0, layerBmp = alg[1]; |
|
| 46 |
int layerBmp = alg[1]; |
|
| 47 |
int[] table = scrambleTable[alg[0]]; |
|
| 47 | 48 |
|
| 48 |
for(; l<32; l++)
|
|
| 49 |
for(int i : table)
|
|
| 49 | 50 |
{
|
| 50 |
if( (layerBmp&0x1) !=0 ) break;
|
|
| 51 |
if( (layerBmp&0x1) != 0) return i;
|
|
| 51 | 52 |
layerBmp /= 2; |
| 52 | 53 |
} |
| 53 | 54 |
|
| 54 |
return scrambleTable[alg[0]][l];
|
|
| 55 |
return 0;
|
|
| 55 | 56 |
} |
| 56 | 57 |
|
| 57 | 58 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
Also available in: Unified diff
Fix the 'layer bitmaps in algorithms' feature.