Revision ad38d800
Added by Leszek Koltunski over 3 years ago
| src/main/java/org/distorted/objects/RubikObjectList.java | ||
|---|---|---|
| 42 | 42 |
{5 , 24, R.raw.cube5, R.drawable.ui_small_cube5, R.drawable.ui_medium_cube5, R.drawable.ui_big_cube5, R.drawable.ui_huge_cube5}
|
| 43 | 43 |
}, |
| 44 | 44 |
RubikCube.class, |
| 45 |
new RubikCubeMovement()
|
|
| 45 |
new RubikMovementCube()
|
|
| 46 | 46 |
), |
| 47 | 47 |
|
| 48 | 48 |
PYRA ( |
| ... | ... | |
| 52 | 52 |
{5 , 20, R.raw.pyra5, R.drawable.ui_small_pyra5, R.drawable.ui_medium_pyra5, R.drawable.ui_big_pyra5, R.drawable.ui_huge_pyra5}
|
| 53 | 53 |
}, |
| 54 | 54 |
RubikPyraminx.class, |
| 55 |
new RubikPyraminxMovement()
|
|
| 55 |
new RubikMovementPyraminx()
|
|
| 56 | 56 |
), |
| 57 | 57 |
|
| 58 | 58 |
DINO ( |
| ... | ... | |
| 60 | 60 |
{3 , 10, R.raw.pyra3, R.drawable.ui_small_dino, R.drawable.ui_medium_dino, R.drawable.ui_big_dino, R.drawable.ui_huge_dino} ,
|
| 61 | 61 |
}, |
| 62 | 62 |
RubikDino.class, |
| 63 |
new RubikDinoMovement()
|
|
| 63 |
new RubikMovementDino()
|
|
| 64 | 64 |
), |
| 65 | 65 |
; |
| 66 | 66 |
|
| ... | ... | |
| 71 | 71 |
|
| 72 | 72 |
private final int[] mObjectSizes, mMaxLevels, mSmallIconIDs, mMediumIconIDs, mBigIconIDs, mHugeIconIDs, mResourceIDs; |
| 73 | 73 |
private final Class<? extends RubikObject> mObjectClass; |
| 74 |
private final RubikObjectMovement mObjectMovementClass;
|
|
| 74 |
private final RubikMovementObject mObjectMovementClass;
|
|
| 75 | 75 |
private static final RubikObjectList[] objects; |
| 76 | 76 |
private static int mNumAll; |
| 77 | 77 |
|
| ... | ... | |
| 283 | 283 |
|
| 284 | 284 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 285 | 285 |
|
| 286 |
RubikObjectList(int[][] info, Class<? extends RubikObject> object , RubikObjectMovement movement)
|
|
| 286 |
RubikObjectList(int[][] info, Class<? extends RubikObject> object , RubikMovementObject movement)
|
|
| 287 | 287 |
{
|
| 288 | 288 |
int length = info.length; |
| 289 | 289 |
|
| ... | ... | |
| 373 | 373 |
|
| 374 | 374 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 375 | 375 |
|
| 376 |
public RubikObjectMovement getObjectMovementClass()
|
|
| 376 |
public RubikMovementObject getObjectMovementClass()
|
|
| 377 | 377 |
{
|
| 378 | 378 |
return mObjectMovementClass; |
| 379 | 379 |
} |
Also available in: Unified diff
Introduce separate ROT_AXIS and FACE_AXIS ( step 1 )