Revision c9c71c3f
Added by Leszek Koltunski over 2 years ago
src/main/java/org/distorted/objectlib/objects/TwistyBandagedAbstract.java | ||
---|---|---|
19 | 19 |
|
20 | 20 |
package org.distorted.objectlib.objects; |
21 | 21 |
|
22 |
import static org.distorted.objectlib.movement.Movement.MOVEMENT_HEXAHEDRON;
|
|
23 |
import static org.distorted.objectlib.movement.Movement.TYPE_NOT_SPLIT;
|
|
22 |
import static org.distorted.objectlib.touchcontrol.TouchControl.TC_HEXAHEDRON;
|
|
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.MovementHexahedron;
|
|
30 |
import org.distorted.objectlib.touchcontrol.TouchControlHexahedron;
|
|
31 | 31 |
import org.distorted.objectlib.helpers.ObjectShape; |
32 | 32 |
import org.distorted.objectlib.helpers.ObjectSticker; |
33 | 33 |
import org.distorted.objectlib.helpers.ScrambleState; |
... | ... | |
121 | 121 |
{ |
122 | 122 |
if( mQuats==null ) initializeQuats(); |
123 | 123 |
int status = retCubitSolvedStatus(cubit,numLayers); |
124 |
return status<0 ? null : buildSolvedQuats(MovementHexahedron.FACE_AXIS[status],mQuats);
|
|
124 |
return status<0 ? null : buildSolvedQuats(TouchControlHexahedron.FACE_AXIS[status],mQuats);
|
|
125 | 125 |
} |
126 | 126 |
|
127 | 127 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
... | ... | |
360 | 360 |
|
361 | 361 |
public int getMovementType() |
362 | 362 |
{ |
363 |
return MOVEMENT_HEXAHEDRON;
|
|
363 |
return TC_HEXAHEDRON;
|
|
364 | 364 |
} |
365 | 365 |
|
366 | 366 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
Also available in: Unified diff
Abstract out the TouchControl stuff in preparation for its new type - TouchControlShapeChanging.