Project

General

Profile

« Previous | Next » 

Revision f86b282a

Added by Leszek Koltunski over 2 years ago

Minor.

View differences:

src/main/java/org/distorted/objectlib/objects/TwistyDiamond.java
27 27
import org.distorted.library.type.Static3D;
28 28
import org.distorted.library.type.Static4D;
29 29

  
30
import org.distorted.objectlib.main.Movement8;
30
import org.distorted.objectlib.main.MovementOctahedron;
31 31
import org.distorted.objectlib.main.ObjectControl;
32 32
import org.distorted.objectlib.main.ObjectType;
33 33
import org.distorted.objectlib.helpers.ObjectShape;
34 34
import org.distorted.objectlib.helpers.ObjectSticker;
35 35
import org.distorted.objectlib.helpers.ScrambleState;
36
import org.distorted.objectlib.main.Twisty8;
36
import org.distorted.objectlib.main.TwistyOctahedron;
37 37

  
38 38
///////////////////////////////////////////////////////////////////////////////////////////////////
39 39

  
40
public class TwistyDiamond extends Twisty8
40
public class TwistyDiamond extends TwistyOctahedron
41 41
{
42 42
  // the four rotation axis of a Diamond. Must be normalized.
43 43
  static final Static3D[] ROT_AXIS = new Static3D[]
......
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(Movement8.FACE_AXIS[mFaceMap[status]],mQuats);
121
    return status<0 ? null : buildSolvedQuats(MovementOctahedron.FACE_AXIS[mFaceMap[status]],mQuats);
122 122
    }
123 123

  
124 124
///////////////////////////////////////////////////////////////////////////////////////////////////

Also available in: Unified diff