Revision df9739f8
Added by Leszek Koltunski almost 3 years ago
| src/main/java/org/distorted/objects/ObjectList.java | ||
|---|---|---|
| 49 | 49 |
60 |
| 50 | 50 |
), |
| 51 | 51 |
|
| 52 |
PYRA (
|
|
| 52 |
JING (
|
|
| 53 | 53 |
new int[][] {
|
| 54 |
{3 , 10, 10, R.raw.pyra3, R.drawable.ui_small_pyra3, R.drawable.ui_medium_pyra3, R.drawable.ui_big_pyra3, R.drawable.ui_huge_pyra3} ,
|
|
| 55 |
{4 , 15, 17, R.raw.pyra4, R.drawable.ui_small_pyra4, R.drawable.ui_medium_pyra4, R.drawable.ui_big_pyra4, R.drawable.ui_huge_pyra4} ,
|
|
| 56 |
{5 , 20, 23, R.raw.pyra5, R.drawable.ui_small_pyra5, R.drawable.ui_medium_pyra5, R.drawable.ui_big_pyra5, R.drawable.ui_huge_pyra5}
|
|
| 54 |
{2 , 10, 10, 0, R.drawable.ui_small_ulti, R.drawable.ui_medium_ulti, R.drawable.ui_big_ulti, R.drawable.ui_huge_ulti} ,
|
|
| 57 | 55 |
}, |
| 58 |
TwistyPyraminx.class,
|
|
| 59 |
new MovementPyraminx(),
|
|
| 56 |
TwistyJing.class,
|
|
| 57 |
new MovementJing(),
|
|
| 60 | 58 |
1, |
| 61 | 59 |
30 |
| 62 | 60 |
), |
| 63 | 61 |
|
| 64 |
ULTI (
|
|
| 62 |
PYRA (
|
|
| 65 | 63 |
new int[][] {
|
| 66 |
{2 , 18, 18, R.raw.ulti, R.drawable.ui_small_ulti, R.drawable.ui_medium_ulti, R.drawable.ui_big_ulti, R.drawable.ui_huge_ulti} ,
|
|
| 64 |
{3 , 10, 10, R.raw.pyra3, R.drawable.ui_small_pyra3, R.drawable.ui_medium_pyra3, R.drawable.ui_big_pyra3, R.drawable.ui_huge_pyra3} ,
|
|
| 65 |
{4 , 15, 17, R.raw.pyra4, R.drawable.ui_small_pyra4, R.drawable.ui_medium_pyra4, R.drawable.ui_big_pyra4, R.drawable.ui_huge_pyra4} ,
|
|
| 66 |
{5 , 20, 23, R.raw.pyra5, R.drawable.ui_small_pyra5, R.drawable.ui_medium_pyra5, R.drawable.ui_big_pyra5, R.drawable.ui_huge_pyra5}
|
|
| 67 | 67 |
}, |
| 68 |
TwistyUltimate.class,
|
|
| 69 |
new MovementUltimate(),
|
|
| 68 |
TwistyPyraminx.class,
|
|
| 69 |
new MovementPyraminx(),
|
|
| 70 | 70 |
1, |
| 71 | 71 |
30 |
| 72 | 72 |
), |
| ... | ... | |
| 234 | 234 |
6, |
| 235 | 235 |
60 |
| 236 | 236 |
), |
| 237 |
|
|
| 238 |
ULTI ( |
|
| 239 |
new int[][] {
|
|
| 240 |
{2 , 18, 18, R.raw.ulti, R.drawable.ui_small_ulti, R.drawable.ui_medium_ulti, R.drawable.ui_big_ulti, R.drawable.ui_huge_ulti} ,
|
|
| 241 |
}, |
|
| 242 |
TwistyUltimate.class, |
|
| 243 |
new MovementUltimate(), |
|
| 244 |
7, |
|
| 245 |
30 |
|
| 246 |
), |
|
| 237 | 247 |
; |
| 238 | 248 |
|
| 239 | 249 |
public static final int NUM_OBJECTS = values().length; |
| ... | ... | |
| 642 | 652 |
switch(ordinal()) |
| 643 | 653 |
{
|
| 644 | 654 |
case 0: return new TwistyCube (size, quat, texture, mesh, effects, moves, res, scrWidth); |
| 645 |
case 1: return new TwistyPyraminx (size, quat, texture, mesh, effects, moves, res, scrWidth);
|
|
| 646 |
case 2: return new TwistyUltimate (size, quat, texture, mesh, effects, moves, res, scrWidth);
|
|
| 655 |
case 1: return new TwistyJing (size, quat, texture, mesh, effects, moves, res, scrWidth);
|
|
| 656 |
case 2: return new TwistyPyraminx (size, quat, texture, mesh, effects, moves, res, scrWidth);
|
|
| 647 | 657 |
case 3: return new TwistyKilominx (size, quat, texture, mesh, effects, moves, res, scrWidth); |
| 648 | 658 |
case 4: return new TwistyMegaminx (size, quat, texture, mesh, effects, moves, res, scrWidth); |
| 649 | 659 |
case 5: return new TwistyDino6 (size, quat, texture, mesh, effects, moves, res, scrWidth); |
| ... | ... | |
| 660 | 670 |
case 16: return new TwistyDiamond (size, quat, texture, mesh, effects, moves, res, scrWidth); |
| 661 | 671 |
case 17: return new TwistySquare1 (size, quat, texture, mesh, effects, moves, res, scrWidth); |
| 662 | 672 |
case 18: return new TwistySquare2 (size, quat, texture, mesh, effects, moves, res, scrWidth); |
| 673 |
case 19: return new TwistyUltimate (size, quat, texture, mesh, effects, moves, res, scrWidth); |
|
| 663 | 674 |
} |
| 664 | 675 |
|
| 665 | 676 |
return null; |
Also available in: Unified diff
New 'JingPyraminx' object.