Revision ff60e713
Added by Leszek Koltunski almost 2 years ago
| src/main/java/org/distorted/objectlib/json/JsonReader.java | ||
|---|---|---|
| 200 | 200 |
mCubitFaceColor[i] = new int[numColor]; |
| 201 | 201 |
for(int j=0; j<numColor; j++) mCubitFaceColor[i][j] = jsonColor.getInt(j); |
| 202 | 202 |
|
| 203 |
mCubitType[i] = (int)jsonCubit.optInt("type", Cubit.TYPE_NORMAL);
|
|
| 203 |
mCubitType[i] = jsonCubit.optInt("type", Cubit.TYPE_NORMAL);
|
|
| 204 | 204 |
float xoff = (float)jsonCubit.optDouble("offsetX", 0 );
|
| 205 | 205 |
float yoff = (float)jsonCubit.optDouble("offsetY", 0 );
|
| 206 | 206 |
float zoff = (float)jsonCubit.optDouble("offsetZ", 0 );
|
| ... | ... | |
| 383 | 383 |
|
| 384 | 384 |
for(int i=0; i<numOverrides; i++) |
| 385 | 385 |
{
|
| 386 |
JSONObject override = object.getJSONObject(i); |
|
| 387 |
int cubit = override.getInt("cubit");
|
|
| 388 |
int face = override.getInt("face");
|
|
| 386 |
JSONObject override = object.getJSONObject(i); |
|
| 387 |
JSONArray cubitArray = override.getJSONArray("cubitfaces");
|
|
| 389 | 388 |
int color = override.getInt("color");
|
| 390 |
mStickerOverrides[i] = new ObjectStickerOverride(cubit,face,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); |
|
| 391 | 393 |
} |
| 392 | 394 |
} |
| 393 | 395 |
|
Also available in: Unified diff
Progress with sticker overrides.