Revision 61aa85e4
Added by Leszek Koltunski over 2 years ago
src/main/java/org/distorted/objectlib/main/ObjectList.java | ||
---|---|---|
19 | 19 |
|
20 | 20 |
package org.distorted.objectlib.main; |
21 | 21 |
|
22 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
23 |
|
|
24 |
/* |
|
25 |
CUBE_2 ( 0, new int[] {2 , 12, 12, R.raw.cube2, R.drawable.ui_small_cube2, R.drawable.ui_medium_cube2, R.drawable.ui_big_cube2, R.drawable.ui_huge_cube2} ), |
|
26 |
CUBE_3 ( 0, new int[] {3 , 16, 17, R.raw.cube3, R.drawable.ui_small_cube3, R.drawable.ui_medium_cube3, R.drawable.ui_big_cube3, R.drawable.ui_huge_cube3} ), |
|
27 |
CUBE_4 ( 0, new int[] {4 , 20, 24, R.raw.cube4, R.drawable.ui_small_cube4, R.drawable.ui_medium_cube4, R.drawable.ui_big_cube4, R.drawable.ui_huge_cube4} ), |
|
28 |
CUBE_5 ( 0, new int[] {5 , 24, 28, R.raw.cube5, R.drawable.ui_small_cube5, R.drawable.ui_medium_cube5, R.drawable.ui_big_cube5, R.drawable.ui_huge_cube5} ), |
|
29 |
JING_2 ( 1, new int[] {2 , 11, 11, R.raw.jing , R.drawable.ui_small_jing2, R.drawable.ui_medium_jing2, R.drawable.ui_big_jing2, R.drawable.ui_huge_jing2} ), |
|
30 |
PYRA_3 ( 1, new int[] {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} ), |
|
31 |
PYRA_4 ( 1, new int[] {4 , 14, 17, R.raw.pyra4, R.drawable.ui_small_pyra4, R.drawable.ui_medium_pyra4, R.drawable.ui_big_pyra4, R.drawable.ui_huge_pyra4} ), |
|
32 |
PYRA_5 ( 1, new int[] {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} ), |
|
33 |
KILO_3 ( 2, new int[] {3 , 18, 18, R.raw.kilo3, R.drawable.ui_small_kilo3, R.drawable.ui_medium_kilo3, R.drawable.ui_big_kilo3, R.drawable.ui_huge_kilo3} ), |
|
34 |
KILO_5 ( 2, new int[] {5 , 33, 33, R.raw.kilo5, R.drawable.ui_small_kilo5, R.drawable.ui_medium_kilo5, R.drawable.ui_big_kilo5, R.drawable.ui_huge_kilo5} ), |
|
35 |
MEGA_3 ( 2, new int[] {3 , 21, 21, R.raw.mega3, R.drawable.ui_small_mega3, R.drawable.ui_medium_mega3, R.drawable.ui_big_mega3, R.drawable.ui_huge_mega3} ), |
|
36 |
MEGA_5 ( 2, new int[] {5 , 35, 37, R.raw.mega5, R.drawable.ui_small_mega5, R.drawable.ui_medium_mega5, R.drawable.ui_big_mega5, R.drawable.ui_huge_mega5} ), |
|
37 |
ULTI_2 ( 3, new int[] {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 } ), |
|
38 |
DIAM_2 ( 3, new int[] {2 , 10, 12, R.raw.diam2, R.drawable.ui_small_diam2, R.drawable.ui_medium_diam2, R.drawable.ui_big_diam2, R.drawable.ui_huge_diam2} ), |
|
39 |
DIAM_3 ( 3, new int[] {3 , 18, 24, R.raw.diam3, R.drawable.ui_small_diam3, R.drawable.ui_medium_diam3, R.drawable.ui_big_diam3, R.drawable.ui_huge_diam3} ), |
|
40 |
DIAM_4 ( 3, new int[] {4 , 32, 32, R.raw.diam4, R.drawable.ui_small_diam4, R.drawable.ui_medium_diam4, R.drawable.ui_big_diam4, R.drawable.ui_huge_diam4} ), |
|
41 |
DINO_3 ( 4, new int[] {3 , 10, 10, R.raw.dino , R.drawable.ui_small_dino , R.drawable.ui_medium_dino , R.drawable.ui_big_dino , R.drawable.ui_huge_dino } ), |
|
42 |
DIN4_3 ( 4, new int[] {3 , 7, 7, R.raw.dino , R.drawable.ui_small_din4 , R.drawable.ui_medium_din4 , R.drawable.ui_big_din4 , R.drawable.ui_huge_din4 } ), |
|
43 |
REDI_3 ( 4, new int[] {3 , 14, 16, R.raw.redi , R.drawable.ui_small_redi , R.drawable.ui_medium_redi , R.drawable.ui_big_redi , R.drawable.ui_huge_redi } ), |
|
44 |
HELI_3 ( 4, new int[] {3 , 18, 20, R.raw.heli , R.drawable.ui_small_heli , R.drawable.ui_medium_heli , R.drawable.ui_big_heli , R.drawable.ui_huge_heli } ), |
|
45 |
SKEW_2 ( 5, new int[] {2 , 11, 11, R.raw.skew2, R.drawable.ui_small_skew2, R.drawable.ui_medium_skew2, R.drawable.ui_big_skew2, R.drawable.ui_huge_skew2} ), |
|
46 |
SKEW_3 ( 5, new int[] {3 , 17, 21, R.raw.skew3, R.drawable.ui_small_skew3, R.drawable.ui_medium_skew3, R.drawable.ui_big_skew3, R.drawable.ui_huge_skew3} ), |
|
47 |
IVY_2 ( 5, new int[] {2 , 8, 8, R.raw.ivy , R.drawable.ui_small_ivy , R.drawable.ui_medium_ivy , R.drawable.ui_big_ivy , R.drawable.ui_huge_ivy } ), |
|
48 |
REX_3 ( 5, new int[] {3 , 16, 19, R.raw.rex , R.drawable.ui_small_rex , R.drawable.ui_medium_rex , R.drawable.ui_big_rex , R.drawable.ui_huge_rex } ), |
|
49 |
BAN1_3 ( 6, new int[] {3 , 16, 16, R.raw.ban1 , R.drawable.ui_small_ban1 , R.drawable.ui_medium_ban1 , R.drawable.ui_big_ban1 , R.drawable.ui_huge_ban1 } ), |
|
50 |
BAN2_3 ( 6, new int[] {3 , 16, 16, R.raw.ban2 , R.drawable.ui_small_ban2 , R.drawable.ui_medium_ban2 , R.drawable.ui_big_ban2 , R.drawable.ui_huge_ban2 } ), |
|
51 |
BAN3_3 ( 6, new int[] {3 , 16, 16, R.raw.ban3 , R.drawable.ui_small_ban3 , R.drawable.ui_medium_ban3 , R.drawable.ui_big_ban3 , R.drawable.ui_huge_ban3 } ), |
|
52 |
BAN4_3 ( 6, new int[] {3 , 16, 16, R.raw.ban4 , R.drawable.ui_small_ban4 , R.drawable.ui_medium_ban4 , R.drawable.ui_big_ban4 , R.drawable.ui_huge_ban4 } ), |
|
53 |
SQU1_3 ( 7, new int[] {3 , 24, 24, R.raw.squa1, R.drawable.ui_small_squa1, R.drawable.ui_medium_squa1, R.drawable.ui_big_squa1, R.drawable.ui_huge_squa1} ), |
|
54 |
SQU2_3 ( 7, new int[] {3 , 24, 24, R.raw.squa2, R.drawable.ui_small_squa2, R.drawable.ui_medium_squa2, R.drawable.ui_big_squa2, R.drawable.ui_huge_squa2} ), |
|
55 |
MIRR_2 ( 7, new int[] {2 , 12, 12, R.raw.mirr2, R.drawable.ui_small_mirr2, R.drawable.ui_medium_mirr2, R.drawable.ui_big_mirr2, R.drawable.ui_huge_mirr2} ), |
|
56 |
MIRR_3 ( 7, new int[] {3 , 16, 17, R.raw.mirr3, R.drawable.ui_small_mirr3, R.drawable.ui_medium_mirr3, R.drawable.ui_big_mirr3, R.drawable.ui_huge_mirr3} ), |
|
57 |
; |
|
58 |
*/ |
|
59 |
|
|
60 | 22 |
import android.content.res.Resources; |
61 | 23 |
|
62 | 24 |
import org.distorted.library.main.DistortedEffects; |
... | ... | |
86 | 48 |
import org.distorted.objectlib.objects.TwistySquare2; |
87 | 49 |
import org.distorted.objectlib.objects.TwistyUltimate; |
88 | 50 |
|
51 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
52 |
|
|
89 | 53 |
public enum ObjectList |
90 | 54 |
{ |
91 |
///////////////////// Size // DB Level // NumScrambles // Mesh // small icon // medium icon // big icon // huge icon |
|
92 |
|
|
93 |
CUBE ( |
|
94 |
new int[][] { |
|
95 |
{2 , 12, 12, R.drawable.ui_small_cube2, R.drawable.ui_medium_cube2, R.drawable.ui_big_cube2, R.drawable.ui_huge_cube2} , |
|
96 |
{3 , 16, 17, R.drawable.ui_small_cube3, R.drawable.ui_medium_cube3, R.drawable.ui_big_cube3, R.drawable.ui_huge_cube3} , |
|
97 |
{4 , 20, 24, R.drawable.ui_small_cube4, R.drawable.ui_medium_cube4, R.drawable.ui_big_cube4, R.drawable.ui_huge_cube4} , |
|
98 |
{5 , 24, 28, R.drawable.ui_small_cube5, R.drawable.ui_medium_cube5, R.drawable.ui_big_cube5, R.drawable.ui_huge_cube5} |
|
99 |
}, |
|
100 |
0 |
|
101 |
), |
|
102 |
|
|
103 |
JING ( |
|
104 |
new int[][] { |
|
105 |
{2 , 11, 11, R.drawable.ui_small_jing2, R.drawable.ui_medium_jing2, R.drawable.ui_big_jing2, R.drawable.ui_huge_jing2} , |
|
106 |
}, |
|
107 |
1 |
|
108 |
), |
|
109 |
|
|
110 |
PYRA ( |
|
111 |
new int[][] { |
|
112 |
{3 , 10, 10, R.drawable.ui_small_pyra3, R.drawable.ui_medium_pyra3, R.drawable.ui_big_pyra3, R.drawable.ui_huge_pyra3} , |
|
113 |
{4 , 15, 17, R.drawable.ui_small_pyra4, R.drawable.ui_medium_pyra4, R.drawable.ui_big_pyra4, R.drawable.ui_huge_pyra4} , |
|
114 |
{5 , 20, 23, R.drawable.ui_small_pyra5, R.drawable.ui_medium_pyra5, R.drawable.ui_big_pyra5, R.drawable.ui_huge_pyra5} |
|
115 |
}, |
|
116 |
1 |
|
117 |
), |
|
118 |
|
|
119 |
KILO ( |
|
120 |
new int[][] { |
|
121 |
{3 , 18, 18, R.drawable.ui_small_kilo3, R.drawable.ui_medium_kilo3, R.drawable.ui_big_kilo3, R.drawable.ui_huge_kilo3} , |
|
122 |
{5 , 33, 33, R.drawable.ui_small_kilo5, R.drawable.ui_medium_kilo5, R.drawable.ui_big_kilo5, R.drawable.ui_huge_kilo5} , |
|
123 |
}, |
|
124 |
2 |
|
125 |
), |
|
126 |
|
|
127 |
MEGA ( |
|
128 |
new int[][] { |
|
129 |
{3 , 21, 21, R.drawable.ui_small_mega3, R.drawable.ui_medium_mega3, R.drawable.ui_big_mega3, R.drawable.ui_huge_mega3} , |
|
130 |
{5 , 35, 37, R.drawable.ui_small_mega5, R.drawable.ui_medium_mega5, R.drawable.ui_big_mega5, R.drawable.ui_huge_mega5} , |
|
131 |
}, |
|
132 |
2 |
|
133 |
), |
|
134 |
|
|
135 |
ULTI ( |
|
136 |
new int[][] { |
|
137 |
{2 , 18, 18, R.drawable.ui_small_ulti, R.drawable.ui_medium_ulti, R.drawable.ui_big_ulti, R.drawable.ui_huge_ulti} , |
|
138 |
}, |
|
139 |
3 |
|
140 |
), |
|
141 |
|
|
142 |
DIAM ( |
|
143 |
new int[][] { |
|
144 |
{2 , 10, 12, R.drawable.ui_small_diam2, R.drawable.ui_medium_diam2, R.drawable.ui_big_diam2, R.drawable.ui_huge_diam2} , |
|
145 |
{3 , 18, 24, R.drawable.ui_small_diam3, R.drawable.ui_medium_diam3, R.drawable.ui_big_diam3, R.drawable.ui_huge_diam3} , |
|
146 |
{4 , 32, 32, R.drawable.ui_small_diam4, R.drawable.ui_medium_diam4, R.drawable.ui_big_diam4, R.drawable.ui_huge_diam4} , |
|
147 |
}, |
|
148 |
3 |
|
149 |
), |
|
150 |
|
|
151 |
DINO ( |
|
152 |
new int[][] { |
|
153 |
{3 , 10, 10, R.drawable.ui_small_dino, R.drawable.ui_medium_dino, R.drawable.ui_big_dino, R.drawable.ui_huge_dino} , |
|
154 |
}, |
|
155 |
4 |
|
156 |
), |
|
157 |
|
|
158 |
DIN4 ( |
|
159 |
new int[][] { |
|
160 |
{3 , 7, 7, R.drawable.ui_small_din4, R.drawable.ui_medium_din4, R.drawable.ui_big_din4, R.drawable.ui_huge_din4} , |
|
161 |
}, |
|
162 |
4 |
|
163 |
), |
|
164 |
|
|
165 |
REDI ( |
|
166 |
new int[][] { |
|
167 |
{3 , 14, 16, R.drawable.ui_small_redi, R.drawable.ui_medium_redi, R.drawable.ui_big_redi, R.drawable.ui_huge_redi} , |
|
168 |
}, |
|
169 |
4 |
|
170 |
), |
|
171 |
|
|
172 |
HELI ( |
|
173 |
new int[][] { |
|
174 |
{3 , 18, 20, R.drawable.ui_small_heli, R.drawable.ui_medium_heli, R.drawable.ui_big_heli, R.drawable.ui_huge_heli} , |
|
175 |
}, |
|
176 |
4 |
|
177 |
), |
|
178 |
|
|
179 |
SKEW ( |
|
180 |
new int[][] { |
|
181 |
{2 , 11, 11, R.drawable.ui_small_skew2, R.drawable.ui_medium_skew2, R.drawable.ui_big_skew2, R.drawable.ui_huge_skew2} , |
|
182 |
{3 , 17, 21, R.drawable.ui_small_skew3, R.drawable.ui_medium_skew3, R.drawable.ui_big_skew3, R.drawable.ui_huge_skew3} , |
|
183 |
}, |
|
184 |
5 |
|
185 |
), |
|
186 |
|
|
187 |
IVY ( |
|
188 |
new int[][] { |
|
189 |
{2 , 8, 8, R.drawable.ui_small_ivy, R.drawable.ui_medium_ivy, R.drawable.ui_big_ivy, R.drawable.ui_huge_ivy} , |
|
190 |
}, |
|
191 |
5 |
|
192 |
), |
|
193 |
|
|
194 |
REX ( |
|
195 |
new int[][] { |
|
196 |
{3 , 16, 19, R.drawable.ui_small_rex, R.drawable.ui_medium_rex, R.drawable.ui_big_rex, R.drawable.ui_huge_rex} , |
|
197 |
}, |
|
198 |
5 |
|
199 |
), |
|
200 |
|
|
201 |
BAN1 ( |
|
202 |
new int[][] { |
|
203 |
{3 , 16, 16, R.drawable.ui_small_ban1, R.drawable.ui_medium_ban1, R.drawable.ui_big_ban1, R.drawable.ui_huge_ban1} , |
|
204 |
}, |
|
205 |
6 |
|
206 |
), |
|
207 |
|
|
208 |
BAN2 ( |
|
209 |
new int[][] { |
|
210 |
{3 , 16, 16, R.drawable.ui_small_ban2, R.drawable.ui_medium_ban2, R.drawable.ui_big_ban2, R.drawable.ui_huge_ban2} , |
|
211 |
}, |
|
212 |
6 |
|
213 |
), |
|
214 |
|
|
215 |
BAN3 ( |
|
216 |
new int[][] { |
|
217 |
{3 , 16, 16, R.drawable.ui_small_ban3, R.drawable.ui_medium_ban3, R.drawable.ui_big_ban3, R.drawable.ui_huge_ban3} , |
|
218 |
}, |
|
219 |
6 |
|
220 |
), |
|
221 |
|
|
222 |
BAN4 ( |
|
223 |
new int[][] { |
|
224 |
{3 , 16, 16, R.drawable.ui_small_ban4, R.drawable.ui_medium_ban4, R.drawable.ui_big_ban4, R.drawable.ui_huge_ban4} , |
|
225 |
}, |
|
226 |
6 |
|
227 |
), |
|
228 |
|
|
229 |
SQU1 ( |
|
230 |
new int[][] { |
|
231 |
{3 , 24, 24, R.drawable.ui_small_squa1, R.drawable.ui_medium_squa1, R.drawable.ui_big_squa1, R.drawable.ui_huge_squa1} , |
|
232 |
}, |
|
233 |
7 |
|
234 |
), |
|
235 |
|
|
236 |
SQU2 ( |
|
237 |
new int[][] { |
|
238 |
{3 , 24, 24, R.drawable.ui_small_squa2, R.drawable.ui_medium_squa2, R.drawable.ui_big_squa2, R.drawable.ui_huge_squa2} , |
|
239 |
}, |
|
240 |
7 |
|
241 |
), |
|
242 |
|
|
243 |
MIRR ( |
|
244 |
new int[][] { |
|
245 |
{2 , 12, 12, R.drawable.ui_small_mirr2, R.drawable.ui_medium_mirr2, R.drawable.ui_big_mirr2, R.drawable.ui_huge_mirr2} , |
|
246 |
{3 , 16, 17, R.drawable.ui_small_mirr3, R.drawable.ui_medium_mirr3, R.drawable.ui_big_mirr3, R.drawable.ui_huge_mirr3} , |
|
247 |
}, |
|
248 |
7 |
|
249 |
), |
|
55 |
CUBE_2 ( 0, 2, 12, 12, R.drawable.small_cube2, R.drawable.medium_cube2, R.drawable.big_cube2, R.drawable.huge_cube2), |
|
56 |
CUBE_3 ( 0, 3, 16, 17, R.drawable.small_cube3, R.drawable.medium_cube3, R.drawable.big_cube3, R.drawable.huge_cube3), |
|
57 |
CUBE_4 ( 0, 4, 20, 24, R.drawable.small_cube4, R.drawable.medium_cube4, R.drawable.big_cube4, R.drawable.huge_cube4), |
|
58 |
CUBE_5 ( 0, 5, 24, 28, R.drawable.small_cube5, R.drawable.medium_cube5, R.drawable.big_cube5, R.drawable.huge_cube5), |
|
59 |
JING_2 ( 1, 2, 11, 11, R.drawable.small_jing2, R.drawable.medium_jing2, R.drawable.big_jing2, R.drawable.huge_jing2), |
|
60 |
PYRA_3 ( 1, 3, 10, 10, R.drawable.small_pyra3, R.drawable.medium_pyra3, R.drawable.big_pyra3, R.drawable.huge_pyra3), |
|
61 |
PYRA_4 ( 1, 4, 14, 17, R.drawable.small_pyra4, R.drawable.medium_pyra4, R.drawable.big_pyra4, R.drawable.huge_pyra4), |
|
62 |
PYRA_5 ( 1, 5, 20, 23, R.drawable.small_pyra5, R.drawable.medium_pyra5, R.drawable.big_pyra5, R.drawable.huge_pyra5), |
|
63 |
KILO_3 ( 2, 3, 18, 18, R.drawable.small_kilo3, R.drawable.medium_kilo3, R.drawable.big_kilo3, R.drawable.huge_kilo3), |
|
64 |
KILO_5 ( 2, 5, 33, 33, R.drawable.small_kilo5, R.drawable.medium_kilo5, R.drawable.big_kilo5, R.drawable.huge_kilo5), |
|
65 |
MEGA_3 ( 2, 3, 21, 21, R.drawable.small_mega3, R.drawable.medium_mega3, R.drawable.big_mega3, R.drawable.huge_mega3), |
|
66 |
MEGA_5 ( 2, 5, 35, 37, R.drawable.small_mega5, R.drawable.medium_mega5, R.drawable.big_mega5, R.drawable.huge_mega5), |
|
67 |
ULTI_2 ( 3, 2, 18, 18, R.drawable.small_ulti , R.drawable.medium_ulti , R.drawable.big_ulti , R.drawable.huge_ulti ), |
|
68 |
DIAM_2 ( 3, 2, 10, 12, R.drawable.small_diam2, R.drawable.medium_diam2, R.drawable.big_diam2, R.drawable.huge_diam2), |
|
69 |
DIAM_3 ( 3, 3, 18, 24, R.drawable.small_diam3, R.drawable.medium_diam3, R.drawable.big_diam3, R.drawable.huge_diam3), |
|
70 |
DIAM_4 ( 3, 4, 32, 32, R.drawable.small_diam4, R.drawable.medium_diam4, R.drawable.big_diam4, R.drawable.huge_diam4), |
|
71 |
DINO_3 ( 4, 3, 10, 10, R.drawable.small_dino , R.drawable.medium_dino , R.drawable.big_dino , R.drawable.huge_dino ), |
|
72 |
DIN4_3 ( 4, 3, 7, 7, R.drawable.small_din4 , R.drawable.medium_din4 , R.drawable.big_din4 , R.drawable.huge_din4 ), |
|
73 |
REDI_3 ( 4, 3, 14, 16, R.drawable.small_redi , R.drawable.medium_redi , R.drawable.big_redi , R.drawable.huge_redi ), |
|
74 |
HELI_3 ( 4, 3, 18, 20, R.drawable.small_heli , R.drawable.medium_heli , R.drawable.big_heli , R.drawable.huge_heli ), |
|
75 |
SKEW_2 ( 5, 2, 11, 11, R.drawable.small_skew2, R.drawable.medium_skew2, R.drawable.big_skew2, R.drawable.huge_skew2), |
|
76 |
SKEW_3 ( 5, 3, 17, 21, R.drawable.small_skew3, R.drawable.medium_skew3, R.drawable.big_skew3, R.drawable.huge_skew3), |
|
77 |
IVY_2 ( 5, 2, 8, 8, R.drawable.small_ivy , R.drawable.medium_ivy , R.drawable.big_ivy , R.drawable.huge_ivy ), |
|
78 |
REX_3 ( 5, 3, 16, 19, R.drawable.small_rex , R.drawable.medium_rex , R.drawable.big_rex , R.drawable.huge_rex ), |
|
79 |
BAN1_3 ( 6, 3, 16, 16, R.drawable.small_ban1 , R.drawable.medium_ban1 , R.drawable.big_ban1 , R.drawable.huge_ban1 ), |
|
80 |
BAN2_3 ( 6, 3, 16, 16, R.drawable.small_ban2 , R.drawable.medium_ban2 , R.drawable.big_ban2 , R.drawable.huge_ban2 ), |
|
81 |
BAN3_3 ( 6, 3, 16, 16, R.drawable.small_ban3 , R.drawable.medium_ban3 , R.drawable.big_ban3 , R.drawable.huge_ban3 ), |
|
82 |
BAN4_3 ( 6, 3, 16, 16, R.drawable.small_ban4 , R.drawable.medium_ban4 , R.drawable.big_ban4 , R.drawable.huge_ban4 ), |
|
83 |
SQU1_3 ( 7, 3, 24, 24, R.drawable.small_squa1, R.drawable.medium_squa1, R.drawable.big_squa1, R.drawable.huge_squa1), |
|
84 |
SQU2_3 ( 7, 3, 24, 24, R.drawable.small_squa2, R.drawable.medium_squa2, R.drawable.big_squa2, R.drawable.huge_squa2), |
|
85 |
MIRR_2 ( 7, 2, 12, 12, R.drawable.small_mirr2, R.drawable.medium_mirr2, R.drawable.big_mirr2, R.drawable.huge_mirr2), |
|
86 |
MIRR_3 ( 7, 3, 16, 17, R.drawable.small_mirr3, R.drawable.medium_mirr3, R.drawable.big_mirr3, R.drawable.huge_mirr3), |
|
250 | 87 |
; |
251 | 88 |
|
252 | 89 |
public static final int NUM_OBJECTS = values().length; |
253 |
public static final int MAX_NUM_OBJECTS; |
|
254 | 90 |
public static final int MAX_LEVEL; |
255 | 91 |
public static final int MAX_SCRAMBLE; |
256 | 92 |
public static final int MAX_OBJECT_SIZE; |
257 | 93 |
|
258 |
private final int[] mObjectSizes, mDBLevels, mNumScrambles, mSmallIconIDs, mMediumIconIDs, mBigIconIDs, mHugeIconIDs;
|
|
259 |
private final int mRow, mNumSizes;
|
|
94 |
private final int mRow, mSize, mDBLevels, mNumScrambles;
|
|
95 |
private final int mSmallIconID, mMediumIconID, mBigIconID, mHugeIconID;
|
|
260 | 96 |
|
261 | 97 |
private static final ObjectList[] objects; |
262 |
private static int mNumAll; |
|
263 | 98 |
private static int[] mIndices; |
264 | 99 |
private static int mColCount, mRowCount; |
265 | 100 |
|
266 | 101 |
static |
267 | 102 |
{ |
268 |
mNumAll = 0; |
|
269 |
int num, i = 0; |
|
103 |
int i = 0; |
|
270 | 104 |
objects = new ObjectList[NUM_OBJECTS]; |
271 |
int maxNum = Integer.MIN_VALUE; |
|
272 | 105 |
int maxLevel = Integer.MIN_VALUE; |
273 | 106 |
int maxScramble= Integer.MIN_VALUE; |
274 | 107 |
int maxSize = Integer.MIN_VALUE; |
275 | 108 |
|
276 | 109 |
for(ObjectList object: ObjectList.values()) |
277 | 110 |
{ |
278 |
objects[i] = object; |
|
279 |
i++; |
|
280 |
num = object.mObjectSizes.length; |
|
281 |
mNumAll += num; |
|
282 |
if( num> maxNum ) maxNum = num; |
|
283 |
|
|
284 |
for(int j=0; j<num; j++) |
|
285 |
{ |
|
286 |
if( object.mNumScrambles[j]> maxScramble ) maxScramble= object.mNumScrambles[j]; |
|
287 |
if( object.mDBLevels[j] > maxLevel ) maxLevel = object.mDBLevels[j]; |
|
288 |
if( object.mObjectSizes[j] > maxSize ) maxSize = object.mObjectSizes[j]; |
|
289 |
} |
|
111 |
objects[i++] = object; |
|
112 |
|
|
113 |
if( object.mNumScrambles> maxScramble ) maxScramble= object.mNumScrambles; |
|
114 |
if( object.mDBLevels > maxLevel ) maxLevel = object.mDBLevels; |
|
115 |
if( object.mSize > maxSize ) maxSize = object.mSize; |
|
290 | 116 |
} |
291 | 117 |
|
292 |
MAX_NUM_OBJECTS = maxNum; |
|
293 | 118 |
MAX_LEVEL = maxLevel; |
294 | 119 |
MAX_SCRAMBLE = maxScramble; |
295 | 120 |
MAX_OBJECT_SIZE = maxSize; |
... | ... | |
325 | 150 |
|
326 | 151 |
for(int object=0; object<NUM_OBJECTS; object++) |
327 | 152 |
{ |
328 |
if( objects[object].mRow == row ) |
|
329 |
{ |
|
330 |
num += objects[object].mNumSizes; |
|
331 |
} |
|
153 |
if( objects[object].mRow == row ) num++; |
|
332 | 154 |
} |
333 | 155 |
|
334 | 156 |
return num; |
... | ... | |
365 | 187 |
|
366 | 188 |
public static ObjectList getObject(int ordinal) |
367 | 189 |
{ |
368 |
return ordinal>=0 && ordinal<NUM_OBJECTS ? objects[ordinal] : CUBE; |
|
369 |
} |
|
370 |
|
|
371 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
372 |
|
|
373 |
public static int pack(int object, int sizeIndex) |
|
374 |
{ |
|
375 |
int ret = 0; |
|
376 |
for(int i=0; i<object; i++) ret += objects[i].mObjectSizes.length; |
|
377 |
|
|
378 |
return ret+sizeIndex; |
|
190 |
return ordinal>=0 && ordinal<NUM_OBJECTS ? objects[ordinal] : CUBE_3; |
|
379 | 191 |
} |
380 | 192 |
|
381 | 193 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
382 | 194 |
|
383 |
public static int unpackSizeIndex(int number) |
|
384 |
{ |
|
385 |
int num; |
|
386 |
|
|
387 |
for(int i=0; i<NUM_OBJECTS; i++) |
|
388 |
{ |
|
389 |
num = objects[i].mObjectSizes.length; |
|
390 |
if( number<num ) return number; |
|
391 |
number -= num; |
|
392 |
} |
|
393 |
|
|
394 |
return -1; |
|
395 |
} |
|
396 |
|
|
397 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
398 |
|
|
399 |
public static int unpackObject(int number) |
|
195 |
public static int getOrdinal(String name) |
|
400 | 196 |
{ |
401 |
int num; |
|
402 |
|
|
403 | 197 |
for(int i=0; i<NUM_OBJECTS; i++) |
404 | 198 |
{ |
405 |
num = objects[i].mObjectSizes.length; |
|
406 |
if( number<num ) return i; |
|
407 |
number -= num; |
|
408 |
} |
|
409 |
|
|
410 |
return -1; |
|
411 |
} |
|
412 |
|
|
413 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
414 |
|
|
415 |
public static int unpackObjectFromString(String obj) |
|
416 |
{ |
|
417 |
int u = obj.indexOf('_'); |
|
418 |
int l = obj.length(); |
|
419 |
|
|
420 |
if( u>0 ) |
|
421 |
{ |
|
422 |
String name = obj.substring(0,u); |
|
423 |
int size = Integer.parseInt( obj.substring(u+1,l) ); |
|
424 |
|
|
425 |
for(int i=0; i<NUM_OBJECTS; i++) |
|
426 |
{ |
|
427 |
if( objects[i].name().equals(name) ) |
|
428 |
{ |
|
429 |
int sizeIndex = getSizeIndex(i,size); |
|
430 |
return pack(i,sizeIndex); |
|
431 |
} |
|
432 |
} |
|
199 |
if( objects[i].name().equals(name) ) return i; |
|
433 | 200 |
} |
434 | 201 |
|
435 | 202 |
return -1; |
... | ... | |
439 | 206 |
|
440 | 207 |
public static String getObjectList() |
441 | 208 |
{ |
442 |
String name; |
|
443 | 209 |
StringBuilder list = new StringBuilder(); |
444 |
int len; |
|
445 |
int[] sizes; |
|
446 | 210 |
|
447 | 211 |
for(int i=0; i<NUM_OBJECTS; i++) |
448 | 212 |
{ |
449 |
sizes = objects[i].mObjectSizes; |
|
450 |
len = sizes.length; |
|
451 |
name = objects[i].name(); |
|
452 |
|
|
453 |
for(int j=0; j<len; j++) |
|
454 |
{ |
|
455 |
if( i>0 || j>0 ) list.append(','); |
|
456 |
list.append(name); |
|
457 |
list.append('_'); |
|
458 |
list.append(sizes[j]); |
|
459 |
} |
|
213 |
if( i>0 ) list.append(','); |
|
214 |
list.append(objects[i].name()); |
|
460 | 215 |
} |
461 | 216 |
|
462 | 217 |
return list.toString(); |
... | ... | |
464 | 219 |
|
465 | 220 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
466 | 221 |
|
467 |
public static int getTotal() |
|
468 |
{ |
|
469 |
return mNumAll; |
|
470 |
} |
|
471 |
|
|
472 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
473 |
|
|
474 |
public static int getDBLevel(int ordinal, int sizeIndex) |
|
475 |
{ |
|
476 |
if( ordinal>=0 && ordinal<NUM_OBJECTS ) |
|
477 |
{ |
|
478 |
int num = objects[ordinal].mObjectSizes.length; |
|
479 |
return sizeIndex>=0 && sizeIndex<num ? objects[ordinal].mDBLevels[sizeIndex] : 0; |
|
480 |
} |
|
481 |
|
|
482 |
return 0; |
|
483 |
} |
|
484 |
|
|
485 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
486 |
|
|
487 |
public static int getNumScramble(int ordinal, int sizeIndex) |
|
222 |
public static int getDBLevel(int ordinal) |
|
488 | 223 |
{ |
489 |
if( ordinal>=0 && ordinal<NUM_OBJECTS ) |
|
490 |
{ |
|
491 |
int num = objects[ordinal].mObjectSizes.length; |
|
492 |
return sizeIndex>=0 && sizeIndex<num ? objects[ordinal].mNumScrambles[sizeIndex] : 0; |
|
493 |
} |
|
494 |
|
|
495 |
return 0; |
|
224 |
return ordinal>=0 && ordinal<NUM_OBJECTS ? objects[ordinal].mDBLevels : 0; |
|
496 | 225 |
} |
497 | 226 |
|
498 | 227 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
499 | 228 |
|
500 |
public static int getOrdinal(String name)
|
|
229 |
public static int getNumScramble(int ordinal)
|
|
501 | 230 |
{ |
502 |
for(int i=0; i<NUM_OBJECTS; i++) |
|
503 |
{ |
|
504 |
if(objects[i].name().equals(name)) return i; |
|
505 |
} |
|
506 |
|
|
507 |
return -1; |
|
508 |
} |
|
509 |
|
|
510 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
511 |
|
|
512 |
public static int getSizeIndex(int ordinal, int size) |
|
513 |
{ |
|
514 |
if( ordinal>=0 && ordinal<NUM_OBJECTS ) |
|
515 |
{ |
|
516 |
int[] sizes = objects[ordinal].getSizes(); |
|
517 |
int len = sizes.length; |
|
518 |
|
|
519 |
for(int i=0; i<len; i++) |
|
520 |
{ |
|
521 |
if( sizes[i]==size ) return i; |
|
522 |
} |
|
523 |
} |
|
524 |
|
|
525 |
return -1; |
|
526 |
} |
|
527 |
|
|
528 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
529 |
|
|
530 |
ObjectList(int[][] info, int row) |
|
531 |
{ |
|
532 |
mNumSizes = info.length; |
|
533 |
|
|
534 |
mObjectSizes = new int[mNumSizes]; |
|
535 |
mDBLevels = new int[mNumSizes]; |
|
536 |
mNumScrambles = new int[mNumSizes]; |
|
537 |
mSmallIconIDs = new int[mNumSizes]; |
|
538 |
mMediumIconIDs= new int[mNumSizes]; |
|
539 |
mBigIconIDs = new int[mNumSizes]; |
|
540 |
mHugeIconIDs = new int[mNumSizes]; |
|
541 |
|
|
542 |
for(int i=0; i<mNumSizes; i++) |
|
543 |
{ |
|
544 |
mObjectSizes[i] = info[i][0]; |
|
545 |
mDBLevels[i] = info[i][1]; |
|
546 |
mNumScrambles[i] = info[i][2]; |
|
547 |
mSmallIconIDs[i] = info[i][3]; |
|
548 |
mMediumIconIDs[i]= info[i][4]; |
|
549 |
mBigIconIDs[i] = info[i][5]; |
|
550 |
mHugeIconIDs[i] = info[i][6]; |
|
551 |
} |
|
552 |
|
|
553 |
mRow = row; |
|
231 |
return ordinal>=0 && ordinal<NUM_OBJECTS ? objects[ordinal].mNumScrambles : 0; |
|
554 | 232 |
} |
555 | 233 |
|
556 | 234 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
557 | 235 |
|
558 |
public int[] getSizes()
|
|
236 |
ObjectList(int row, int size, int db, int scrambles, int smallIcon, int mediumIcon, int bigIcon, int hugeIcon)
|
|
559 | 237 |
{ |
560 |
return mObjectSizes; |
|
238 |
mRow = row; |
|
239 |
mSize = size; |
|
240 |
mDBLevels = db; |
|
241 |
mNumScrambles= scrambles; |
|
242 |
mSmallIconID = smallIcon; |
|
243 |
mMediumIconID= mediumIcon; |
|
244 |
mBigIconID = bigIcon; |
|
245 |
mHugeIconID = hugeIcon; |
|
561 | 246 |
} |
562 | 247 |
|
563 | 248 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
564 | 249 |
|
565 |
public int[] getIconIDs(int size)
|
|
250 |
public int getIconID(int size)
|
|
566 | 251 |
{ |
567 | 252 |
switch(size) |
568 | 253 |
{ |
569 |
case 0: return mSmallIconIDs;
|
|
570 |
case 1: return mMediumIconIDs;
|
|
571 |
case 2: return mBigIconIDs;
|
|
572 |
case 3: return mHugeIconIDs;
|
|
254 |
case 0: return mSmallIconID; |
|
255 |
case 1: return mMediumIconID; |
|
256 |
case 2: return mBigIconID; |
|
257 |
case 3: return mHugeIconID; |
|
573 | 258 |
} |
574 | 259 |
|
575 |
return mSmallIconIDs;
|
|
260 |
return mSmallIconID; |
|
576 | 261 |
} |
577 | 262 |
|
578 | 263 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
579 | 264 |
|
580 |
public TwistyObject create(int size, Static4D quat, int[][] moves, Resources res, int scrWidth)
|
|
265 |
public TwistyObject create(Static4D quat, int[][] moves, Resources res, int scrWidth) |
|
581 | 266 |
{ |
582 | 267 |
DistortedTexture texture = new DistortedTexture(); |
583 | 268 |
DistortedEffects effects = new DistortedEffects(); |
... | ... | |
585 | 270 |
|
586 | 271 |
switch(ordinal()) |
587 | 272 |
{ |
588 |
case 0: return new TwistyCube (size, quat, texture, mesh, effects, moves, res, scrWidth); |
|
589 |
case 1: return new TwistyJing (size, quat, texture, mesh, effects, moves, res, scrWidth); |
|
590 |
case 2: return new TwistyPyraminx (size, quat, texture, mesh, effects, moves, res, scrWidth); |
|
591 |
case 3: return new TwistyKilominx (size, quat, texture, mesh, effects, moves, res, scrWidth); |
|
592 |
case 4: return new TwistyMegaminx (size, quat, texture, mesh, effects, moves, res, scrWidth); |
|
593 |
case 5: return new TwistyUltimate (size, quat, texture, mesh, effects, moves, res, scrWidth); |
|
594 |
case 6: return new TwistyDiamond (size, quat, texture, mesh, effects, moves, res, scrWidth); |
|
595 |
case 7: return new TwistyDino6 (size, quat, texture, mesh, effects, moves, res, scrWidth); |
|
596 |
case 8: return new TwistyDino4 (size, quat, texture, mesh, effects, moves, res, scrWidth); |
|
597 |
case 9: return new TwistyRedi (size, quat, texture, mesh, effects, moves, res, scrWidth); |
|
598 |
case 10: return new TwistyHelicopter (size, quat, texture, mesh, effects, moves, res, scrWidth); |
|
599 |
case 11: return new TwistySkewb (size, quat, texture, mesh, effects, moves, res, scrWidth); |
|
600 |
case 12: return new TwistyIvy (size, quat, texture, mesh, effects, moves, res, scrWidth); |
|
601 |
case 13: return new TwistyRex (size, quat, texture, mesh, effects, moves, res, scrWidth); |
|
602 |
case 14: return new TwistyBandagedFused (size, quat, texture, mesh, effects, moves, res, scrWidth); |
|
603 |
case 15: return new TwistyBandaged2Bar (size, quat, texture, mesh, effects, moves, res, scrWidth); |
|
604 |
case 16: return new TwistyBandaged3Plate(size, quat, texture, mesh, effects, moves, res, scrWidth); |
|
605 |
case 17: return new TwistyBandagedEvil (size, quat, texture, mesh, effects, moves, res, scrWidth); |
|
606 |
case 18: return new TwistySquare1 (size, quat, texture, mesh, effects, moves, res, scrWidth); |
|
607 |
case 19: return new TwistySquare2 (size, quat, texture, mesh, effects, moves, res, scrWidth); |
|
608 |
case 20: return new TwistyMirror (size, quat, texture, mesh, effects, moves, res, scrWidth); |
|
273 |
case 0: return new TwistyCube (objects[ 0].mSize, quat, texture, mesh, effects, moves, res, scrWidth); |
|
274 |
case 1: return new TwistyCube (objects[ 1].mSize, quat, texture, mesh, effects, moves, res, scrWidth); |
|
275 |
case 2: return new TwistyCube (objects[ 2].mSize, quat, texture, mesh, effects, moves, res, scrWidth); |
|
276 |
case 3: return new TwistyCube (objects[ 3].mSize, quat, texture, mesh, effects, moves, res, scrWidth); |
|
277 |
case 4: return new TwistyJing (objects[ 4].mSize, quat, texture, mesh, effects, moves, res, scrWidth); |
|
278 |
case 5: return new TwistyPyraminx (objects[ 5].mSize, quat, texture, mesh, effects, moves, res, scrWidth); |
|
279 |
case 6: return new TwistyPyraminx (objects[ 6].mSize, quat, texture, mesh, effects, moves, res, scrWidth); |
|
280 |
case 7: return new TwistyPyraminx (objects[ 7].mSize, quat, texture, mesh, effects, moves, res, scrWidth); |
|
281 |
case 8: return new TwistyKilominx (objects[ 8].mSize, quat, texture, mesh, effects, moves, res, scrWidth); |
|
282 |
case 9: return new TwistyKilominx (objects[ 9].mSize, quat, texture, mesh, effects, moves, res, scrWidth); |
|
283 |
case 10: return new TwistyMegaminx (objects[10].mSize, quat, texture, mesh, effects, moves, res, scrWidth); |
|
284 |
case 11: return new TwistyMegaminx (objects[11].mSize, quat, texture, mesh, effects, moves, res, scrWidth); |
|
285 |
case 12: return new TwistyUltimate (objects[12].mSize, quat, texture, mesh, effects, moves, res, scrWidth); |
|
286 |
case 13: return new TwistyDiamond (objects[13].mSize, quat, texture, mesh, effects, moves, res, scrWidth); |
|
287 |
case 14: return new TwistyDiamond (objects[14].mSize, quat, texture, mesh, effects, moves, res, scrWidth); |
|
288 |
case 15: return new TwistyDiamond (objects[15].mSize, quat, texture, mesh, effects, moves, res, scrWidth); |
|
289 |
case 16: return new TwistyDino6 (objects[16].mSize, quat, texture, mesh, effects, moves, res, scrWidth); |
|
290 |
case 17: return new TwistyDino4 (objects[17].mSize, quat, texture, mesh, effects, moves, res, scrWidth); |
|
291 |
case 18: return new TwistyRedi (objects[18].mSize, quat, texture, mesh, effects, moves, res, scrWidth); |
|
292 |
case 19: return new TwistyHelicopter (objects[19].mSize, quat, texture, mesh, effects, moves, res, scrWidth); |
|
293 |
case 20: return new TwistySkewb (objects[20].mSize, quat, texture, mesh, effects, moves, res, scrWidth); |
|
294 |
case 21: return new TwistySkewb (objects[21].mSize, quat, texture, mesh, effects, moves, res, scrWidth); |
|
295 |
case 22: return new TwistyIvy (objects[22].mSize, quat, texture, mesh, effects, moves, res, scrWidth); |
|
296 |
case 23: return new TwistyRex (objects[23].mSize, quat, texture, mesh, effects, moves, res, scrWidth); |
|
297 |
case 24: return new TwistyBandagedFused (objects[24].mSize, quat, texture, mesh, effects, moves, res, scrWidth); |
|
298 |
case 25: return new TwistyBandaged2Bar (objects[25].mSize, quat, texture, mesh, effects, moves, res, scrWidth); |
|
299 |
case 26: return new TwistyBandaged3Plate(objects[26].mSize, quat, texture, mesh, effects, moves, res, scrWidth); |
|
300 |
case 27: return new TwistyBandagedEvil (objects[27].mSize, quat, texture, mesh, effects, moves, res, scrWidth); |
|
301 |
case 28: return new TwistySquare1 (objects[28].mSize, quat, texture, mesh, effects, moves, res, scrWidth); |
|
302 |
case 29: return new TwistySquare2 (objects[29].mSize, quat, texture, mesh, effects, moves, res, scrWidth); |
|
303 |
case 30: return new TwistyMirror (objects[30].mSize, quat, texture, mesh, effects, moves, res, scrWidth); |
|
304 |
case 31: return new TwistyMirror (objects[31].mSize, quat, texture, mesh, effects, moves, res, scrWidth); |
|
609 | 305 |
} |
610 | 306 |
|
611 | 307 |
return null; |
src/main/java/org/distorted/objectlib/main/Twisty12.java | ||
---|---|---|
53 | 53 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
54 | 54 |
|
55 | 55 |
public Twisty12(int numLayers, int realSize, Static4D quat, DistortedTexture texture, MeshSquare mesh, |
56 |
DistortedEffects effects, int[][] moves, ObjectList list, Resources res, int scrWidth)
|
|
56 |
DistortedEffects effects, int[][] moves, Resources res, int scrWidth) |
|
57 | 57 |
{ |
58 |
super(numLayers, realSize, quat, texture, mesh, effects, moves, list, res, scrWidth);
|
|
58 |
super(numLayers, realSize, quat, texture, mesh, effects, moves, res, scrWidth); |
|
59 | 59 |
} |
60 | 60 |
|
61 | 61 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
src/main/java/org/distorted/objectlib/main/Twisty4.java | ||
---|---|---|
39 | 39 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
40 | 40 |
|
41 | 41 |
public Twisty4(int numLayers, int realSize, Static4D quat, DistortedTexture texture, MeshSquare mesh, |
42 |
DistortedEffects effects, int[][] moves, ObjectList list, Resources res, int scrWidth)
|
|
42 |
DistortedEffects effects, int[][] moves, Resources res, int scrWidth) |
|
43 | 43 |
{ |
44 |
super(numLayers, realSize, quat, texture, mesh, effects, moves, list, res, scrWidth);
|
|
44 |
super(numLayers, realSize, quat, texture, mesh, effects, moves, res, scrWidth); |
|
45 | 45 |
} |
46 | 46 |
|
47 | 47 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
src/main/java/org/distorted/objectlib/main/Twisty6.java | ||
---|---|---|
40 | 40 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
41 | 41 |
|
42 | 42 |
public Twisty6(int numLayers, int realSize, Static4D quat, DistortedTexture texture, MeshSquare mesh, |
43 |
DistortedEffects effects, int[][] moves, ObjectList list, Resources res, int scrWidth)
|
|
43 |
DistortedEffects effects, int[][] moves, Resources res, int scrWidth) |
|
44 | 44 |
{ |
45 |
super(numLayers, realSize, quat, texture, mesh, effects, moves, list, res, scrWidth);
|
|
45 |
super(numLayers, realSize, quat, texture, mesh, effects, moves, res, scrWidth); |
|
46 | 46 |
} |
47 | 47 |
|
48 | 48 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
src/main/java/org/distorted/objectlib/main/Twisty8.java | ||
---|---|---|
41 | 41 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
42 | 42 |
|
43 | 43 |
public Twisty8(int numLayers, int realSize, Static4D quat, DistortedTexture texture, MeshSquare mesh, |
44 |
DistortedEffects effects, int[][] moves, ObjectList list, Resources res, int scrWidth)
|
|
44 |
DistortedEffects effects, int[][] moves, Resources res, int scrWidth) |
|
45 | 45 |
{ |
46 |
super(numLayers, realSize, quat, texture, mesh, effects, moves, list, res, scrWidth);
|
|
46 |
super(numLayers, realSize, quat, texture, mesh, effects, moves, res, scrWidth); |
|
47 | 47 |
} |
48 | 48 |
|
49 | 49 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
src/main/java/org/distorted/objectlib/main/TwistyObject.java | ||
---|---|---|
102 | 102 |
private final Static3D mNodeScale; |
103 | 103 |
private final Static4D mQuat; |
104 | 104 |
private final int mNumLayers, mRealSize; |
105 |
private final ObjectList mList; |
|
106 | 105 |
private final DistortedEffects mEffects; |
107 | 106 |
private final VertexEffectRotate mRotateEffect; |
108 | 107 |
private final Dynamic1D mRotationAngle; |
... | ... | |
134 | 133 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
135 | 134 |
|
136 | 135 |
TwistyObject(int numLayers, int realSize, Static4D quat, DistortedTexture nodeTexture, MeshSquare nodeMesh, |
137 |
DistortedEffects nodeEffects, int[][] moves, ObjectList list, Resources res, int screenWidth)
|
|
136 |
DistortedEffects nodeEffects, int[][] moves, Resources res, int screenWidth) |
|
138 | 137 |
{ |
139 | 138 |
super(nodeTexture,nodeEffects,nodeMesh); |
140 | 139 |
|
... | ... | |
144 | 143 |
|
145 | 144 |
mNumLayers = numLayers; |
146 | 145 |
mRealSize = realSize; |
147 |
mList = list; |
|
148 | 146 |
mOrigPos = getCubitPositions(mNumLayers); |
149 | 147 |
mAxis = getRotationAxis(); |
150 | 148 |
mInitScreenRatio = getScreenRatio(); |
... | ... | |
211 | 209 |
if( mNumTexCols*mNumTexRows < NUM_TEXTURES+1 ) mNumTexRows++; |
212 | 210 |
|
213 | 211 |
CUBITS = new Cubit[NUM_CUBITS]; |
214 |
createMeshAndCubits(list,res);
|
|
212 |
createMeshAndCubits(res); |
|
215 | 213 |
createDataStructuresForSolved(numLayers); |
216 | 214 |
|
217 | 215 |
mTexture = new DistortedTexture(); |
... | ... | |
268 | 266 |
|
269 | 267 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
270 | 268 |
|
271 |
private void createMeshAndCubits(ObjectList list, Resources res)
|
|
269 |
private void createMeshAndCubits(Resources res) |
|
272 | 270 |
{ |
273 | 271 |
int resourceID= getResource(mNumLayers); |
274 | 272 |
|
... | ... | |
999 | 997 |
quats.append(" "); |
1000 | 998 |
} |
1001 | 999 |
|
1000 |
String name = intGetObjectList(mNumLayers).name(); |
|
1001 |
|
|
1002 | 1002 |
if( BuildConfig.DEBUG ) |
1003 | 1003 |
{ |
1004 | 1004 |
android.util.Log.e("quats" , quats.toString()); |
1005 |
android.util.Log.e("object", mList.name()+"_"+mNumLayers);
|
|
1005 |
android.util.Log.e("object", name);
|
|
1006 | 1006 |
} |
1007 | 1007 |
else |
1008 | 1008 |
{ |
1009 | 1009 |
Exception ex = new Exception(message); |
1010 | 1010 |
FirebaseCrashlytics crashlytics = FirebaseCrashlytics.getInstance(); |
1011 | 1011 |
crashlytics.setCustomKey("quats" , quats.toString()); |
1012 |
crashlytics.setCustomKey("object", mList.name()+"_"+mNumLayers );
|
|
1012 |
crashlytics.setCustomKey("object", name);
|
|
1013 | 1013 |
crashlytics.recordException(ex); |
1014 | 1014 |
} |
1015 | 1015 |
} |
... | ... | |
1272 | 1272 |
|
1273 | 1273 |
public ObjectList getObjectList() |
1274 | 1274 |
{ |
1275 |
return mList;
|
|
1275 |
return intGetObjectList(mNumLayers);
|
|
1276 | 1276 |
} |
1277 | 1277 |
|
1278 | 1278 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
... | ... | |
1304 | 1304 |
protected abstract ObjectSticker retSticker(int face); |
1305 | 1305 |
protected abstract int getFaceColor(int cubit, int cubitface, int numLayers); |
1306 | 1306 |
protected abstract int getResource(int mNumLayers); |
1307 |
protected abstract ObjectList intGetObjectList(int numLayers); |
|
1307 | 1308 |
|
1308 | 1309 |
public abstract Movement getMovement(); |
1309 | 1310 |
public abstract Static3D[] getRotationAxis(); |
src/main/java/org/distorted/objectlib/objects/TwistyBandaged2Bar.java | ||
---|---|---|
37 | 37 |
public TwistyBandaged2Bar(int size, Static4D quat, DistortedTexture texture, MeshSquare mesh, |
38 | 38 |
DistortedEffects effects, int[][] moves, Resources res, int scrWidth) |
39 | 39 |
{ |
40 |
super(size, quat, texture, mesh, effects, moves, ObjectList.BAN2, res, scrWidth);
|
|
40 |
super(size, quat, texture, mesh, effects, moves, res, scrWidth); |
|
41 | 41 |
} |
42 | 42 |
|
43 | 43 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
... | ... | |
115 | 115 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
116 | 116 |
// PUBLIC API |
117 | 117 |
|
118 |
public ObjectList intGetObjectList(int numLayers) |
|
119 |
{ |
|
120 |
return ObjectList.BAN2_3; |
|
121 |
} |
|
122 |
|
|
123 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
124 |
|
|
118 | 125 |
public int getObjectName(int numLayers) |
119 | 126 |
{ |
120 | 127 |
return R.string.bandaged_2bar; |
src/main/java/org/distorted/objectlib/objects/TwistyBandaged3Plate.java | ||
---|---|---|
37 | 37 |
public TwistyBandaged3Plate(int size, Static4D quat, DistortedTexture texture, MeshSquare mesh, |
38 | 38 |
DistortedEffects effects, int[][] moves, Resources res, int scrWidth) |
39 | 39 |
{ |
40 |
super(size, quat, texture, mesh, effects, moves, ObjectList.BAN3, res, scrWidth);
|
|
40 |
super(size, quat, texture, mesh, effects, moves, res, scrWidth); |
|
41 | 41 |
} |
42 | 42 |
|
43 | 43 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
... | ... | |
122 | 122 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
123 | 123 |
// PUBLIC API |
124 | 124 |
|
125 |
public ObjectList intGetObjectList(int numLayers) |
|
126 |
{ |
|
127 |
return ObjectList.BAN3_3; |
|
128 |
} |
|
129 |
|
|
130 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
131 |
|
|
125 | 132 |
public int getObjectName(int numLayers) |
126 | 133 |
{ |
127 | 134 |
return R.string.bandaged_3plate; |
src/main/java/org/distorted/objectlib/objects/TwistyBandagedAbstract.java | ||
---|---|---|
31 | 31 |
|
32 | 32 |
import org.distorted.objectlib.main.Movement; |
33 | 33 |
import org.distorted.objectlib.main.Movement6; |
34 |
import org.distorted.objectlib.main.ObjectList; |
|
35 | 34 |
import org.distorted.objectlib.main.ObjectShape; |
36 | 35 |
import org.distorted.objectlib.main.ObjectSticker; |
37 | 36 |
import org.distorted.objectlib.main.ScrambleState; |
... | ... | |
81 | 80 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
82 | 81 |
|
83 | 82 |
TwistyBandagedAbstract(int size, Static4D quat, DistortedTexture texture, MeshSquare mesh, |
84 |
DistortedEffects effects, int[][] moves, ObjectList list, Resources res, int scrWidth)
|
|
83 |
DistortedEffects effects, int[][] moves, Resources res, int scrWidth) |
|
85 | 84 |
{ |
86 |
super(size, size, quat, texture, mesh, effects, moves, list, res, scrWidth);
|
|
85 |
super(size, size, quat, texture, mesh, effects, moves, res, scrWidth); |
|
87 | 86 |
} |
88 | 87 |
|
89 | 88 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
src/main/java/org/distorted/objectlib/objects/TwistyBandagedEvil.java | ||
---|---|---|
37 | 37 |
public TwistyBandagedEvil(int size, Static4D quat, DistortedTexture texture, MeshSquare mesh, |
38 | 38 |
DistortedEffects effects, int[][] moves, Resources res, int scrWidth) |
39 | 39 |
{ |
40 |
super(size, quat, texture, mesh, effects, moves, ObjectList.BAN4, res, scrWidth);
|
|
40 |
super(size, quat, texture, mesh, effects, moves, res, scrWidth); |
|
41 | 41 |
} |
42 | 42 |
|
43 | 43 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
... | ... | |
246 | 246 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
247 | 247 |
// PUBLIC API |
248 | 248 |
|
249 |
public ObjectList intGetObjectList(int numLayers) |
|
250 |
{ |
|
251 |
return ObjectList.BAN4_3; |
|
252 |
} |
|
253 |
|
|
254 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
255 |
|
|
249 | 256 |
public int getObjectName(int numLayers) |
250 | 257 |
{ |
251 | 258 |
return R.string.bandaged_evil; |
src/main/java/org/distorted/objectlib/objects/TwistyBandagedFused.java | ||
---|---|---|
37 | 37 |
public TwistyBandagedFused(int size, Static4D quat, DistortedTexture texture, MeshSquare mesh, |
38 | 38 |
DistortedEffects effects, int[][] moves, Resources res, int scrWidth) |
39 | 39 |
{ |
40 |
super(size, quat, texture, mesh, effects, moves, ObjectList.BAN1, res, scrWidth);
|
|
40 |
super(size, quat, texture, mesh, effects, moves, res, scrWidth); |
|
41 | 41 |
} |
42 | 42 |
|
43 | 43 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
... | ... | |
115 | 115 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
116 | 116 |
// PUBLIC APi |
117 | 117 |
|
118 |
public ObjectList intGetObjectList(int numLayers) |
|
119 |
{ |
|
120 |
return ObjectList.BAN1_3; |
|
121 |
} |
|
122 |
|
|
123 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
124 |
|
|
118 | 125 |
public int getObjectName(int numLayers) |
119 | 126 |
{ |
120 | 127 |
return R.string.bandaged_fused; |
src/main/java/org/distorted/objectlib/objects/TwistyCube.java | ||
---|---|---|
67 | 67 |
public TwistyCube(int size, Static4D quat, DistortedTexture texture, MeshSquare mesh, |
68 | 68 |
DistortedEffects effects, int[][] moves, Resources res, int scrWidth) |
69 | 69 |
{ |
70 |
super(size, size, quat, texture, mesh, effects, moves, ObjectList.CUBE, res, scrWidth);
|
|
70 |
super(size, size, quat, texture, mesh, effects, moves, res, scrWidth); |
|
71 | 71 |
} |
72 | 72 |
|
73 | 73 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
... | ... | |
394 | 394 |
return mBasicAngle; |
395 | 395 |
} |
396 | 396 |
|
397 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
398 |
|
|
399 |
public ObjectList intGetObjectList(int numLayers) |
|
400 |
{ |
|
401 |
switch(numLayers) |
|
402 |
{ |
|
403 |
case 2: return ObjectList.CUBE_2; |
|
404 |
case 3: return ObjectList.CUBE_3; |
|
405 |
case 4: return ObjectList.CUBE_4; |
|
406 |
case 5: return ObjectList.CUBE_5; |
|
407 |
} |
|
408 |
|
|
409 |
return ObjectList.CUBE_3; |
|
410 |
} |
|
411 |
|
|
397 | 412 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
398 | 413 |
|
399 | 414 |
public int getObjectName(int numLayers) |
src/main/java/org/distorted/objectlib/objects/TwistyDiamond.java | ||
---|---|---|
71 | 71 |
public TwistyDiamond(int size, Static4D quat, DistortedTexture texture, MeshSquare mesh, |
72 | 72 |
DistortedEffects effects, int[][] moves, Resources res, int scrWidth) |
73 | 73 |
{ |
74 |
super(size, size, quat, texture, mesh, effects, moves, ObjectList.DIAM, res, scrWidth);
|
|
74 |
super(size, size, quat, texture, mesh, effects, moves, res, scrWidth); |
|
75 | 75 |
} |
76 | 76 |
|
77 | 77 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
... | ... | |
536 | 536 |
return mBasicAngle; |
537 | 537 |
} |
538 | 538 |
|
539 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
540 |
|
|
541 |
public ObjectList intGetObjectList(int numLayers) |
|
542 |
{ |
|
543 |
switch(numLayers) |
|
544 |
{ |
|
545 |
case 2: return ObjectList.DIAM_2; |
|
546 |
case 3: return ObjectList.DIAM_3; |
|
547 |
case 4: return ObjectList.DIAM_4; |
|
548 |
} |
|
549 |
|
|
550 |
return ObjectList.DIAM_2; |
|
551 |
} |
|
552 |
|
|
539 | 553 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
540 | 554 |
|
541 | 555 |
public int getObjectName(int numLayers) |
src/main/java/org/distorted/objectlib/objects/TwistyDino.java | ||
---|---|---|
73 | 73 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
74 | 74 |
|
75 | 75 |
TwistyDino(int size, Static4D quat, DistortedTexture texture, MeshSquare mesh, |
76 |
DistortedEffects effects, int[][] moves, ObjectList obj, Resources res, int scrWidth)
|
|
76 |
DistortedEffects effects, int[][] moves, Resources res, int scrWidth) |
|
77 | 77 |
{ |
78 |
super(size, size, quat, texture, mesh, effects, moves, obj, res, scrWidth);
|
|
78 |
super(size, size, quat, texture, mesh, effects, moves, res, scrWidth); |
|
79 | 79 |
} |
80 | 80 |
|
81 | 81 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
src/main/java/org/distorted/objectlib/objects/TwistyDino4.java | ||
---|---|---|
41 | 41 |
public TwistyDino4(int size, Static4D quat, DistortedTexture texture, MeshSquare mesh, |
42 | 42 |
DistortedEffects effects, int[][] moves, Resources res, int scrWidth) |
43 | 43 |
{ |
44 |
super(size, quat, texture, mesh, effects, moves, ObjectList.DIN4, res, scrWidth);
|
|
44 |
super(size, quat, texture, mesh, effects, moves, res, scrWidth); |
|
45 | 45 |
} |
46 | 46 |
|
47 | 47 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
... | ... | |
96 | 96 |
return true; |
97 | 97 |
} |
98 | 98 |
|
99 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
100 |
|
|
101 |
public ObjectList intGetObjectList(int numLayers) |
|
102 |
{ |
|
103 |
return ObjectList.DIN4_3; |
|
104 |
} |
|
105 |
|
|
99 | 106 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
100 | 107 |
|
101 | 108 |
public int getObjectName(int numLayers) |
src/main/java/org/distorted/objectlib/objects/TwistyDino6.java | ||
---|---|---|
41 | 41 |
public TwistyDino6(int size, Static4D quat, DistortedTexture texture, MeshSquare mesh, |
42 | 42 |
DistortedEffects effects, int[][] moves, Resources res, int scrWidth) |
43 | 43 |
{ |
44 |
super(size, quat, texture, mesh, effects, moves, ObjectList.DINO, res, scrWidth);
|
|
44 |
super(size, quat, texture, mesh, effects, moves, res, scrWidth); |
|
45 | 45 |
} |
46 | 46 |
|
47 | 47 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
... | ... | |
98 | 98 |
return 2; |
99 | 99 |
} |
100 | 100 |
|
101 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
102 |
|
|
103 |
public ObjectList intGetObjectList(int numLayers) |
|
104 |
{ |
|
105 |
return ObjectList.DINO_3; |
|
106 |
} |
|
107 |
|
|
101 | 108 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
102 | 109 |
|
103 | 110 |
public int getObjectName(int numLayers) |
src/main/java/org/distorted/objectlib/objects/TwistyHelicopter.java | ||
---|---|---|
79 | 79 |
public TwistyHelicopter(int size, Static4D quat, DistortedTexture texture, MeshSquare mesh, |
80 | 80 |
DistortedEffects effects, int[][] moves, Resources res, int scrWidth) |
81 | 81 |
{ |
82 |
super(size, size, quat, texture, mesh, effects, moves, ObjectList.HELI, res, scrWidth);
|
|
82 |
super(size, size, quat, texture, mesh, effects, moves, res, scrWidth); |
|
83 | 83 |
} |
84 | 84 |
|
85 | 85 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
... | ... | |
456 | 456 |
return mBasicAngle; |
457 | 457 |
} |
458 | 458 |
|
459 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
460 |
|
|
461 |
public ObjectList intGetObjectList(int numLayers) |
|
462 |
{ |
|
463 |
return ObjectList.HELI_3; |
|
464 |
} |
|
465 |
|
|
459 | 466 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
460 | 467 |
|
461 | 468 |
public int getObjectName(int numLayers) |
src/main/java/org/distorted/objectlib/objects/TwistyIvy.java | ||
---|---|---|
78 | 78 |
public TwistyIvy(int size, Static4D quat, DistortedTexture texture, MeshSquare mesh, |
79 | 79 |
DistortedEffects effects, int[][] moves, Resources res, int scrWidth) |
80 | 80 |
{ |
81 |
super(size, size, quat, texture, mesh, effects, moves, ObjectList.IVY, res, scrWidth);
|
|
81 |
super(size, size, quat, texture, mesh, effects, moves, res, scrWidth); |
|
82 | 82 |
} |
83 | 83 |
|
84 | 84 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
... | ... | |
483 | 483 |
return mBasicAngle; |
484 | 484 |
} |
485 | 485 |
|
486 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
487 |
|
|
488 |
public ObjectList intGetObjectList(int numLayers) |
|
489 |
{ |
|
490 |
return ObjectList.IVY_2; |
|
491 |
} |
|
492 |
|
|
486 | 493 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
487 | 494 |
|
488 | 495 |
public int getObjectName(int numLayers) |
src/main/java/org/distorted/objectlib/objects/TwistyJing.java | ||
---|---|---|
75 | 75 |
public TwistyJing(int size, Static4D quat, DistortedTexture texture, MeshSquare mesh, |
76 | 76 |
DistortedEffects effects, int[][] moves, Resources res, int scrWidth) |
77 | 77 |
{ |
78 |
super(size, size, quat, texture, mesh, effects, moves, ObjectList.JING, res, scrWidth);
|
|
78 |
super(size, size, quat, texture, mesh, effects, moves, res, scrWidth); |
|
79 | 79 |
} |
80 | 80 |
|
81 | 81 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
... | ... | |
442 | 442 |
return mBasicAngle; |
443 | 443 |
} |
444 | 444 |
|
445 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
446 |
|
|
447 |
public ObjectList intGetObjectList(int numLayers) |
|
448 |
{ |
|
449 |
return ObjectList.JING_2; |
|
450 |
} |
|
451 |
|
|
445 | 452 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
446 | 453 |
|
447 | 454 |
public int getObjectName(int numLayers) |
src/main/java/org/distorted/objectlib/objects/TwistyKilominx.java | ||
---|---|---|
46 | 46 |
public TwistyKilominx(int size, Static4D quat, DistortedTexture texture, MeshSquare mesh, |
47 | 47 |
DistortedEffects effects, int[][] moves, Resources res, int scrWidth) |
48 | 48 |
{ |
49 |
super(size, size, quat, texture, mesh, effects, moves, ObjectList.KILO, res, scrWidth);
|
|
49 |
super(size, size, quat, texture, mesh, effects, moves, res, scrWidth); |
|
50 | 50 |
} |
51 | 51 |
|
52 | 52 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
... | ... | |
514 | 514 |
|
515 | 515 |
protected int getNumCubitVariants(int numLayers) |
516 | 516 |
{ |
517 |
int[] sizes = ObjectList.KILO.getSizes(); |
|
518 |
int variants = sizes.length; |
|
519 |
int highestSize = sizes[variants-1]; |
|
517 |
switch(numLayers) |
|
518 |
{ |
|
519 |
case 3: return 1; |
|
520 |
case 5: return 4; |
|
521 |
} |
|
520 | 522 |
|
521 |
return highestSize-1;
|
|
523 |
return 1; |
|
522 | 524 |
} |
523 | 525 |
|
524 | 526 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
... | ... | |
537 | 539 |
return type+1; |
538 | 540 |
} |
539 | 541 |
|
540 |
int[] sizes = ObjectList.KILO.getSizes(); |
|
541 |
int variants = sizes.length; |
|
542 |
int highestSize = sizes[variants-1]; |
|
543 |
|
|
544 |
return highestSize-2; |
|
542 |
return getNumCubitVariants(numLayers)-1; |
|
545 | 543 |
} |
546 | 544 |
|
547 | 545 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
... | ... | |
696 | 694 |
return 2; |
697 | 695 |
} |
698 | 696 |
|
697 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
698 |
|
|
699 |
public ObjectList intGetObjectList(int numLayers) |
|
700 |
{ |
|
701 |
switch(numLayers) |
|
702 |
{ |
|
703 |
case 3: return ObjectList.KILO_3; |
|
704 |
case 5: return ObjectList.KILO_5; |
|
705 |
} |
|
706 |
|
|
707 |
return ObjectList.KILO_3; |
|
708 |
} |
|
709 |
|
|
699 | 710 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
700 | 711 |
|
701 | 712 |
public int getObjectName(int numLayers) |
src/main/java/org/distorted/objectlib/objects/TwistyMegaminx.java | ||
---|---|---|
47 | 47 |
public TwistyMegaminx(int size, Static4D quat, DistortedTexture texture, MeshSquare mesh, |
48 | 48 |
DistortedEffects effects, int[][] moves, Resources res, int scrWidth) |
49 | 49 |
{ |
50 |
super(size, size, quat, texture, mesh, effects, moves, ObjectList.MEGA, res, scrWidth);
|
|
50 |
super(size, size, quat, texture, mesh, effects, moves, res, scrWidth); |
|
51 | 51 |
} |
52 | 52 |
|
53 | 53 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
... | ... | |
430 | 430 |
|
431 | 431 |
protected int getNumCubitVariants(int numLayers) |
432 | 432 |
{ |
433 |
int[] sizes = ObjectList.MEGA.getSizes(); |
|
434 |
int variants = sizes.length; |
|
433 |
switch(numLayers) |
|
434 |
{ |
|
435 |
case 3: return 3; |
|
436 |
case 5: return 4; |
|
437 |
} |
|
435 | 438 |
|
436 |
return 2+(sizes[variants-1]-1)/2;
|
|
439 |
return 3;
|
|
437 | 440 |
} |
438 | 441 |
|
439 | 442 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
... | ... | |
452 | 455 |
return type+1; |
453 | 456 |
} |
454 | 457 |
|
455 |
int[] sizes = ObjectList.MEGA.getSizes(); |
|
456 |
int variants = sizes.length; |
|
457 |
int numShapes = 2+(sizes[variants-1]-1)/2; |
|
458 |
|
|
459 |
return numShapes-1; |
|
458 |
return getNumCubitVariants(numLayers)-1; |
|
460 | 459 |
} |
461 | 460 |
|
462 | 461 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
... | ... | |
602 | 601 |
return 4; |
603 | 602 |
} |
604 | 603 |
|
604 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
605 |
|
|
606 |
public ObjectList intGetObjectList(int numLayers) |
|
607 |
{ |
|
608 |
switch(numLayers) |
|
609 |
{ |
|
610 |
case 3: return ObjectList.MEGA_3; |
|
611 |
case 5: return ObjectList.MEGA_5; |
|
612 |
} |
|
613 |
|
|
614 |
return ObjectList.MEGA_3; |
|
615 |
} |
|
616 |
|
|
605 | 617 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
606 | 618 |
|
607 | 619 |
public int getObjectName(int numLayers) |
src/main/java/org/distorted/objectlib/objects/TwistyMinx.java | ||
---|---|---|
98 | 98 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
99 | 99 |
|
100 | 100 |
TwistyMinx(int numLayers, int realSize, Static4D quat, DistortedTexture texture, MeshSquare mesh, |
101 |
DistortedEffects effects, int[][] moves, ObjectList obj, Resources res, int scrWidth)
|
|
101 |
DistortedEffects effects, int[][] moves, Resources res, int scrWidth) |
|
102 | 102 |
{ |
103 |
super(numLayers, realSize, quat, texture, mesh, effects, moves, obj, res, scrWidth);
|
|
103 |
super(numLayers, realSize, quat, texture, mesh, effects, moves, res, scrWidth); |
|
104 | 104 |
} |
105 | 105 |
|
106 | 106 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
src/main/java/org/distorted/objectlib/objects/TwistyMirror.java | ||
---|---|---|
89 | 89 |
public TwistyMirror(int size, Static4D quat, DistortedTexture texture, MeshSquare mesh, |
90 | 90 |
DistortedEffects effects, int[][] moves, Resources res, int scrWidth) |
91 | 91 |
{ |
92 |
super(size, size, quat, texture, mesh, effects, moves, ObjectList.MIRR, res, scrWidth);
|
|
92 |
super(size, size, quat, texture, mesh, effects, moves, res, scrWidth); |
|
93 | 93 |
} |
94 | 94 |
|
95 | 95 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
... | ... | |
629 | 629 |
return mBasicAngle; |
630 | 630 |
} |
631 | 631 |
|
632 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
633 |
|
|
634 |
public ObjectList intGetObjectList(int numLayers) |
|
635 |
{ |
|
636 |
switch(numLayers) |
|
637 |
{ |
|
638 |
case 2: return ObjectList.MIRR_2; |
|
639 |
case 3: return ObjectList.MIRR_3; |
|
640 |
} |
|
641 |
|
|
642 |
return ObjectList.MIRR_2; |
|
643 |
} |
|
644 |
|
|
632 | 645 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
633 | 646 |
|
634 | 647 |
public int getObjectName(int numLayers) |
src/main/java/org/distorted/objectlib/objects/TwistyPyraminx.java | ||
---|---|---|
68 | 68 |
public TwistyPyraminx(int size, Static4D quat, DistortedTexture texture, MeshSquare mesh, |
69 | 69 |
DistortedEffects effects, int[][] moves, Resources res, int scrWidth) |
70 | 70 |
{ |
71 |
super(size, size, quat, texture, mesh, effects, moves, ObjectList.PYRA, res, scrWidth);
|
|
71 |
super(size, size, quat, texture, mesh, effects, moves, res, scrWidth); |
|
72 | 72 |
} |
73 | 73 |
|
74 | 74 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
... | ... | |
420 | 420 |
return mBasicAngle; |
421 | 421 |
} |
422 | 422 |
|
423 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
424 |
|
|
425 |
public ObjectList intGetObjectList(int numLayers) |
|
426 |
{ |
|
427 |
switch(numLayers) |
|
428 |
{ |
|
429 |
case 3: return ObjectList.PYRA_3; |
|
430 |
case 4: return ObjectList.PYRA_4; |
|
431 |
case 5: return ObjectList.PYRA_5; |
|
432 |
} |
|
433 |
|
|
434 |
return ObjectList.PYRA_3; |
|
435 |
} |
|
436 |
|
|
423 | 437 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
424 | 438 |
|
425 | 439 |
public int getObjectName(int numLayers) |
src/main/java/org/distorted/objectlib/objects/TwistyRedi.java | ||
---|---|---|
75 | 75 |
public TwistyRedi(int size, Static4D quat, DistortedTexture texture, MeshSquare mesh, |
76 | 76 |
DistortedEffects effects, int[][] moves, Resources res, int scrWidth) |
77 | 77 |
{ |
78 |
super(size, size, quat, texture, mesh, effects, moves, ObjectList.REDI, res, scrWidth);
|
|
78 |
super(size, size, quat, texture, mesh, effects, moves, res, scrWidth); |
|
79 | 79 |
} |
80 | 80 |
|
81 | 81 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
... | ... | |
453 | 453 |
return mBasicAngle; |
454 | 454 |
} |
455 | 455 |
|
456 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
457 |
|
|
458 |
public ObjectList intGetObjectList(int numLayers) |
|
459 |
{ |
|
460 |
return ObjectList.REDI_3; |
|
461 |
} |
|
462 |
|
|
456 | 463 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
457 | 464 |
|
458 | 465 |
public int getObjectName(int numLayers) |
src/main/java/org/distorted/objectlib/objects/TwistyRex.java | ||
---|---|---|
76 | 76 |
public TwistyRex(int size, Static4D quat, DistortedTexture texture, MeshSquare mesh, |
77 | 77 |
DistortedEffects effects, int[][] moves, Resources res, int scrWidth) |
78 | 78 |
{ |
79 |
super(size, size, quat, texture, mesh, effects, moves, ObjectList.REX, res, scrWidth);
|
|
79 |
super(size, size, quat, texture, mesh, effects, moves, res, scrWidth); |
|
80 | 80 |
} |
81 | 81 |
|
82 | 82 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
... | ... | |
486 | 486 |
return mBasicAngle; |
487 | 487 |
} |
488 | 488 |
|
489 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
490 |
|
|
491 |
public ObjectList intGetObjectList(int numLayers) |
|
492 |
{ |
|
493 |
return ObjectList.REX_3; |
|
494 |
} |
|
495 |
|
|
489 | 496 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
490 | 497 |
|
491 | 498 |
public int getObjectName(int numLayers) |
src/main/java/org/distorted/objectlib/objects/TwistySkewb.java | ||
---|---|---|
74 | 74 |
public TwistySkewb(int size, Static4D quat, DistortedTexture texture, MeshSquare mesh, |
75 | 75 |
DistortedEffects effects, int[][] moves, Resources res, int scrWidth) |
76 | 76 |
{ |
77 |
super(size, 2*size-2, quat, texture, mesh, effects, moves, ObjectList.SKEW, res, scrWidth);
|
|
77 |
super(size, 2*size-2, quat, texture, mesh, effects, moves, res, scrWidth); |
|
78 | 78 |
} |
79 | 79 |
|
80 | 80 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
... | ... | |
595 | 595 |
return mBasicAngle; |
596 | 596 |
} |
597 | 597 |
|
598 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
599 |
|
|
600 |
public ObjectList intGetObjectList(int numLayers) |
|
601 |
{ |
|
602 |
switch(numLayers) |
|
603 |
{ |
|
604 |
case 2: return ObjectList.SKEW_2; |
|
605 |
case 3: return ObjectList.SKEW_3; |
|
606 |
} |
|
607 |
|
|
608 |
return ObjectList.SKEW_2; |
|
609 |
} |
|
610 |
|
|
598 | 611 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
599 | 612 |
|
600 | 613 |
public int getObjectName(int numLayers) |
src/main/java/org/distorted/objectlib/objects/TwistySquare.java | ||
---|---|---|
66 | 66 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
67 | 67 |
|
68 | 68 |
TwistySquare(int size, Static4D quat, DistortedTexture texture, MeshSquare mesh, |
69 |
DistortedEffects effects, int[][] moves, ObjectList obj, Resources res, int scrWidth)
|
|
69 |
DistortedEffects effects, int[][] moves, Resources res, int scrWidth) |
|
70 | 70 |
{ |
71 |
super(size, size, quat, texture, mesh, effects, moves, obj, res, scrWidth);
|
|
71 |
super(size, size, quat, texture, mesh, effects, moves, res, scrWidth); |
|
72 | 72 |
} |
73 | 73 |
|
74 | 74 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
src/main/java/org/distorted/objectlib/objects/TwistySquare1.java | ||
---|---|---|
50 | 50 |
public TwistySquare1(int size, Static4D quat, DistortedTexture texture, MeshSquare mesh, |
51 | 51 |
DistortedEffects effects, int[][] moves, Resources res, int scrWidth) |
52 | 52 |
{ |
53 |
super(size, quat, texture, mesh, effects, moves, ObjectList.SQU1, res, scrWidth);
|
|
53 |
super(size, quat, texture, mesh, effects, moves, res, scrWidth); |
|
54 | 54 |
} |
55 | 55 |
|
56 | 56 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
... | ... | |
350 | 350 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
351 | 351 |
// PUBLIC API |
352 | 352 |
|
353 |
public ObjectList intGetObjectList(int numLayers) |
|
354 |
{ |
|
355 |
return ObjectList.SQU1_3; |
|
356 |
} |
|
357 |
|
|
358 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
359 |
|
|
353 | 360 |
public int getObjectName(int numLayers) |
354 | 361 |
{ |
355 | 362 |
return R.string.squa1; |
src/main/java/org/distorted/objectlib/objects/TwistySquare2.java | ||
---|---|---|
50 | 50 |
public TwistySquare2(int size, Static4D quat, DistortedTexture texture, MeshSquare mesh, |
51 | 51 |
DistortedEffects effects, int[][] moves, Resources res, int scrWidth) |
52 | 52 |
{ |
53 |
super(size, quat, texture, mesh, effects, moves, ObjectList.SQU2, res, scrWidth);
|
|
53 |
super(size, quat, texture, mesh, effects, moves, res, scrWidth); |
|
54 | 54 |
} |
55 | 55 |
|
56 | 56 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
... | ... | |
383 | 383 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
384 | 384 |
// PUBLIC API |
385 | 385 |
|
386 |
public ObjectList intGetObjectList(int numLayers) |
|
387 |
{ |
|
388 |
return ObjectList.SQU2_3; |
|
389 |
} |
|
390 |
|
|
391 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
392 |
|
|
386 | 393 |
public int getObjectName(int numLayers) |
387 | 394 |
{ |
388 | 395 |
return R.string.squa2; |
src/main/java/org/distorted/objectlib/objects/TwistyUltimate.java | ||
---|---|---|
79 | 79 |
public TwistyUltimate(int size, Static4D quat, DistortedTexture texture, MeshSquare mesh, |
80 | 80 |
DistortedEffects effects, int[][] moves, Resources res, int scrWidth) |
81 | 81 |
{ |
82 |
super(size, size, quat, texture, mesh, effects, moves, ObjectList.ULTI, res, scrWidth); |
Also available in: Unified diff
Simplify ObjectList: now there's just one object per size.