Revision ecf3d6e3
Added by Leszek Koltunski over 2 years ago
| src/main/java/org/distorted/objectlib/main/ObjectType.java | ||
|---|---|---|
| 24 | 24 |
import org.distorted.library.main.DistortedEffects; |
| 25 | 25 |
import org.distorted.library.main.DistortedTexture; |
| 26 | 26 |
import org.distorted.library.mesh.MeshSquare; |
| 27 |
import org.distorted.library.type.Static3D; |
|
| 27 | 28 |
import org.distorted.library.type.Static4D; |
| 28 | 29 |
|
| 29 | 30 |
import org.distorted.objectlib.R; |
| ... | ... | |
| 149 | 150 |
|
| 150 | 151 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 151 | 152 |
|
| 152 |
public TwistyObject create(Static4D quat, Resources res, int scrWidth) |
|
| 153 |
public TwistyObject create(Static4D quat, Static3D move, Resources res, int scrWidth)
|
|
| 153 | 154 |
{
|
| 154 | 155 |
DistortedTexture texture = new DistortedTexture(); |
| 155 | 156 |
DistortedEffects effects = new DistortedEffects(); |
| ... | ... | |
| 163 | 164 |
case 0: |
| 164 | 165 |
case 1: |
| 165 | 166 |
case 2: |
| 166 |
case 3: return new TwistyCube (size, quat, texture, mesh, effects, res, scrWidth); |
|
| 167 |
case 4: return new TwistyJing (size, quat, texture, mesh, effects, res, scrWidth); |
|
| 167 |
case 3: return new TwistyCube (size, quat, move, texture, mesh, effects, res, scrWidth);
|
|
| 168 |
case 4: return new TwistyJing (size, quat, move, texture, mesh, effects, res, scrWidth);
|
|
| 168 | 169 |
case 5: |
| 169 | 170 |
case 6: |
| 170 |
case 7: return new TwistyPyraminx (size, quat, texture, mesh, effects, res, scrWidth); |
|
| 171 |
case 7: return new TwistyPyraminx (size, quat, move, texture, mesh, effects, res, scrWidth);
|
|
| 171 | 172 |
case 8: |
| 172 |
case 9: return new TwistyKilominx (size, quat, texture, mesh, effects, res, scrWidth); |
|
| 173 |
case 9: return new TwistyKilominx (size, quat, move, texture, mesh, effects, res, scrWidth);
|
|
| 173 | 174 |
case 10: |
| 174 |
case 11: return new TwistyMegaminx (size, quat, texture, mesh, effects, res, scrWidth); |
|
| 175 |
case 12: return new TwistyUltimate (size, quat, texture, mesh, effects, res, scrWidth); |
|
| 175 |
case 11: return new TwistyMegaminx (size, quat, move, texture, mesh, effects, res, scrWidth);
|
|
| 176 |
case 12: return new TwistyUltimate (size, quat, move, texture, mesh, effects, res, scrWidth);
|
|
| 176 | 177 |
case 13: |
| 177 | 178 |
case 14: |
| 178 |
case 15: return new TwistyDiamond (size, quat, texture, mesh, effects, res, scrWidth); |
|
| 179 |
case 16: return new TwistyDino6 (size, quat, texture, mesh, effects, res, scrWidth); |
|
| 180 |
case 17: return new TwistyDino4 (size, quat, texture, mesh, effects, res, scrWidth); |
|
| 181 |
case 18: return new TwistyRedi (size, quat, texture, mesh, effects, res, scrWidth); |
|
| 182 |
case 19: return new TwistyHelicopter (size, quat, texture, mesh, effects, res, scrWidth); |
|
| 179 |
case 15: return new TwistyDiamond (size, quat, move, texture, mesh, effects, res, scrWidth);
|
|
| 180 |
case 16: return new TwistyDino6 (size, quat, move, texture, mesh, effects, res, scrWidth);
|
|
| 181 |
case 17: return new TwistyDino4 (size, quat, move, texture, mesh, effects, res, scrWidth);
|
|
| 182 |
case 18: return new TwistyRedi (size, quat, move, texture, mesh, effects, res, scrWidth);
|
|
| 183 |
case 19: return new TwistyHelicopter (size, quat, move, texture, mesh, effects, res, scrWidth);
|
|
| 183 | 184 |
case 20: |
| 184 |
case 21: return new TwistySkewb (size, quat, texture, mesh, effects, res, scrWidth); |
|
| 185 |
case 22: return new TwistyIvy (size, quat, texture, mesh, effects, res, scrWidth); |
|
| 186 |
case 23: return new TwistyRex (size, quat, texture, mesh, effects, res, scrWidth); |
|
| 187 |
case 24: return new TwistyBandagedFused (size, quat, texture, mesh, effects, res, scrWidth); |
|
| 188 |
case 25: return new TwistyBandaged2Bar (size, quat, texture, mesh, effects, res, scrWidth); |
|
| 189 |
case 26: return new TwistyBandaged3Plate(size, quat, texture, mesh, effects, res, scrWidth); |
|
| 190 |
case 27: return new TwistyBandagedEvil (size, quat, texture, mesh, effects, res, scrWidth); |
|
| 191 |
case 28: return new TwistySquare1 (size, quat, texture, mesh, effects, res, scrWidth); |
|
| 192 |
case 29: return new TwistySquare2 (size, quat, texture, mesh, effects, res, scrWidth); |
|
| 185 |
case 21: return new TwistySkewb (size, quat, move, texture, mesh, effects, res, scrWidth);
|
|
| 186 |
case 22: return new TwistyIvy (size, quat, move, texture, mesh, effects, res, scrWidth);
|
|
| 187 |
case 23: return new TwistyRex (size, quat, move, texture, mesh, effects, res, scrWidth);
|
|
| 188 |
case 24: return new TwistyBandagedFused (size, quat, move, texture, mesh, effects, res, scrWidth);
|
|
| 189 |
case 25: return new TwistyBandaged2Bar (size, quat, move, texture, mesh, effects, res, scrWidth);
|
|
| 190 |
case 26: return new TwistyBandaged3Plate(size, quat, move, texture, mesh, effects, res, scrWidth);
|
|
| 191 |
case 27: return new TwistyBandagedEvil (size, quat, move, texture, mesh, effects, res, scrWidth);
|
|
| 192 |
case 28: return new TwistySquare1 (size, quat, move, texture, mesh, effects, res, scrWidth);
|
|
| 193 |
case 29: return new TwistySquare2 (size, quat, move, texture, mesh, effects, res, scrWidth);
|
|
| 193 | 194 |
case 30: |
| 194 |
case 31: return new TwistyMirror (size, quat, texture, mesh, effects, res, scrWidth); |
|
| 195 |
case 31: return new TwistyMirror (size, quat, move, texture, mesh, effects, res, scrWidth);
|
|
| 195 | 196 |
} |
| 196 | 197 |
|
| 197 | 198 |
return null; |
Also available in: Unified diff
1) introduce possibility to move objects, i.e. display them not in the middle of the screen (not fully functional yet)
2) do away with unneeded any more interface 'EffectController' - since ObjectPreRender is the only implementation now.