Revision 55fa6993
Added by Leszek Koltunski over 2 years ago
src/main/java/org/distorted/objectlib/objects/TwistyBandaged2Bar.java | ||
---|---|---|
62 | 62 |
|
63 | 63 |
protected int getResource(int[] numLayers) |
64 | 64 |
{ |
65 |
return R.raw.ban2; |
|
65 |
return R.raw.ban2_3;
|
|
66 | 66 |
} |
67 | 67 |
|
68 | 68 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
src/main/java/org/distorted/objectlib/objects/TwistyBandaged3Plate.java | ||
---|---|---|
75 | 75 |
|
76 | 76 |
protected int getResource(int[] numLayers) |
77 | 77 |
{ |
78 |
return R.raw.ban3; |
|
78 |
return R.raw.ban3_3;
|
|
79 | 79 |
} |
80 | 80 |
|
81 | 81 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
src/main/java/org/distorted/objectlib/objects/TwistyBandagedEvil.java | ||
---|---|---|
203 | 203 |
|
204 | 204 |
protected int getResource(int[] numLayers) |
205 | 205 |
{ |
206 |
return R.raw.ban4; |
|
206 |
return R.raw.ban4_3;
|
|
207 | 207 |
} |
208 | 208 |
|
209 | 209 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
src/main/java/org/distorted/objectlib/objects/TwistyBandagedFused.java | ||
---|---|---|
62 | 62 |
|
63 | 63 |
protected int getResource(int[] numLayers) |
64 | 64 |
{ |
65 |
return R.raw.ban1; |
|
65 |
return R.raw.ban1_3;
|
|
66 | 66 |
} |
67 | 67 |
|
68 | 68 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
src/main/java/org/distorted/objectlib/objects/TwistyCuboid.java | ||
---|---|---|
183 | 183 |
|
184 | 184 |
switch(x) |
185 | 185 |
{ |
186 |
case 2: return y==2 ? R.raw.cube2 : R.raw.cu_232; |
|
186 |
case 2: return y==2 ? R.raw.cube_2 : R.raw.cu_232;
|
|
187 | 187 |
case 3: switch(y) |
188 | 188 |
{ |
189 | 189 |
case 2: return R.raw.cu_323; |
190 |
case 3: return R.raw.cube3; |
|
190 |
case 3: return R.raw.cube_3;
|
|
191 | 191 |
case 4: return R.raw.cu_343; |
192 | 192 |
} |
193 |
case 4: return R.raw.cube4; |
|
194 |
case 5: return R.raw.cube5; |
|
193 |
case 4: return R.raw.cube_4;
|
|
194 |
case 5: return R.raw.cube_5;
|
|
195 | 195 |
} |
196 | 196 |
|
197 | 197 |
return 0; |
src/main/java/org/distorted/objectlib/objects/TwistyDiamond.java | ||
---|---|---|
100 | 100 |
{ |
101 | 101 |
switch(numLayers[0]) |
102 | 102 |
{ |
103 |
case 2: return R.raw.diam2; |
|
104 |
case 3: return R.raw.diam3; |
|
105 |
case 4: return R.raw.diam4; |
|
103 |
case 2: return R.raw.diam_2;
|
|
104 |
case 3: return R.raw.diam_3;
|
|
105 |
case 4: return R.raw.diam_4;
|
|
106 | 106 |
} |
107 | 107 |
|
108 | 108 |
return 0; |
src/main/java/org/distorted/objectlib/objects/TwistyDino.java | ||
---|---|---|
90 | 90 |
|
91 | 91 |
protected int getResource(int[] numLayers) |
92 | 92 |
{ |
93 |
return R.raw.dino; |
|
93 |
return R.raw.dino_3;
|
|
94 | 94 |
} |
95 | 95 |
|
96 | 96 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
src/main/java/org/distorted/objectlib/objects/TwistyHelicopter.java | ||
---|---|---|
102 | 102 |
|
103 | 103 |
protected int getResource(int[] numLayers) |
104 | 104 |
{ |
105 |
return R.raw.heli; |
|
105 |
return R.raw.heli_3;
|
|
106 | 106 |
} |
107 | 107 |
|
108 | 108 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
src/main/java/org/distorted/objectlib/objects/TwistyIvy.java | ||
---|---|---|
91 | 91 |
|
92 | 92 |
protected int getResource(int[] numLayers) |
93 | 93 |
{ |
94 |
return R.raw.ivy; |
|
94 |
return R.raw.ivy_2;
|
|
95 | 95 |
} |
96 | 96 |
|
97 | 97 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
src/main/java/org/distorted/objectlib/objects/TwistyJing.java | ||
---|---|---|
93 | 93 |
|
94 | 94 |
protected int getResource(int[] numLayers) |
95 | 95 |
{ |
96 |
return R.raw.jing; |
|
96 |
return R.raw.jing_2;
|
|
97 | 97 |
} |
98 | 98 |
|
99 | 99 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
src/main/java/org/distorted/objectlib/objects/TwistyKilominx.java | ||
---|---|---|
92 | 92 |
{ |
93 | 93 |
switch(numLayers[0]) |
94 | 94 |
{ |
95 |
case 3: return R.raw.kilo3; |
|
96 |
case 5: return R.raw.kilo5; |
|
95 |
case 3: return R.raw.kilo_3;
|
|
96 |
case 5: return R.raw.kilo_5;
|
|
97 | 97 |
} |
98 | 98 |
|
99 | 99 |
return 0; |
src/main/java/org/distorted/objectlib/objects/TwistyMegaminx.java | ||
---|---|---|
79 | 79 |
{ |
80 | 80 |
switch(numLayers[0]) |
81 | 81 |
{ |
82 |
case 3: return R.raw.mega3; |
|
83 |
case 5: return R.raw.mega5; |
|
82 |
case 3: return R.raw.mega_3;
|
|
83 |
case 5: return R.raw.mega_5;
|
|
84 | 84 |
} |
85 | 85 |
|
86 | 86 |
return 0; |
src/main/java/org/distorted/objectlib/objects/TwistyMirror.java | ||
---|---|---|
125 | 125 |
{ |
126 | 126 |
switch(numLayers[0]) |
127 | 127 |
{ |
128 |
case 2: return R.raw.mirr2; |
|
129 |
case 3: return R.raw.mirr3; |
|
128 |
case 2: return R.raw.mirr_2;
|
|
129 |
case 3: return R.raw.mirr_3;
|
|
130 | 130 |
} |
131 | 131 |
|
132 | 132 |
return 0; |
src/main/java/org/distorted/objectlib/objects/TwistyPyraminx.java | ||
---|---|---|
84 | 84 |
{ |
85 | 85 |
switch(numLayers[0]) |
86 | 86 |
{ |
87 |
case 3: return R.raw.pyra3; |
|
88 |
case 4: return R.raw.pyra4; |
|
89 |
case 5: return R.raw.pyra5; |
|
87 |
case 3: return R.raw.pyra_3;
|
|
88 |
case 4: return R.raw.pyra_4;
|
|
89 |
case 5: return R.raw.pyra_5;
|
|
90 | 90 |
} |
91 | 91 |
|
92 | 92 |
return 0; |
src/main/java/org/distorted/objectlib/objects/TwistyRedi.java | ||
---|---|---|
94 | 94 |
|
95 | 95 |
protected int getResource(int[] numLayers) |
96 | 96 |
{ |
97 |
return R.raw.redi; |
|
97 |
return R.raw.redi_3;
|
|
98 | 98 |
} |
99 | 99 |
|
100 | 100 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
src/main/java/org/distorted/objectlib/objects/TwistyRex.java | ||
---|---|---|
89 | 89 |
|
90 | 90 |
protected int getResource(int[] numLayers) |
91 | 91 |
{ |
92 |
return R.raw.rex; |
|
92 |
return R.raw.rex_3;
|
|
93 | 93 |
} |
94 | 94 |
|
95 | 95 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
src/main/java/org/distorted/objectlib/objects/TwistySkewb.java | ||
---|---|---|
92 | 92 |
{ |
93 | 93 |
switch(numLayers[0]) |
94 | 94 |
{ |
95 |
case 2: return R.raw.skew2; |
|
96 |
case 3: return R.raw.skew3; |
|
95 |
case 2: return R.raw.skew_2;
|
|
96 |
case 3: return R.raw.skew_3;
|
|
97 | 97 |
} |
98 | 98 |
|
99 | 99 |
return 0; |
src/main/java/org/distorted/objectlib/objects/TwistySquare1.java | ||
---|---|---|
66 | 66 |
|
67 | 67 |
protected int getResource(int[] numLayers) |
68 | 68 |
{ |
69 |
return R.raw.squa1;
|
|
69 |
return R.raw.squ1_3;
|
|
70 | 70 |
} |
71 | 71 |
|
72 | 72 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
src/main/java/org/distorted/objectlib/objects/TwistySquare2.java | ||
---|---|---|
84 | 84 |
|
85 | 85 |
protected int getResource(int[] numLayers) |
86 | 86 |
{ |
87 |
return R.raw.squa2;
|
|
87 |
return R.raw.squ2_3;
|
|
88 | 88 |
} |
89 | 89 |
|
90 | 90 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
src/main/java/org/distorted/objectlib/objects/TwistyUltimate.java | ||
---|---|---|
97 | 97 |
|
98 | 98 |
protected int getResource(int[] numLayers) |
99 | 99 |
{ |
100 |
return R.raw.ulti; |
|
100 |
return R.raw.ulti_2;
|
|
101 | 101 |
} |
102 | 102 |
|
103 | 103 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
Also available in: Unified diff
Systematic names for the meshes.