Revision a76330cc
Added by Leszek Koltunski over 1 year ago
| src/main/java/org/distorted/objectlib/main/ObjectControl.java | ||
|---|---|---|
| 77 | 77 |
private final float[] mAxis; |
| 78 | 78 |
private int mMeshState, mIconMode; |
| 79 | 79 |
private boolean mRotateOnCreation; |
| 80 |
|
|
| 81 |
private static final Static4D mQuat= new Static4D(-0.25189602f,0.3546389f,0.009657208f,0.90038127f); |
|
| 82 |
private static final Static4D mTemp= new Static4D(0,0,0,1); |
|
| 80 |
private final Static4D mQuat,mTemp; |
|
| 83 | 81 |
|
| 84 | 82 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 85 | 83 |
|
| ... | ... | |
| 553 | 551 |
mBuffer = new int[2]; |
| 554 | 552 |
mAxis = new float[2]; |
| 555 | 553 |
|
| 554 |
mQuat= new Static4D(-0.25189602f,0.3546389f,0.009657208f,0.90038127f); |
|
| 555 |
mTemp= new Static4D(0,0,0,1); |
|
| 556 |
|
|
| 556 | 557 |
mCurrRotSpeed= 0.0f; |
| 557 | 558 |
mLastMode = -1; |
| 558 | 559 |
mRotateOnCreation = false; |
| src/main/java/org/distorted/objectlib/main/ObjectSignatures.java | ||
|---|---|---|
| 77 | 77 |
public static final int CRA8_3 = ObjectType.CRA8_3.ordinal(); |
| 78 | 78 |
public static final int CRA9_3 = ObjectType.CRA9_3.ordinal(); |
| 79 | 79 |
public static final int PDUO_2 = ObjectType.PDUO_2.ordinal(); |
| 80 |
public static final int BALL_4 = ObjectType.BALL_4.ordinal(); |
|
| 80 | 81 |
} |
| src/main/java/org/distorted/objectlib/main/ObjectType.java | ||
|---|---|---|
| 23 | 23 |
|
| 24 | 24 |
public enum ObjectType |
| 25 | 25 |
{
|
| 26 |
BALL_4 ( TwistyMasterball.class , 28, R.drawable.mixp_3, true , false, new InitData(new int[] {4,2,2,2,2})),
|
|
| 27 |
|
|
| 28 | 26 |
CUBE_2 ( TwistyCuboid.class , 12, R.drawable.cube_2, true, true, new InitData(new int[] {2,2,2})),
|
| 29 | 27 |
CUBE_3 ( TwistyCuboid.class , 17, R.drawable.cube_3, true, true, new InitData(new int[] {3,3,3})),
|
| 30 | 28 |
CUBE_4 ( TwistyCuboid.class , 24, R.drawable.cube_4, true, false, new InitData(new int[] {4,4,4})),
|
| ... | ... | |
| 86 | 84 |
MIXU_3 ( TwistyMixup3x3.class , 24, R.drawable.mixu_3, true, false, new InitData(new int[] {3,3,3})),
|
| 87 | 85 |
|
| 88 | 86 |
MIXP_3 ( TwistyMixup3x3Plus.class , 28, R.drawable.mixp_3, true , false, new InitData(new int[] {3,3,3})),
|
| 87 |
BALL_4 ( TwistyMasterball.class , 28, R.drawable.ball_4, true , false, new InitData(new int[] {4,2,2,2,2})),
|
|
| 89 | 88 |
PDUO_2 ( TwistyPyraminxDuo.class , 4, R.drawable.pduo_2, false, false, new InitData(new int[] {2,2,2,2})),
|
| 90 | 89 |
MORP_3 ( TwistyMorphix.class , 17, R.drawable.morp_3, false, false, new InitData(new int[] {3,3,3})),
|
| 91 | 90 |
MORP_4 ( TwistyMorphix.class , 24, R.drawable.morp_4, false, false, new InitData(new int[] {4,4,4})),
|
| src/main/java/org/distorted/objectlib/shape/ShapeDiamond.java | ||
|---|---|---|
| 20 | 20 |
|
| 21 | 21 |
public abstract class ShapeDiamond extends TwistyObject |
| 22 | 22 |
{
|
| 23 |
public static final Static4D DEFAULT_ROT = new Static4D(-0.31521368f, 0.36868167f, -0.6488994f, 0.5862124f);
|
|
| 23 |
public static final Static4D DEFAULT_ROT = new Static4D(-0.09848663f, 0.6306283f, 0.67572856f, 0.36878252f);
|
|
| 24 | 24 |
|
| 25 | 25 |
public static final int COLOR_BALL_1 = 0xffff0000; |
| 26 | 26 |
public static final int COLOR_BALL_2 = 0xffcb2d6a; |
Also available in: Unified diff
Masterball: icon, mesh, jsons.