Revision 3bf19410
Added by Leszek Koltunski about 2 years ago
| src/main/java/org/distorted/objectlib/main/TwistyObject.java | ||
|---|---|---|
| 70 | 70 |
public static final int MESH_NICE = 0; |
| 71 | 71 |
public static final int MESH_FAST = 1; |
| 72 | 72 |
|
| 73 |
public static final int MODE_ICON = 0; |
|
| 74 |
public static final int MODE_NORM = 1; |
|
| 75 |
|
|
| 73 | 76 |
public static final int COLOR_YELLOW = 0xffffff00; |
| 74 | 77 |
public static final int COLOR_WHITE = 0xffffffff; |
| 75 | 78 |
public static final int COLOR_BLUE = 0xff0000ff; |
| ... | ... | |
| 143 | 146 |
private int[][] mCubitFaceColors; |
| 144 | 147 |
private int[][] mVariantFaceIsOuter; |
| 145 | 148 |
private int[] mBasicAngles; |
| 149 |
private int mIconMode; |
|
| 146 | 150 |
|
| 147 | 151 |
//////////////////// SOLVED1 //////////////////////// |
| 148 | 152 |
|
| ... | ... | |
| 152 | 156 |
|
| 153 | 157 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 154 | 158 |
|
| 155 |
TwistyObject(InputStream jsonStream, int meshState, Static4D quat, Static3D move, float scale, InputStream meshStream) |
|
| 159 |
TwistyObject(InputStream jsonStream, int meshState, int iconMode, Static4D quat, Static3D move, float scale, InputStream meshStream)
|
|
| 156 | 160 |
{
|
| 157 | 161 |
JsonReader reader = JsonReader.getInstance(); |
| 158 | 162 |
reader.parseJsonFile(jsonStream); |
| ... | ... | |
| 160 | 164 |
|
| 161 | 165 |
mNumLayers = reader.getNumLayers(); |
| 162 | 166 |
mSize = reader.getSize(); |
| 163 |
initialize(meshState,quat,move,scale,meshStream,true); |
|
| 167 |
initialize(meshState,iconMode,quat,move,scale,meshStream,true);
|
|
| 164 | 168 |
} |
| 165 | 169 |
|
| 166 | 170 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 167 | 171 |
|
| 168 |
TwistyObject(int[] numLayers, int meshState, float size, Static4D quat, Static3D move, float scale, InputStream meshStream) |
|
| 172 |
TwistyObject(int[] numLayers, int meshState, int iconMode, float size, Static4D quat, Static3D move, float scale, InputStream meshStream)
|
|
| 169 | 173 |
{
|
| 170 | 174 |
mNumLayers = numLayers; |
| 171 | 175 |
mSize = size; |
| 172 |
initialize(meshState,quat,move,scale,meshStream,false); |
|
| 176 |
initialize(meshState,iconMode,quat,move,scale,meshStream,false);
|
|
| 173 | 177 |
} |
| 174 | 178 |
|
| 175 | 179 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 176 | 180 |
|
| 177 |
private void initialize(int meshState,Static4D quat, Static3D move, float scale, InputStream stream, boolean fromJSON) |
|
| 181 |
private void initialize(int meshState, int iconMode, Static4D quat, Static3D move, float scale, InputStream stream, boolean fromJSON)
|
|
| 178 | 182 |
{
|
| 183 |
mIconMode = iconMode; |
|
| 179 | 184 |
mQuat = quat; |
| 180 | 185 |
mAxis = getRotationAxis(); |
| 181 | 186 |
mInitScreenRatio = getScreenRatio(); |
| ... | ... | |
| 450 | 455 |
return mQuatMult[index1][index2]; |
| 451 | 456 |
} |
| 452 | 457 |
|
| 458 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 459 |
|
|
| 460 |
public boolean isInIconMode() |
|
| 461 |
{
|
|
| 462 |
return mIconMode==MODE_ICON; |
|
| 463 |
} |
|
| 464 |
|
|
| 453 | 465 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 454 | 466 |
|
| 455 | 467 |
public int getVariantFaceColor(int variant, int face) |
Also available in: Unified diff
Mode the 'iconMode' from static variable in ObjectControl to member varaible in TwistyObject (safer)