Revision c9c71c3f
Added by Leszek Koltunski over 2 years ago
| src/main/java/org/distorted/objectlib/objects/TwistyCuboid.java | ||
|---|---|---|
| 19 | 19 |
|
| 20 | 20 |
package org.distorted.objectlib.objects; |
| 21 | 21 |
|
| 22 |
import static org.distorted.objectlib.movement.Movement.MOVEMENT_SHAPECHANGE;
|
|
| 23 |
import static org.distorted.objectlib.movement.Movement.TYPE_NOT_SPLIT;
|
|
| 22 |
import static org.distorted.objectlib.touchcontrol.TouchControl.TC_CUBOID;
|
|
| 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.MovementCuboids;
|
|
| 30 |
import org.distorted.objectlib.touchcontrol.TouchControlCuboids;
|
|
| 31 | 31 |
import org.distorted.objectlib.main.ObjectControl; |
| 32 | 32 |
import org.distorted.objectlib.main.ObjectType; |
| 33 | 33 |
import org.distorted.objectlib.helpers.ObjectShape; |
| ... | ... | |
| 210 | 210 |
{
|
| 211 | 211 |
if( mQuats ==null ) initializeQuats(); |
| 212 | 212 |
int status = retCubitSolvedStatus(cubit,numLayers); |
| 213 |
return status<0 ? null : buildSolvedQuats(MovementCuboids.FACE_AXIS[status], mQuats);
|
|
| 213 |
return status<0 ? null : buildSolvedQuats(TouchControlCuboids.FACE_AXIS[status], mQuats);
|
|
| 214 | 214 |
} |
| 215 | 215 |
|
| 216 | 216 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| ... | ... | |
| 644 | 644 |
|
| 645 | 645 |
public int getMovementType() |
| 646 | 646 |
{
|
| 647 |
return MOVEMENT_SHAPECHANGE;
|
|
| 647 |
return TC_CUBOID;
|
|
| 648 | 648 |
} |
| 649 | 649 |
|
| 650 | 650 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
Also available in: Unified diff
Abstract out the TouchControl stuff in preparation for its new type - TouchControlShapeChanging.