Revision fd9d4a2c
Added by Leszek Koltunski almost 2 years ago
| src/main/java/org/distorted/objectlib/json/JsonReader.java | ||
|---|---|---|
| 378 | 378 |
|
| 379 | 379 |
private void parseOverrides(JSONArray object) throws JSONException |
| 380 | 380 |
{
|
| 381 |
int numOverrides = object.length(); |
|
| 382 |
mStickerOverrides= new ObjectStickerOverride[numOverrides]; |
|
| 381 |
if( object!=null ) |
|
| 382 |
{
|
|
| 383 |
int numOverrides = object.length(); |
|
| 384 |
mStickerOverrides= new ObjectStickerOverride[numOverrides]; |
|
| 383 | 385 |
|
| 384 |
for(int i=0; i<numOverrides; i++) |
|
| 386 |
for(int i=0; i<numOverrides; i++) |
|
| 387 |
{
|
|
| 388 |
JSONObject override = object.getJSONObject(i); |
|
| 389 |
JSONArray cubitArray = override.getJSONArray("cubitfaces");
|
|
| 390 |
int color = override.getInt("color");
|
|
| 391 |
int numCubits = cubitArray.length(); |
|
| 392 |
int[] cubitface = new int[numCubits]; |
|
| 393 |
for(int j=0; j<numCubits; j++) cubitface[j] = cubitArray.getInt(j); |
|
| 394 |
mStickerOverrides[i] = new ObjectStickerOverride(cubitface,color); |
|
| 395 |
} |
|
| 396 |
} |
|
| 397 |
else |
|
| 385 | 398 |
{
|
| 386 |
JSONObject override = object.getJSONObject(i); |
|
| 387 |
JSONArray cubitArray = override.getJSONArray("cubitfaces");
|
|
| 388 |
int color = override.getInt("color");
|
|
| 389 |
int numCubits = cubitArray.length(); |
|
| 390 |
int[] cubitface = new int[numCubits]; |
|
| 391 |
for(int j=0; j<numCubits; j++) cubitface[j] = cubitArray.getInt(j); |
|
| 392 |
mStickerOverrides[i] = new ObjectStickerOverride(cubitface,color); |
|
| 399 |
mStickerOverrides = null; |
|
| 393 | 400 |
} |
| 394 | 401 |
} |
| 395 | 402 |
|
| ... | ... | |
| 405 | 412 |
parseStickers(stickers); |
| 406 | 413 |
|
| 407 | 414 |
JSONArray overrides= object.optJSONArray("overrides");
|
| 408 |
if( overrides!=null ) parseOverrides(overrides);
|
|
| 415 |
parseOverrides(overrides); |
|
| 409 | 416 |
} |
| 410 | 417 |
|
| 411 | 418 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
Also available in: Unified diff
Bugfix the the sticker overrides.