Revision 7ac0ee88
Added by Leszek Koltunski over 2 years ago
src/main/java/org/distorted/patterns/RubikPatternList.java | ||
---|---|---|
25 | 25 |
|
26 | 26 |
public enum RubikPatternList |
27 | 27 |
{ |
28 |
CUBE2 (ObjectList.CUBE, 2, PatternCube2.patterns),
|
|
29 |
CUBE3 (ObjectList.CUBE, 3, PatternCube3.patterns),
|
|
30 |
CUBE4 (ObjectList.CUBE, 4, PatternCube4.patterns),
|
|
31 |
CUBE5 (ObjectList.CUBE, 5, PatternCube5.patterns),
|
|
32 |
PYRA3 (ObjectList.PYRA, 3, PatternPyraminx3.patterns),
|
|
33 |
PYRA4 (ObjectList.PYRA, 4, PatternPyraminx4.patterns),
|
|
34 |
PYRA5 (ObjectList.PYRA, 5, PatternPyraminx5.patterns),
|
|
35 |
MEGA3 (ObjectList.MEGA, 3, PatternMegaminx.patterns),
|
|
36 |
MEGA5 (ObjectList.MEGA, 5, PatternGigaminx.patterns),
|
|
28 |
CUBE2 (ObjectList.CUBE_2, PatternCube2.patterns),
|
|
29 |
CUBE3 (ObjectList.CUBE_3, PatternCube3.patterns),
|
|
30 |
CUBE4 (ObjectList.CUBE_4, PatternCube4.patterns),
|
|
31 |
CUBE5 (ObjectList.CUBE_5, PatternCube5.patterns),
|
|
32 |
PYRA3 (ObjectList.PYRA_3, PatternPyraminx3.patterns),
|
|
33 |
PYRA4 (ObjectList.PYRA_4, PatternPyraminx4.patterns),
|
|
34 |
PYRA5 (ObjectList.PYRA_5, PatternPyraminx5.patterns),
|
|
35 |
MEGA3 (ObjectList.MEGA_3, PatternMegaminx.patterns),
|
|
36 |
MEGA5 (ObjectList.MEGA_5, PatternGigaminx.patterns),
|
|
37 | 37 |
; |
38 | 38 |
|
39 | 39 |
public static final int NUM_OBJECTS = values().length; |
40 | 40 |
private final ObjectList mObject; |
41 |
private final int mSize; |
|
42 | 41 |
private final String[][] mPatterns; |
43 | 42 |
|
44 | 43 |
private static final RubikPatternList[] objects; |
... | ... | |
63 | 62 |
|
64 | 63 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
65 | 64 |
|
66 |
RubikPatternList(ObjectList object, int size, String[][] patterns)
|
|
65 |
RubikPatternList(ObjectList object, String[][] patterns) |
|
67 | 66 |
{ |
68 | 67 |
mObject = object; |
69 |
mSize = size; |
|
70 | 68 |
mPatterns = patterns; |
71 | 69 |
} |
72 | 70 |
|
... | ... | |
74 | 72 |
// PUBLIC API |
75 | 73 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
76 | 74 |
|
77 |
public static int getOrdinal(int objectOrdinal, int size)
|
|
75 |
public static int getOrdinal(int object) |
|
78 | 76 |
{ |
79 | 77 |
for(int i=0; i<NUM_OBJECTS; i++) |
80 | 78 |
{ |
81 |
if( objects[i].mObject.ordinal() == objectOrdinal && objects[i].mSize == size )
|
|
79 |
if( objects[i].mObject.ordinal() == object ) |
|
82 | 80 |
{ |
83 | 81 |
return i; |
84 | 82 |
} |
... | ... | |
93 | 91 |
{ |
94 | 92 |
return objects[ordinal].mObject; |
95 | 93 |
} |
96 |
|
|
97 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
98 |
|
|
99 |
public static int getSize(int ordinal) |
|
100 |
{ |
|
101 |
return objects[ordinal].mSize; |
|
102 |
} |
|
103 | 94 |
} |
Also available in: Unified diff
Simplify ObjectList: now there's just one object per size.