Revision c9c71c3f
Added by Leszek Koltunski over 2 years ago
| src/main/java/org/distorted/objectlib/objects/TwistyPyraminx.java | ||
|---|---|---|
| 19 | 19 |
|
| 20 | 20 |
package org.distorted.objectlib.objects; |
| 21 | 21 |
|
| 22 |
import static org.distorted.objectlib.movement.Movement.MOVEMENT_TETRAHEDRON;
|
|
| 23 |
import static org.distorted.objectlib.movement.Movement.TYPE_NOT_SPLIT;
|
|
| 22 |
import static org.distorted.objectlib.touchcontrol.TouchControl.TC_TETRAHEDRON;
|
|
| 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.MovementTetrahedron;
|
|
| 30 |
import org.distorted.objectlib.touchcontrol.TouchControlTetrahedron;
|
|
| 31 | 31 |
import org.distorted.objectlib.main.ObjectControl; |
| 32 | 32 |
import org.distorted.objectlib.main.ObjectType; |
| 33 | 33 |
import org.distorted.objectlib.helpers.ObjectShape; |
| ... | ... | |
| 136 | 136 |
{
|
| 137 | 137 |
if( mQuats==null ) initializeQuats(); |
| 138 | 138 |
int status = retCubitSolvedStatus(cubit,numLayers); |
| 139 |
return status<0 ? null : buildSolvedQuats(MovementTetrahedron.FACE_AXIS[status],mQuats);
|
|
| 139 |
return status<0 ? null : buildSolvedQuats(TouchControlTetrahedron.FACE_AXIS[status],mQuats);
|
|
| 140 | 140 |
} |
| 141 | 141 |
|
| 142 | 142 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| ... | ... | |
| 256 | 256 |
|
| 257 | 257 |
public int getMovementType() |
| 258 | 258 |
{
|
| 259 |
return MOVEMENT_TETRAHEDRON;
|
|
| 259 |
return TC_TETRAHEDRON;
|
|
| 260 | 260 |
} |
| 261 | 261 |
|
| 262 | 262 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
Also available in: Unified diff
Abstract out the TouchControl stuff in preparation for its new type - TouchControlShapeChanging.