Revision 0f72365b
Added by Leszek Koltunski over 2 years ago
| src/main/java/org/distorted/objectlib/json/JsonReader.java | ||
|---|---|---|
| 69 | 69 |
private int mScrambleType, mNumScrambles; |
| 70 | 70 |
private int[] mColor; |
| 71 | 71 |
private ObjectType mType; |
| 72 |
private boolean mResetMaps; |
|
| 72 | 73 |
|
| 73 | 74 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 74 | 75 |
|
| ... | ... | |
| 82 | 83 |
mSize = (float)object.getDouble("size");
|
| 83 | 84 |
mSolvedFuncIndex = object.getInt("solved_func");
|
| 84 | 85 |
mNumScrambles = object.getInt("scrambles");
|
| 86 |
mResetMaps = object.getBoolean("resetmaps");
|
|
| 85 | 87 |
|
| 86 | 88 |
int ordinal = ObjectType.getOrdinal(mShortName); |
| 87 | 89 |
mType = ordinal>=0 ? ObjectType.getObject(ordinal) : null; |
| ... | ... | |
| 755 | 757 |
{
|
| 756 | 758 |
return mColor[face]; |
| 757 | 759 |
} |
| 760 |
|
|
| 761 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 762 |
|
|
| 763 |
public boolean shouldResetTextureMaps() |
|
| 764 |
{
|
|
| 765 |
return mResetMaps; |
|
| 766 |
} |
|
| 758 | 767 |
} |
| src/main/java/org/distorted/objectlib/json/JsonWriter.java | ||
|---|---|---|
| 365 | 365 |
metadata.put("solved_func", object.getSolvedFunctionIndex() );
|
| 366 | 366 |
metadata.put("scrambles" , type.getNumScramble() );
|
| 367 | 367 |
metadata.put("shortname" , type.name() );
|
| 368 |
metadata.put("resetmaps" , object.shouldResetTextureMaps() );
|
|
| 368 | 369 |
|
| 369 | 370 |
return metadata; |
| 370 | 371 |
} |
| src/main/java/org/distorted/objectlib/main/TwistyJson.java | ||
|---|---|---|
| 266 | 266 |
return mReader.getColor(face); |
| 267 | 267 |
} |
| 268 | 268 |
|
| 269 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 270 |
|
|
| 271 |
public boolean shouldResetTextureMaps() |
|
| 272 |
{
|
|
| 273 |
return mReader.shouldResetTextureMaps(); |
|
| 274 |
} |
|
| 275 |
|
|
| 269 | 276 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 270 | 277 |
|
| 271 | 278 |
public String getShortName() |
| src/main/java/org/distorted/objectlib/main/TwistyObject.java | ||
|---|---|---|
| 416 | 416 |
|
| 417 | 417 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 418 | 418 |
|
| 419 |
protected boolean shouldResetTextureMaps()
|
|
| 419 |
public boolean shouldResetTextureMaps()
|
|
| 420 | 420 |
{
|
| 421 | 421 |
return false; |
| 422 | 422 |
} |
| src/main/java/org/distorted/objectlib/objects/TwistyDino4.java | ||
|---|---|---|
| 87 | 87 |
|
| 88 | 88 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 89 | 89 |
|
| 90 |
protected boolean shouldResetTextureMaps()
|
|
| 90 |
public boolean shouldResetTextureMaps()
|
|
| 91 | 91 |
{
|
| 92 | 92 |
return true; |
| 93 | 93 |
} |
Also available in: Unified diff
Add 'shouldResetTextureMaps' to the JSON puzzle description.