Revision 27249eea
Added by Leszek Koltunski over 1 year ago
| src/main/java/org/distorted/objectlib/main/ObjectType.java | ||
|---|---|---|
| 101 | 101 |
|
| 102 | 102 |
CA_333 ( TwistyCamouflage.class , 32, R.drawable.din4_3, true, 50, new InitData(new int[] {4,4,4}, TwistyCamouflage.CAM_333)),
|
| 103 | 103 |
|
| 104 |
PDUO_2 ( TwistyPyraminxDuo.class , 4, R.drawable.pduo_2, false, 0, new InitData(new int[] {2,2,2,2})),
|
|
| 105 |
PDIA_3 ( TwistyPyraminxDiamond.class, 12, R.drawable.pdia_3, false, 40, new InitData(new int[] {3,3,3})),
|
|
| 106 |
BALL_4 ( TwistyMasterball.class , 28, R.drawable.ball_4, false, 70, new InitData(new int[] {4,2,2,2,2})),
|
|
| 104 |
PDUO_2 ( TwistyPyraminxDuo.class , 4, R.drawable.pduo_2, true, 0, new InitData(new int[] {2,2,2,2})),
|
|
| 105 |
PDIA_3 ( TwistyPyraminxDiamond.class, 12, R.drawable.pdia_3, true, 40, new InitData(new int[] {3,3,3})),
|
|
| 106 |
BALL_4 ( TwistyMasterball.class , 28, R.drawable.ball_4, true, 70, new InitData(new int[] {4,2,2,2,2})),
|
|
| 107 | 107 |
; |
| 108 | 108 |
|
| 109 | 109 |
public static int NUM_OBJECTS; |
| ... | ... | |
| 186 | 186 |
|
| 187 | 187 |
public static TwistyObject create(int ordinal, int meshState, int iconMode, Static4D quat, Static3D move, float scale, InputStream meshStream) |
| 188 | 188 |
{
|
| 189 |
|
|
| 190 |
if( ordinal==CUBE_2.ordinal() )
|
|
| 189 |
/* |
|
| 190 |
if( ordinal==MORP_2.ordinal() )
|
|
| 191 | 191 |
{
|
| 192 |
return new TwistyCuboid(objects[ordinal].mInitData,meshState,iconMode,quat,move,scale,meshStream);
|
|
| 192 |
return new TwistyMorphix(objects[ordinal].mInitData,meshState,iconMode,quat,move,scale,meshStream);
|
|
| 193 | 193 |
} |
| 194 |
|
|
| 194 |
*/ |
|
| 195 | 195 |
Class<? extends TwistyObject> clazz = objects[ordinal].mClass; |
| 196 | 196 |
|
| 197 | 197 |
try |
Also available in: Unified diff
Produce new JSONs files (version 7, with new scrambling method)