Revision c9c71c3f
Added by Leszek Koltunski over 2 years ago
src/main/java/org/distorted/objectlib/objects/TwistyIvy.java | ||
---|---|---|
19 | 19 |
|
20 | 20 |
package org.distorted.objectlib.objects; |
21 | 21 |
|
22 |
import static org.distorted.objectlib.movement.Movement.TYPE_SPLIT_CORNER;
|
|
23 |
import static org.distorted.objectlib.movement.Movement.MOVEMENT_HEXAHEDRON;
|
|
22 |
import static org.distorted.objectlib.touchcontrol.TouchControl.TYPE_SPLIT_CORNER;
|
|
23 |
import static org.distorted.objectlib.touchcontrol.TouchControl.TC_HEXAHEDRON;
|
|
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.main.ObjectControl; |
32 | 32 |
import org.distorted.objectlib.main.ObjectType; |
33 | 33 |
import org.distorted.objectlib.helpers.ObjectShape; |
... | ... | |
110 | 110 |
{ |
111 | 111 |
if( mQuats==null ) initializeQuats(); |
112 | 112 |
int status = retCubitSolvedStatus(cubit,numLayers); |
113 |
return status<0 ? null : buildSolvedQuats(MovementHexahedron.FACE_AXIS[status],mQuats);
|
|
113 |
return status<0 ? null : buildSolvedQuats(TouchControlHexahedron.FACE_AXIS[status],mQuats);
|
|
114 | 114 |
} |
115 | 115 |
|
116 | 116 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
... | ... | |
168 | 168 |
|
169 | 169 |
public int getMovementType() |
170 | 170 |
{ |
171 |
return MOVEMENT_HEXAHEDRON;
|
|
171 |
return TC_HEXAHEDRON;
|
|
172 | 172 |
} |
173 | 173 |
|
174 | 174 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
Also available in: Unified diff
Abstract out the TouchControl stuff in preparation for its new type - TouchControlShapeChanging.