Revision 3bf19410
Added by Leszek Koltunski about 2 years ago
| src/main/java/org/distorted/objectlib/objects/TwistyUltimate.java | ||
|---|---|---|
| 29 | 29 |
|
| 30 | 30 |
import org.distorted.objectlib.helpers.ObjectFaceShape; |
| 31 | 31 |
import org.distorted.objectlib.touchcontrol.TouchControlDodecahedron; |
| 32 |
import org.distorted.objectlib.main.ObjectControl; |
|
| 33 | 32 |
import org.distorted.objectlib.main.ObjectType; |
| 34 | 33 |
import org.distorted.objectlib.helpers.ObjectShape; |
| 35 | 34 |
import org.distorted.objectlib.scrambling.ScrambleState; |
| ... | ... | |
| 62 | 61 |
|
| 63 | 62 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 64 | 63 |
|
| 65 |
public TwistyUltimate(int[] numL, int meshState, Static4D quat, Static3D move, float scale, InputStream stream) |
|
| 64 |
public TwistyUltimate(int[] numL, int meshState, int iconMode, Static4D quat, Static3D move, float scale, InputStream stream)
|
|
| 66 | 65 |
{
|
| 67 |
super(numL, meshState, numL[0], quat, move, scale, stream); |
|
| 66 |
super(numL, meshState, iconMode, numL[0], quat, move, scale, stream);
|
|
| 68 | 67 |
} |
| 69 | 68 |
|
| 70 | 69 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| ... | ... | |
| 214 | 213 |
{
|
| 215 | 214 |
if( variant==0 ) |
| 216 | 215 |
{
|
| 217 |
float[][] bands = { {0.03f,17,0.5f,0.2f,5,2,2}, {0.01f, 1,0.5f,0.2f,5,2,2} };
|
|
| 216 |
float h1 = isInIconMode() ? 0.001f : 0.03f; |
|
| 217 |
float h2 = isInIconMode() ? 0.001f : 0.01f; |
|
| 218 |
float[][] bands = { {h1,17,0.5f,0.2f,5,2,2}, {h2, 1,0.5f,0.2f,5,2,2} };
|
|
| 218 | 219 |
int[] bandIndices = { 0,0,0,1,1,1 };
|
| 219 | 220 |
float[][] corners = { { 0.013f, 0.16f } };
|
| 220 | 221 |
int[] cornerIndices = { 0, 0, 0, 0,-1, 0, 0, 0 };
|
| ... | ... | |
| 224 | 225 |
} |
| 225 | 226 |
else if( variant==1 ) |
| 226 | 227 |
{
|
| 227 |
float[][] bands = { {0.03f,17,0.5f,0.2f,5,2,2}, {0.01f, 1,0.5f,0.2f,5,2,2} };
|
|
| 228 |
float h1 = isInIconMode() ? 0.001f : 0.03f; |
|
| 229 |
float h2 = isInIconMode() ? 0.001f : 0.01f; |
|
| 230 |
float[][] bands = { {h1,17,0.5f,0.2f,5,2,2}, {h2, 1,0.5f,0.2f,5,2,2} };
|
|
| 228 | 231 |
int[] bandIndices = { 0,0,0,1,1,1 };
|
| 229 | 232 |
float[][] corners = { { 0.013f, 0.16f } };
|
| 230 | 233 |
int[] cornerIndices = { 0, 0, 0, 0,-1, 0, 0, 0 };
|
| ... | ... | |
| 234 | 237 |
} |
| 235 | 238 |
else |
| 236 | 239 |
{
|
| 237 |
float[][] bands = { {0.04f,17,0.5f,0.2f,5,2,2}, {0.03f,17,0.5f,0.2f,5,2,2}, {0.01f, 1,0.5f,0.2f,5,2,2} };
|
|
| 240 |
float h1 = isInIconMode() ? 0.001f : 0.04f; |
|
| 241 |
float h2 = isInIconMode() ? 0.001f : 0.03f; |
|
| 242 |
float h3 = isInIconMode() ? 0.001f : 0.01f; |
|
| 243 |
float[][] bands = { {h1,17,0.5f,0.2f,5,2,2}, {h2,17,0.5f,0.2f,5,2,2}, {h3, 1,0.5f,0.2f,5,2,2} };
|
|
| 238 | 244 |
int[] bandIndices = { 0,0,1,1,2,2,2,2 };
|
| 239 | 245 |
float[][] corners = { { 0.013f, 0.16f } };
|
| 240 | 246 |
int[] cornerIndices = { 0,0,0,0,0,0,0,0,0,0,-1 };
|
| ... | ... | |
| 328 | 334 |
|
| 329 | 335 |
public float getStickerStroke() |
| 330 | 336 |
{
|
| 331 |
return ObjectControl.isInIconMode() ? 0.22f : 0.15f;
|
|
| 337 |
return isInIconMode() ? 0.22f : 0.15f; |
|
| 332 | 338 |
} |
| 333 | 339 |
|
| 334 | 340 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
Also available in: Unified diff
Mode the 'iconMode' from static variable in ObjectControl to member varaible in TwistyObject (safer)