Revision c9c71c3f
Added by Leszek Koltunski over 2 years ago
| src/main/java/org/distorted/objectlib/objects/TwistyDiamond.java | ||
|---|---|---|
| 19 | 19 |
|
| 20 | 20 |
package org.distorted.objectlib.objects; |
| 21 | 21 |
|
| 22 |
import static org.distorted.objectlib.movement.Movement.MOVEMENT_OCTAHEDRON;
|
|
| 23 |
import static org.distorted.objectlib.movement.Movement.TYPE_NOT_SPLIT;
|
|
| 22 |
import static org.distorted.objectlib.touchcontrol.TouchControl.TC_OCTAHEDRON;
|
|
| 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.MovementOctahedron;
|
|
| 30 |
import org.distorted.objectlib.touchcontrol.TouchControlOctahedron;
|
|
| 31 | 31 |
import org.distorted.objectlib.main.ObjectControl; |
| 32 | 32 |
import org.distorted.objectlib.main.ObjectType; |
| 33 | 33 |
import org.distorted.objectlib.helpers.ObjectShape; |
| ... | ... | |
| 118 | 118 |
if( mQuats==null ) initializeQuats(); |
| 119 | 119 |
if( mFaceMap==null ) mFaceMap = new int[] {4,0,6,2,7,3,5,1};
|
| 120 | 120 |
int status = retCubitSolvedStatus(cubit,numLayers); |
| 121 |
return status<0 ? null : buildSolvedQuats(MovementOctahedron.FACE_AXIS[mFaceMap[status]],mQuats);
|
|
| 121 |
return status<0 ? null : buildSolvedQuats(TouchControlOctahedron.FACE_AXIS[mFaceMap[status]],mQuats);
|
|
| 122 | 122 |
} |
| 123 | 123 |
|
| 124 | 124 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| ... | ... | |
| 188 | 188 |
|
| 189 | 189 |
public int getMovementType() |
| 190 | 190 |
{
|
| 191 |
return MOVEMENT_OCTAHEDRON;
|
|
| 191 |
return TC_OCTAHEDRON;
|
|
| 192 | 192 |
} |
| 193 | 193 |
|
| 194 | 194 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
Also available in: Unified diff
Abstract out the TouchControl stuff in preparation for its new type - TouchControlShapeChanging.