Revision c9c71c3f
Added by Leszek Koltunski over 2 years ago
| src/main/java/org/distorted/objectlib/objects/TwistyUltimate.java | ||
|---|---|---|
| 19 | 19 |
|
| 20 | 20 |
package org.distorted.objectlib.objects; |
| 21 | 21 |
|
| 22 |
import static org.distorted.objectlib.movement.Movement.MOVEMENT_DODECAHEDRON;
|
|
| 23 |
import static org.distorted.objectlib.movement.Movement.TYPE_NOT_SPLIT;
|
|
| 22 |
import static org.distorted.objectlib.touchcontrol.TouchControl.TC_DODECAHEDRON;
|
|
| 23 |
import static org.distorted.objectlib.touchcontrol.TouchControl.TYPE_NOT_SPLIT;
|
|
| 24 | 24 |
|
| 25 | 25 |
import java.io.InputStream; |
| 26 | 26 |
|
| 27 | 27 |
import org.distorted.library.type.Static3D; |
| 28 | 28 |
import org.distorted.library.type.Static4D; |
| 29 | 29 |
|
| 30 |
import org.distorted.objectlib.movement.MovementDodecahedron;
|
|
| 30 |
import org.distorted.objectlib.touchcontrol.TouchControlDodecahedron;
|
|
| 31 | 31 |
import org.distorted.objectlib.main.ObjectControl; |
| 32 | 32 |
import org.distorted.objectlib.main.ObjectType; |
| 33 | 33 |
import org.distorted.objectlib.helpers.ObjectShape; |
| ... | ... | |
| 115 | 115 |
{
|
| 116 | 116 |
if( mQuats==null ) initializeQuats(); |
| 117 | 117 |
int status = retCubitSolvedStatus(cubit,numLayers); |
| 118 |
return status<0 ? null : buildSolvedQuats(MovementDodecahedron.FACE_AXIS[status],mQuats);
|
|
| 118 |
return status<0 ? null : buildSolvedQuats(TouchControlDodecahedron.FACE_AXIS[status],mQuats);
|
|
| 119 | 119 |
} |
| 120 | 120 |
|
| 121 | 121 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| ... | ... | |
| 399 | 399 |
|
| 400 | 400 |
public int getMovementType() |
| 401 | 401 |
{
|
| 402 |
return MOVEMENT_DODECAHEDRON;
|
|
| 402 |
return TC_DODECAHEDRON;
|
|
| 403 | 403 |
} |
| 404 | 404 |
|
| 405 | 405 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
Also available in: Unified diff
Abstract out the TouchControl stuff in preparation for its new type - TouchControlShapeChanging.