Project

General

Profile

« Previous | Next » 

Revision 4e1dc313

Added by Leszek Koltunski over 2 years ago

move the resourceIDs from ObjectList to individual object classes.

View differences:

src/main/java/org/distorted/objectlib/main/ObjectList.java
92 92

  
93 93
  CUBE (
94 94
         new int[][] {
95
                       {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} ,
96
                       {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} ,
97
                       {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} ,
98
                       {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}
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 99
                     },
100 100
         0
101 101
       ),
102 102

  
103 103
  JING (
104 104
         new int[][] {
105
                       {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} ,
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 106
                     },
107 107
         1
108 108
       ),
109 109

  
110 110
  PYRA (
111 111
         new int[][] {
112
                       {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} ,
113
                       {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} ,
114
                       {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}
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 115
                     },
116 116
         1
117 117
       ),
118 118

  
119 119
  KILO (
120 120
         new int[][] {
121
                       {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} ,
122
                       {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} ,
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 123
                     },
124 124
         2
125 125
       ),
126 126

  
127 127
  MEGA (
128 128
         new int[][] {
129
                       {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} ,
130
                       {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} ,
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 131
                     },
132 132
         2
133 133
       ),
134 134

  
135 135
  ULTI (
136 136
         new int[][] {
137
                       {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} ,
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 138
                     },
139 139
         3
140 140
       ),
141 141

  
142 142
  DIAM (
143 143
         new int[][] {
144
                       {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} ,
145
                       {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} ,
146
                       {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} ,
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 147
                     },
148 148
         3
149 149
       ),
150 150

  
151 151
  DINO (
152 152
         new int[][] {
153
                       {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} ,
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 154
                     },
155 155
         4
156 156
       ),
157 157

  
158 158
  DIN4 (
159 159
         new int[][] {
160
                       {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} ,
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 161
                     },
162 162
         4
163 163
       ),
164 164

  
165 165
  REDI (
166 166
         new int[][] {
167
                       {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} ,
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 168
                     },
169 169
         4
170 170
       ),
171 171

  
172 172
  HELI (
173 173
         new int[][] {
174
                       {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} ,
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 175
                     },
176 176
         4
177 177
       ),
178 178

  
179 179
  SKEW (
180 180
         new int[][] {
181
                       {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} ,
182
                       {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} ,
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 183
                     },
184 184
         5
185 185
       ),
186 186

  
187 187
  IVY  (
188 188
         new int[][] {
189
                       {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} ,
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 190
                     },
191 191
         5
192 192
       ),
193 193

  
194 194
  REX  (
195 195
         new int[][] {
196
                       {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} ,
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 197
                     },
198 198
         5
199 199
       ),
200 200

  
201 201
  BAN1 (
202 202
         new int[][] {
203
                       {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} ,
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 204
                     },
205 205
         6
206 206
       ),
207 207

  
208 208
  BAN2 (
209 209
         new int[][] {
210
                       {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} ,
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 211
                     },
212 212
         6
213 213
       ),
214 214

  
215 215
  BAN3 (
216 216
         new int[][] {
217
                       {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} ,
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 218
                     },
219 219
         6
220 220
       ),
221 221

  
222 222
  BAN4 (
223 223
         new int[][] {
224
                       {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} ,
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 225
                     },
226 226
         6
227 227
       ),
228 228

  
229 229
  SQU1 (
230 230
         new int[][] {
231
                       {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} ,
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 232
                     },
233 233
         7
234 234
       ),
235 235

  
236 236
  SQU2 (
237 237
         new int[][] {
238
                       {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} ,
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 239
                     },
240 240
         7
241 241
       ),
242 242

  
243 243
  MIRR (
244 244
         new int[][] {
245
                       {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} ,
246
                       {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} ,
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 247
                     },
248 248
         7
249 249
       ),
......
255 255
  public static final int MAX_SCRAMBLE;
256 256
  public static final int MAX_OBJECT_SIZE;
257 257

  
258
  private final int[] mObjectSizes, mDBLevels, mNumScrambles, mSmallIconIDs, mMediumIconIDs, mBigIconIDs, mHugeIconIDs, mResourceIDs;
258
  private final int[] mObjectSizes, mDBLevels, mNumScrambles, mSmallIconIDs, mMediumIconIDs, mBigIconIDs, mHugeIconIDs;
259 259
  private final int mRow, mNumSizes;
260 260

  
261 261
  private static final ObjectList[] objects;
......
534 534
    mObjectSizes  = new int[mNumSizes];
535 535
    mDBLevels     = new int[mNumSizes];
536 536
    mNumScrambles = new int[mNumSizes];
537
    mResourceIDs  = new int[mNumSizes];
538 537
    mSmallIconIDs = new int[mNumSizes];
539 538
    mMediumIconIDs= new int[mNumSizes];
540 539
    mBigIconIDs   = new int[mNumSizes];
......
545 544
      mObjectSizes[i]  = info[i][0];
546 545
      mDBLevels[i]     = info[i][1];
547 546
      mNumScrambles[i] = info[i][2];
548
      mResourceIDs[i]  = info[i][3];
549
      mSmallIconIDs[i] = info[i][4];
550
      mMediumIconIDs[i]= info[i][5];
551
      mBigIconIDs[i]   = info[i][6];
552
      mHugeIconIDs[i]  = info[i][7];
547
      mSmallIconIDs[i] = info[i][3];
548
      mMediumIconIDs[i]= info[i][4];
549
      mBigIconIDs[i]   = info[i][5];
550
      mHugeIconIDs[i]  = info[i][6];
553 551
      }
554 552

  
555 553
    mRow  = row;
......
577 575
    return mSmallIconIDs;
578 576
    }
579 577

  
580
///////////////////////////////////////////////////////////////////////////////////////////////////
581

  
582
  public int[] getResourceIDs()
583
    {
584
    return mResourceIDs;
585
    }
586

  
587 578
///////////////////////////////////////////////////////////////////////////////////////////////////
588 579

  
589 580
  public TwistyObject create(int size, Static4D quat, int[][] moves, Resources res, int scrWidth)
src/main/java/org/distorted/objectlib/main/TwistyObject.java
270 270

  
271 271
  private void createMeshAndCubits(ObjectList list, Resources res)
272 272
    {
273
    int sizeIndex = ObjectList.getSizeIndex(list.ordinal(),mNumLayers);
274
    int resourceID= list.getResourceIDs()[sizeIndex];
273
    int resourceID= getResource(mNumLayers);
275 274

  
276 275
    if( resourceID!=0 )
277 276
      {
......
1304 1303
  protected abstract int getNumStickerTypes(int numLayers);
1305 1304
  protected abstract ObjectSticker retSticker(int face);
1306 1305
  protected abstract int getFaceColor(int cubit, int cubitface, int numLayers);
1306
  protected abstract int getResource(int mNumLayers);
1307 1307

  
1308 1308
  public abstract Movement getMovement();
1309 1309
  public abstract Static3D[] getRotationAxis();
src/main/java/org/distorted/objectlib/objects/TwistyBandaged2Bar.java
57 57
    return mStates;
58 58
    }
59 59

  
60
///////////////////////////////////////////////////////////////////////////////////////////////////
61

  
62
  protected int getResource(int numLayers)
63
    {
64
    return R.raw.ban2;
65
    }
66

  
60 67
///////////////////////////////////////////////////////////////////////////////////////////////////
61 68

  
62 69
  float[][] getPositions()
src/main/java/org/distorted/objectlib/objects/TwistyBandaged3Plate.java
70 70
    return mStates;
71 71
    }
72 72

  
73
///////////////////////////////////////////////////////////////////////////////////////////////////
74

  
75
  protected int getResource(int numLayers)
76
    {
77
    return R.raw.ban3;
78
    }
79

  
73 80
///////////////////////////////////////////////////////////////////////////////////////////////////
74 81

  
75 82
  float[][] getPositions()
src/main/java/org/distorted/objectlib/objects/TwistyBandagedEvil.java
198 198
    return mStates;
199 199
    }
200 200

  
201
///////////////////////////////////////////////////////////////////////////////////////////////////
202

  
203
  protected int getResource(int numLayers)
204
    {
205
    return R.raw.ban4;
206
    }
207

  
201 208
///////////////////////////////////////////////////////////////////////////////////////////////////
202 209

  
203 210
  float[][] getPositions()
src/main/java/org/distorted/objectlib/objects/TwistyBandagedFused.java
57 57
    return mStates;
58 58
    }
59 59

  
60
///////////////////////////////////////////////////////////////////////////////////////////////////
61

  
62
  protected int getResource(int numLayers)
63
    {
64
    return R.raw.ban1;
65
    }
66

  
60 67
///////////////////////////////////////////////////////////////////////////////////////////////////
61 68

  
62 69
  float[][] getPositions()
src/main/java/org/distorted/objectlib/objects/TwistyCube.java
104 104
    return mStates;
105 105
    }
106 106

  
107
///////////////////////////////////////////////////////////////////////////////////////////////////
108

  
109
  protected int getResource(int numLayers)
110
    {
111
    switch(numLayers)
112
      {
113
      case 2: return R.raw.cube2;
114
      case 3: return R.raw.cube3;
115
      case 4: return R.raw.cube4;
116
      case 5: return R.raw.cube5;
117
      }
118

  
119
    return 0;
120
    }
121

  
107 122
///////////////////////////////////////////////////////////////////////////////////////////////////
108 123

  
109 124
  private int[] createEdges(int size, int vertex)
src/main/java/org/distorted/objectlib/objects/TwistyDiamond.java
99 99
    return mStates;
100 100
    }
101 101

  
102
///////////////////////////////////////////////////////////////////////////////////////////////////
103

  
104
  protected int getResource(int numLayers)
105
    {
106
    switch(numLayers)
107
      {
108
      case 2: return R.raw.diam2;
109
      case 3: return R.raw.diam3;
110
      case 4: return R.raw.diam4;
111
      }
112

  
113
    return 0;
114
    }
115

  
102 116
///////////////////////////////////////////////////////////////////////////////////////////////////
103 117

  
104 118
  private void initializeQuats()
src/main/java/org/distorted/objectlib/objects/TwistyDino.java
29 29
import org.distorted.library.type.Static3D;
30 30
import org.distorted.library.type.Static4D;
31 31

  
32
import org.distorted.objectlib.R;
32 33
import org.distorted.objectlib.main.Movement;
33 34
import org.distorted.objectlib.main.Movement6;
34 35
import org.distorted.objectlib.main.ObjectList;
......
98 99
         };
99 100
    }
100 101

  
102
///////////////////////////////////////////////////////////////////////////////////////////////////
103

  
104
  protected int getResource(int numLayers)
105
    {
106
    return R.raw.dino;
107
    }
108

  
101 109
///////////////////////////////////////////////////////////////////////////////////////////////////
102 110

  
103 111
  protected Static4D[] getQuats()
src/main/java/org/distorted/objectlib/objects/TwistyHelicopter.java
109 109
    return mStates;
110 110
    }
111 111

  
112
///////////////////////////////////////////////////////////////////////////////////////////////////
113

  
114
  protected int getResource(int numLayers)
115
    {
116
    return R.raw.heli;
117
    }
118

  
112 119
///////////////////////////////////////////////////////////////////////////////////////////////////
113 120

  
114 121
  private void initializeQuats()
src/main/java/org/distorted/objectlib/objects/TwistyIvy.java
98 98
    return mStates;
99 99
    }
100 100

  
101
///////////////////////////////////////////////////////////////////////////////////////////////////
102

  
103
  protected int getResource(int numLayers)
104
    {
105
    return R.raw.ivy;
106
    }
107

  
101 108
///////////////////////////////////////////////////////////////////////////////////////////////////
102 109

  
103 110
  private void initializeQuats()
src/main/java/org/distorted/objectlib/objects/TwistyJing.java
95 95
    return mStates;
96 96
    }
97 97

  
98
///////////////////////////////////////////////////////////////////////////////////////////////////
99

  
100
  protected int getResource(int numLayers)
101
    {
102
    return R.raw.jing;
103
    }
104

  
98 105
///////////////////////////////////////////////////////////////////////////////////////////////////
99 106

  
100 107
  private void initializeQuats()
src/main/java/org/distorted/objectlib/objects/TwistyKilominx.java
84 84
    return numLayers<5 ? 0 : 2*(numLayers-4);
85 85
    }
86 86

  
87
///////////////////////////////////////////////////////////////////////////////////////////////////
88

  
89
  protected int getResource(int numLayers)
90
    {
91
    switch(numLayers)
92
      {
93
      case 3: return R.raw.kilo3;
94
      case 5: return R.raw.kilo5;
95
      }
96

  
97
    return 0;
98
    }
99

  
87 100
///////////////////////////////////////////////////////////////////////////////////////////////////
88 101

  
89 102
  protected int getNumStickerTypes(int numLayers)
src/main/java/org/distorted/objectlib/objects/TwistyMegaminx.java
71 71
    return numLayers-2;
72 72
    }
73 73

  
74
///////////////////////////////////////////////////////////////////////////////////////////////////
75

  
76
  protected int getResource(int numLayers)
77
    {
78
    switch(numLayers)
79
      {
80
      case 3: return R.raw.mega3;
81
      case 5: return R.raw.mega5;
82
      }
83

  
84
    return 0;
85
    }
86

  
74 87
///////////////////////////////////////////////////////////////////////////////////////////////////
75 88

  
76 89
  protected int getNumStickerTypes(int numLayers)
src/main/java/org/distorted/objectlib/objects/TwistyMirror.java
126 126
    return mStates;
127 127
    }
128 128

  
129
///////////////////////////////////////////////////////////////////////////////////////////////////
130

  
131
  protected int getResource(int numLayers)
132
    {
133
    switch(numLayers)
134
      {
135
      case 2: return R.raw.mirr2;
136
      case 3: return R.raw.mirr3;
137
      }
138

  
139
    return 0;
140
    }
141

  
129 142
///////////////////////////////////////////////////////////////////////////////////////////////////
130 143

  
131 144
  private int[] createEdges(int size, int vertex)
src/main/java/org/distorted/objectlib/objects/TwistyPyraminx.java
84 84
    return mStates;
85 85
    }
86 86

  
87
///////////////////////////////////////////////////////////////////////////////////////////////////
88

  
89
  protected int getResource(int numLayers)
90
    {
91
    switch(numLayers)
92
      {
93
      case 3: return R.raw.pyra3;
94
      case 4: return R.raw.pyra4;
95
      case 5: return R.raw.pyra5;
96
      }
97

  
98
    return 0;
99
    }
100

  
87 101
///////////////////////////////////////////////////////////////////////////////////////////////////
88 102

  
89 103
  private void initializeQuats()
src/main/java/org/distorted/objectlib/objects/TwistyRedi.java
101 101
    return mStates;
102 102
    }
103 103

  
104
///////////////////////////////////////////////////////////////////////////////////////////////////
105

  
106
  protected int getResource(int numLayers)
107
    {
108
    return R.raw.redi;
109
    }
110

  
104 111
///////////////////////////////////////////////////////////////////////////////////////////////////
105 112

  
106 113
  private void initializeQuats()
src/main/java/org/distorted/objectlib/objects/TwistyRex.java
96 96
    return mStates;
97 97
    }
98 98

  
99
///////////////////////////////////////////////////////////////////////////////////////////////////
100

  
101
  protected int getResource(int numLayers)
102
    {
103
    return R.raw.rex;
104
    }
105

  
99 106
///////////////////////////////////////////////////////////////////////////////////////////////////
100 107

  
101 108
  private void initializeQuats()
src/main/java/org/distorted/objectlib/objects/TwistySkewb.java
95 95
    return mStates;
96 96
    }
97 97

  
98
///////////////////////////////////////////////////////////////////////////////////////////////////
99

  
100
  protected int getResource(int numLayers)
101
    {
102
    switch(numLayers)
103
      {
104
      case 2: return R.raw.skew2;
105
      case 3: return R.raw.skew3;
106
      }
107

  
108
    return 0;
109
    }
110

  
98 111
///////////////////////////////////////////////////////////////////////////////////////////////////
99 112

  
100 113
  private void initializeQuats()
src/main/java/org/distorted/objectlib/objects/TwistySquare1.java
60 60
    return null;
61 61
    }
62 62

  
63
///////////////////////////////////////////////////////////////////////////////////////////////////
64

  
65
  protected int getResource(int numLayers)
66
    {
67
    return R.raw.squa1;
68
    }
69

  
63 70
///////////////////////////////////////////////////////////////////////////////////////////////////
64 71

  
65 72
  protected int getScrambleType()
src/main/java/org/distorted/objectlib/objects/TwistySquare2.java
78 78
    return mStates;
79 79
    }
80 80

  
81
///////////////////////////////////////////////////////////////////////////////////////////////////
82

  
83
  protected int getResource(int numLayers)
84
    {
85
    return R.raw.squa2;
86
    }
87

  
81 88
///////////////////////////////////////////////////////////////////////////////////////////////////
82 89

  
83 90
  protected int[] getSolvedQuats(int cubit, int numLayers)
src/main/java/org/distorted/objectlib/objects/TwistyUltimate.java
99 99
    return mStates;
100 100
    }
101 101

  
102
///////////////////////////////////////////////////////////////////////////////////////////////////
103

  
104
  protected int getResource(int numLayers)
105
    {
106
    return R.raw.ulti;
107
    }
108

  
102 109
///////////////////////////////////////////////////////////////////////////////////////////////////
103 110

  
104 111
  private void initializeQuats()

Also available in: Unified diff