Revision a8295031
Added by Leszek Koltunski almost 2 years ago
| src/main/java/org/distorted/objectlib/main/TwistyObject.java | ||
|---|---|---|
| 150 | 150 |
private int[][] mVariantFaceIsOuter; |
| 151 | 151 |
private int[][] mBasicAngles; |
| 152 | 152 |
private int mIconMode; |
| 153 |
private final InitData mInitData; |
|
| 153 | 154 |
|
| 154 | 155 |
//////////////////// SOLVED1 //////////////////////// |
| 155 | 156 |
|
| ... | ... | |
| 167 | 168 |
|
| 168 | 169 |
mNumLayers = reader.getNumLayers(); |
| 169 | 170 |
mSize = reader.getSize(); |
| 171 |
mInitData = null; |
|
| 170 | 172 |
initialize(meshState,iconMode,quat,move,scale,meshStream,true); |
| 171 | 173 |
} |
| 172 | 174 |
|
| 173 | 175 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 174 | 176 |
|
| 175 |
TwistyObject(int[] numLayers, int meshState, int iconMode, float size, Static4D quat, Static3D move, float scale, InputStream meshStream)
|
|
| 177 |
TwistyObject(InitData data, int meshState, int iconMode, float size, Static4D quat, Static3D move, float scale, InputStream meshStream)
|
|
| 176 | 178 |
{
|
| 177 |
mNumLayers = numLayers;
|
|
| 179 |
mNumLayers = data.getNumLayers();
|
|
| 178 | 180 |
mSize = size; |
| 181 |
mInitData = data; |
|
| 179 | 182 |
initialize(meshState,iconMode,quat,move,scale,meshStream,false); |
| 180 | 183 |
} |
| 181 | 184 |
|
| ... | ... | |
| 484 | 487 |
return mQuatMult[index1][index2]; |
| 485 | 488 |
} |
| 486 | 489 |
|
| 490 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 491 |
|
|
| 492 |
public InitData getInitData() |
|
| 493 |
{
|
|
| 494 |
return mInitData; |
|
| 495 |
} |
|
| 496 |
|
|
| 487 | 497 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 488 | 498 |
|
| 489 | 499 |
public boolean isInIconMode() |
Also available in: Unified diff
Introduce InitData, a data structure used to initialize a TwistyObject.
Current (optional) members: int[] numLayers, int param [intended: type of the Crazy 3x3 planet], float[][] pos [position of a bandaged cube] )