Revision 6db8fe2e
Added by Leszek Koltunski over 1 year ago
| src/main/java/org/distorted/objectlib/json/JsonReader.java | ||
|---|---|---|
| 76 | 76 |
private int[] mCubitType; |
| 77 | 77 |
private float[][] mCubitRowOffset; |
| 78 | 78 |
private ObjectStickerOverride[] mStickerOverrides; |
| 79 |
private float mPillowCoeff; |
|
| 79 | 80 |
|
| 80 | 81 |
private static JsonReader mThis; |
| 81 | 82 |
|
| ... | ... | |
| 443 | 444 |
|
| 444 | 445 |
JSONArray overrides= object.optJSONArray("overrides");
|
| 445 | 446 |
parseOverrides(overrides); |
| 447 |
|
|
| 448 |
mPillowCoeff = (float)object.optDouble("pillow",1.0);
|
|
| 446 | 449 |
} |
| 447 | 450 |
|
| 448 | 451 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| ... | ... | |
| 1073 | 1076 |
return mStickerOverrides; |
| 1074 | 1077 |
} |
| 1075 | 1078 |
|
| 1079 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 1080 |
|
|
| 1081 |
public float getPillowCoeff() |
|
| 1082 |
{
|
|
| 1083 |
return mPillowCoeff; |
|
| 1084 |
} |
|
| 1085 |
|
|
| 1076 | 1086 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 1077 | 1087 |
|
| 1078 | 1088 |
public Static3D[] getRotationAxis() |
| ... | ... | |
| 1198 | 1208 |
{
|
| 1199 | 1209 |
return mTutorials; |
| 1200 | 1210 |
} |
| 1201 |
|
|
| 1202 | 1211 |
} |
| src/main/java/org/distorted/objectlib/json/JsonWriter.java | ||
|---|---|---|
| 376 | 376 |
mesh.put("shapes" , shapes);
|
| 377 | 377 |
mesh.put("cubits" , cubits);
|
| 378 | 378 |
mesh.put("stickers", stickers);
|
| 379 |
mesh.put("pillow" , object.getPillowCoeff() );
|
|
| 379 | 380 |
|
| 380 | 381 |
JSONArray overrides = generateOverrides(object); |
| 381 | 382 |
if( overrides!=null ) mesh.put("overrides", overrides);
|
| src/main/java/org/distorted/objectlib/main/TwistyJson.java | ||
|---|---|---|
| 110 | 110 |
return mReader.getCubitFaceFace(cubit,face); |
| 111 | 111 |
} |
| 112 | 112 |
|
| 113 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 114 |
|
|
| 115 |
@Override |
|
| 116 |
public float getPillowCoeff() |
|
| 117 |
{
|
|
| 118 |
return mReader.getPillowCoeff(); |
|
| 119 |
} |
|
| 120 |
|
|
| 113 | 121 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 114 | 122 |
|
| 115 | 123 |
@Override |
| src/main/java/org/distorted/objectlib/main/TwistyObject.java | ||
|---|---|---|
| 194 | 194 |
|
| 195 | 195 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 196 | 196 |
|
| 197 |
private void initialize(int meshState, int iconMode, Static4D quat, Static3D move, float scale, InputStream stream, boolean fromJSON)
|
|
| 197 |
private void initialize(int meshState, int iconMode, Static4D quat, Static3D move, float scale, InputStream meshStream, boolean fromJSON)
|
|
| 198 | 198 |
{
|
| 199 | 199 |
mIconMode = iconMode; |
| 200 | 200 |
mQuat = quat; |
| ... | ... | |
| 259 | 259 |
MatrixEffectQuaternion quatEffect = new MatrixEffectQuaternion(mQuat, CENTER); |
| 260 | 260 |
MatrixEffectMove moveEffect = new MatrixEffectMove(move); |
| 261 | 261 |
|
| 262 |
boolean fromDMESH = (stream!=null && meshState==MESH_NICE);
|
|
| 262 |
boolean fromDMESH = (meshStream!=null && meshState==MESH_NICE);
|
|
| 263 | 263 |
getQuatsAndShapes(fromDMESH,fromJSON); |
| 264 |
createMeshAndCubits(stream,meshState,fromDMESH);
|
|
| 264 |
createMeshAndCubits(meshStream,meshState,fromDMESH);
|
|
| 265 | 265 |
setUpTextures(fromDMESH,fromJSON); |
| 266 | 266 |
createDataStructuresForSolved(); |
| 267 | 267 |
|
| src/main/java/org/distorted/objectlib/objects/TwistyJing.java | ||
|---|---|---|
| 55 | 55 |
super(data, meshState, iconMode, data.getNumLayers()[0], quat, move, scale, stream); |
| 56 | 56 |
} |
| 57 | 57 |
|
| 58 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 59 |
|
|
| 60 |
@Override |
|
| 61 |
public float getPillowCoeff() |
|
| 62 |
{
|
|
| 63 |
return 2.0f; |
|
| 64 |
} |
|
| 65 |
|
|
| 58 | 66 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 59 | 67 |
|
| 60 | 68 |
public ScrambleState[] getScrambleStates() |
| src/main/java/org/distorted/objectlib/objects/TwistyMorphix.java | ||
|---|---|---|
| 49 | 49 |
super(data, meshState, iconMode, data.getNumLayers()[0], quat, move, scale, stream); |
| 50 | 50 |
} |
| 51 | 51 |
|
| 52 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 53 |
|
|
| 54 |
@Override |
|
| 55 |
public float getPillowCoeff() |
|
| 56 |
{
|
|
| 57 |
return 2.0f; |
|
| 58 |
} |
|
| 59 |
|
|
| 52 | 60 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 53 | 61 |
// same as in a 2x2 |
| 54 | 62 |
|
Also available in: Unified diff
More support for pillowing; pillow Morphix and Jing by default.