Revision e7daa161
Added by Leszek Koltunski over 2 years ago
| src/main/java/org/distorted/objectlib/main/ObjectType.java | ||
|---|---|---|
| 163 | 163 |
|
| 164 | 164 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 165 | 165 |
|
| 166 |
public TwistyObject create(Static4D quat, Static3D move, Resources res, int scrWidth)
|
|
| 166 |
public TwistyObject create(Static4D quat, Static3D move, Resources res, int surfaceW, int surfaceH)
|
|
| 167 | 167 |
{
|
| 168 | 168 |
DistortedTexture texture = new DistortedTexture(); |
| 169 | 169 |
DistortedEffects effects = new DistortedEffects(); |
| ... | ... | |
| 184 | 184 |
case 0: |
| 185 | 185 |
case 1: |
| 186 | 186 |
case 2: |
| 187 |
case 3: return new TwistyCube (numL, quat, move, texture, mesh, effects, res, scrWidth);
|
|
| 188 |
case 4: return new TwistyJing (numL, quat, move, texture, mesh, effects, res, scrWidth);
|
|
| 187 |
case 3: return new TwistyCube (numL, quat, move, texture, mesh, effects, res, surfaceW, surfaceH);
|
|
| 188 |
case 4: return new TwistyJing (numL, quat, move, texture, mesh, effects, res, surfaceW, surfaceH);
|
|
| 189 | 189 |
case 5: |
| 190 | 190 |
case 6: |
| 191 |
case 7: return new TwistyPyraminx (numL, quat, move, texture, mesh, effects, res, scrWidth);
|
|
| 191 |
case 7: return new TwistyPyraminx (numL, quat, move, texture, mesh, effects, res, surfaceW, surfaceH);
|
|
| 192 | 192 |
case 8: |
| 193 |
case 9: return new TwistyKilominx (numL, quat, move, texture, mesh, effects, res, scrWidth);
|
|
| 193 |
case 9: return new TwistyKilominx (numL, quat, move, texture, mesh, effects, res, surfaceW, surfaceH);
|
|
| 194 | 194 |
case 10: |
| 195 |
case 11: return new TwistyMegaminx (numL, quat, move, texture, mesh, effects, res, scrWidth);
|
|
| 196 |
case 12: return new TwistyUltimate (numL, quat, move, texture, mesh, effects, res, scrWidth);
|
|
| 195 |
case 11: return new TwistyMegaminx (numL, quat, move, texture, mesh, effects, res, surfaceW, surfaceH);
|
|
| 196 |
case 12: return new TwistyUltimate (numL, quat, move, texture, mesh, effects, res, surfaceW, surfaceH);
|
|
| 197 | 197 |
case 13: |
| 198 | 198 |
case 14: |
| 199 |
case 15: return new TwistyDiamond (numL, quat, move, texture, mesh, effects, res, scrWidth);
|
|
| 200 |
case 16: return new TwistyDino6 (numL, quat, move, texture, mesh, effects, res, scrWidth);
|
|
| 201 |
case 17: return new TwistyDino4 (numL, quat, move, texture, mesh, effects, res, scrWidth);
|
|
| 202 |
case 18: return new TwistyRedi (numL, quat, move, texture, mesh, effects, res, scrWidth);
|
|
| 203 |
case 19: return new TwistyHelicopter (numL, quat, move, texture, mesh, effects, res, scrWidth);
|
|
| 199 |
case 15: return new TwistyDiamond (numL, quat, move, texture, mesh, effects, res, surfaceW, surfaceH);
|
|
| 200 |
case 16: return new TwistyDino6 (numL, quat, move, texture, mesh, effects, res, surfaceW, surfaceH);
|
|
| 201 |
case 17: return new TwistyDino4 (numL, quat, move, texture, mesh, effects, res, surfaceW, surfaceH);
|
|
| 202 |
case 18: return new TwistyRedi (numL, quat, move, texture, mesh, effects, res, surfaceW, surfaceH);
|
|
| 203 |
case 19: return new TwistyHelicopter (numL, quat, move, texture, mesh, effects, res, surfaceW, surfaceH);
|
|
| 204 | 204 |
case 20: |
| 205 |
case 21: return new TwistySkewb (numL, quat, move, texture, mesh, effects, res, scrWidth);
|
|
| 206 |
case 22: return new TwistyIvy (numL, quat, move, texture, mesh, effects, res, scrWidth);
|
|
| 207 |
case 23: return new TwistyRex (numL, quat, move, texture, mesh, effects, res, scrWidth);
|
|
| 208 |
case 24: return new TwistyBandagedFused (numL, quat, move, texture, mesh, effects, res, scrWidth);
|
|
| 209 |
case 25: return new TwistyBandaged2Bar (numL, quat, move, texture, mesh, effects, res, scrWidth);
|
|
| 210 |
case 26: return new TwistyBandaged3Plate(numL, quat, move, texture, mesh, effects, res, scrWidth);
|
|
| 211 |
case 27: return new TwistyBandagedEvil (numL, quat, move, texture, mesh, effects, res, scrWidth);
|
|
| 212 |
case 28: return new TwistySquare1 (numL, quat, move, texture, mesh, effects, res, scrWidth);
|
|
| 213 |
case 29: return new TwistySquare2 (numL, quat, move, texture, mesh, effects, res, scrWidth);
|
|
| 205 |
case 21: return new TwistySkewb (numL, quat, move, texture, mesh, effects, res, surfaceW, surfaceH);
|
|
| 206 |
case 22: return new TwistyIvy (numL, quat, move, texture, mesh, effects, res, surfaceW, surfaceH);
|
|
| 207 |
case 23: return new TwistyRex (numL, quat, move, texture, mesh, effects, res, surfaceW, surfaceH);
|
|
| 208 |
case 24: return new TwistyBandagedFused (numL, quat, move, texture, mesh, effects, res, surfaceW, surfaceH);
|
|
| 209 |
case 25: return new TwistyBandaged2Bar (numL, quat, move, texture, mesh, effects, res, surfaceW, surfaceH);
|
|
| 210 |
case 26: return new TwistyBandaged3Plate(numL, quat, move, texture, mesh, effects, res, surfaceW, surfaceH);
|
|
| 211 |
case 27: return new TwistyBandagedEvil (numL, quat, move, texture, mesh, effects, res, surfaceW, surfaceH);
|
|
| 212 |
case 28: return new TwistySquare1 (numL, quat, move, texture, mesh, effects, res, surfaceW, surfaceH);
|
|
| 213 |
case 29: return new TwistySquare2 (numL, quat, move, texture, mesh, effects, res, surfaceW, surfaceH);
|
|
| 214 | 214 |
case 30: |
| 215 |
case 31: return new TwistyMirror (numL, quat, move, texture, mesh, effects, res, scrWidth);
|
|
| 215 |
case 31: return new TwistyMirror (numL, quat, move, texture, mesh, effects, res, surfaceW, surfaceH);
|
|
| 216 | 216 |
} |
| 217 | 217 |
|
| 218 | 218 |
return null; |
Also available in: Unified diff
- remove the retarded NODE_RATIO from TwistyObject
- more correctly estimate Cuboid's 'realSize' as an average of their 3 sizes.