Revision 7ba38dd4
Added by Leszek Koltunski over 2 years ago
| src/main/java/org/distorted/objectlib/main/ObjectType.java | ||
|---|---|---|
| 21 | 21 |
|
| 22 | 22 |
import android.content.res.Resources; |
| 23 | 23 |
|
| 24 |
import org.distorted.library.main.DistortedEffects; |
|
| 25 |
import org.distorted.library.main.DistortedTexture; |
|
| 26 |
import org.distorted.library.mesh.MeshSquare; |
|
| 27 | 24 |
import org.distorted.library.type.Static3D; |
| 28 | 25 |
import org.distorted.library.type.Static4D; |
| 29 | 26 |
|
| ... | ... | |
| 158 | 155 |
|
| 159 | 156 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 160 | 157 |
|
| 161 |
public TwistyObject create(Static4D quat, Static3D move, Resources res, int surfaceW, int surfaceH)
|
|
| 158 |
public TwistyObject create(Static4D quat, Static3D move, Resources res) |
|
| 162 | 159 |
{
|
| 163 |
DistortedTexture texture = new DistortedTexture(); |
|
| 164 |
DistortedEffects effects = new DistortedEffects(); |
|
| 165 |
MeshSquare mesh = new MeshSquare(20,20); // mesh of the node, not of the cubits |
|
| 166 |
|
|
| 167 | 160 |
int ord = ordinal(); |
| 168 | 161 |
int[] numL= objects[ord].mNumLayers; |
| 169 | 162 |
|
| ... | ... | |
| 172 | 165 |
case 0: |
| 173 | 166 |
case 1: |
| 174 | 167 |
case 2: |
| 175 |
case 3: return new TwistyCuboid (numL, quat, move, texture, mesh, effects, res, surfaceW, surfaceH);
|
|
| 176 |
case 4: return new TwistyJing (numL, quat, move, texture, mesh, effects, res, surfaceW, surfaceH);
|
|
| 168 |
case 3: return new TwistyCuboid (numL, quat, move, res);
|
|
| 169 |
case 4: return new TwistyJing (numL, quat, move, res);
|
|
| 177 | 170 |
case 5: |
| 178 | 171 |
case 6: |
| 179 |
case 7: return new TwistyPyraminx (numL, quat, move, texture, mesh, effects, res, surfaceW, surfaceH);
|
|
| 172 |
case 7: return new TwistyPyraminx (numL, quat, move, res);
|
|
| 180 | 173 |
case 8: |
| 181 |
case 9: return new TwistyKilominx (numL, quat, move, texture, mesh, effects, res, surfaceW, surfaceH);
|
|
| 174 |
case 9: return new TwistyKilominx (numL, quat, move, res);
|
|
| 182 | 175 |
case 10: |
| 183 |
case 11: return new TwistyMegaminx (numL, quat, move, texture, mesh, effects, res, surfaceW, surfaceH);
|
|
| 184 |
case 12: return new TwistyUltimate (numL, quat, move, texture, mesh, effects, res, surfaceW, surfaceH);
|
|
| 176 |
case 11: return new TwistyMegaminx (numL, quat, move, res);
|
|
| 177 |
case 12: return new TwistyUltimate (numL, quat, move, res);
|
|
| 185 | 178 |
case 13: |
| 186 | 179 |
case 14: |
| 187 |
case 15: return new TwistyDiamond (numL, quat, move, texture, mesh, effects, res, surfaceW, surfaceH);
|
|
| 188 |
case 16: return new TwistyDino6 (numL, quat, move, texture, mesh, effects, res, surfaceW, surfaceH);
|
|
| 189 |
case 17: return new TwistyDino4 (numL, quat, move, texture, mesh, effects, res, surfaceW, surfaceH);
|
|
| 190 |
case 18: return new TwistyRedi (numL, quat, move, texture, mesh, effects, res, surfaceW, surfaceH);
|
|
| 191 |
case 19: return new TwistyHelicopter (numL, quat, move, texture, mesh, effects, res, surfaceW, surfaceH);
|
|
| 180 |
case 15: return new TwistyDiamond (numL, quat, move, res);
|
|
| 181 |
case 16: return new TwistyDino6 (numL, quat, move, res);
|
|
| 182 |
case 17: return new TwistyDino4 (numL, quat, move, res);
|
|
| 183 |
case 18: return new TwistyRedi (numL, quat, move, res);
|
|
| 184 |
case 19: return new TwistyHelicopter (numL, quat, move, res);
|
|
| 192 | 185 |
case 20: |
| 193 |
case 21: return new TwistySkewb (numL, quat, move, texture, mesh, effects, res, surfaceW, surfaceH);
|
|
| 194 |
case 22: return new TwistyIvy (numL, quat, move, texture, mesh, effects, res, surfaceW, surfaceH);
|
|
| 195 |
case 23: return new TwistyRex (numL, quat, move, texture, mesh, effects, res, surfaceW, surfaceH);
|
|
| 196 |
case 24: return new TwistyBandagedFused (numL, quat, move, texture, mesh, effects, res, surfaceW, surfaceH);
|
|
| 197 |
case 25: return new TwistyBandaged2Bar (numL, quat, move, texture, mesh, effects, res, surfaceW, surfaceH);
|
|
| 198 |
case 26: return new TwistyBandaged3Plate(numL, quat, move, texture, mesh, effects, res, surfaceW, surfaceH);
|
|
| 199 |
case 27: return new TwistyBandagedEvil (numL, quat, move, texture, mesh, effects, res, surfaceW, surfaceH);
|
|
| 200 |
case 28: return new TwistySquare1 (numL, quat, move, texture, mesh, effects, res, surfaceW, surfaceH);
|
|
| 201 |
case 29: return new TwistySquare2 (numL, quat, move, texture, mesh, effects, res, surfaceW, surfaceH);
|
|
| 186 |
case 21: return new TwistySkewb (numL, quat, move, res);
|
|
| 187 |
case 22: return new TwistyIvy (numL, quat, move, res);
|
|
| 188 |
case 23: return new TwistyRex (numL, quat, move, res);
|
|
| 189 |
case 24: return new TwistyBandagedFused (numL, quat, move, res);
|
|
| 190 |
case 25: return new TwistyBandaged2Bar (numL, quat, move, res);
|
|
| 191 |
case 26: return new TwistyBandaged3Plate(numL, quat, move, res);
|
|
| 192 |
case 27: return new TwistyBandagedEvil (numL, quat, move, res);
|
|
| 193 |
case 28: return new TwistySquare1 (numL, quat, move, res);
|
|
| 194 |
case 29: return new TwistySquare2 (numL, quat, move, res);
|
|
| 202 | 195 |
case 30: |
| 203 |
case 31: return new TwistyMirror (numL, quat, move, texture, mesh, effects, res, surfaceW, surfaceH);
|
|
| 196 |
case 31: return new TwistyMirror (numL, quat, move, res);
|
|
| 204 | 197 |
case 32: |
| 205 | 198 |
case 33: |
| 206 |
case 34: return new TwistyCuboid (numL, quat, move, texture, mesh, effects, res, surfaceW, surfaceH);
|
|
| 199 |
case 34: return new TwistyCuboid (numL, quat, move, res);
|
|
| 207 | 200 |
} |
| 208 | 201 |
|
| 209 | 202 |
return null; |
Also available in: Unified diff
Major change: separate the notion of a TwistyObject and its Node. Now,
1) the Node stays when we change objects (this makes transitions faster)
2) it's possible to just create an Object without adding it to the Screen (now app needs to explicitly create the Node and add it to its Screen itself)