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/TwistyMinx.java
21 21

  
22 22
import static org.distorted.objectlib.main.Movement.MOVEMENT_DODECAHEDRON;
23 23
import static org.distorted.objectlib.main.Movement.TYPE_SPLIT_EDGE;
24
import static org.distorted.objectlib.main.Movement12.C2;
25
import static org.distorted.objectlib.main.Movement12.LEN;
26
import static org.distorted.objectlib.main.Movement12.SIN54;
24
import static org.distorted.objectlib.main.MovementDodecahedron.C2;
25
import static org.distorted.objectlib.main.MovementDodecahedron.LEN;
26
import static org.distorted.objectlib.main.MovementDodecahedron.SIN54;
27 27

  
28 28
import java.io.InputStream;
29 29

  
30 30
import org.distorted.library.type.Static3D;
31 31
import org.distorted.library.type.Static4D;
32
import org.distorted.objectlib.main.Movement12;
32
import org.distorted.objectlib.main.MovementDodecahedron;
33 33
import org.distorted.objectlib.helpers.ObjectSticker;
34 34
import org.distorted.objectlib.helpers.ScrambleState;
35
import org.distorted.objectlib.main.Twisty12;
35
import org.distorted.objectlib.main.TwistyDodecahedron;
36 36

  
37 37
///////////////////////////////////////////////////////////////////////////////////////////////////
38 38

  
39
abstract class TwistyMinx extends Twisty12
39
abstract class TwistyMinx extends TwistyDodecahedron
40 40
{
41 41
  static final int NUM_CORNERS = 20;
42 42
  static final int NUM_CENTERS = 12;
......
494 494
    if( mQuats==null ) initializeQuats();
495 495
    if( mFaceMap==null ) mFaceMap = new int[] {8,10,3,7,1,9,11,2,4,0,5,6};
496 496
    int status = retCubitSolvedStatus(cubit,numLayers);
497
    return status<0 ? null : buildSolvedQuats(Movement12.FACE_AXIS[mFaceMap[status]],mQuats);
497
    return status<0 ? null : buildSolvedQuats(MovementDodecahedron.FACE_AXIS[mFaceMap[status]],mQuats);
498 498
    }
499 499

  
500 500
///////////////////////////////////////////////////////////////////////////////////////////////////
......
512 512
    if( mCuts==null )
513 513
      {
514 514
      mCuts = new float[6][numLayers-1];
515
      float D = numLayers*Movement12.DIST3D;
515
      float D = numLayers* MovementDodecahedron.DIST3D;
516 516
      float X = 2*D/(2+SIN18);  // height of the 'upper' part of a dodecahedron, i.e. put it on a table,
517 517
                                // its height is then 2D, it has one 'lower' part of height X, one
518 518
                                // 'middle' part of height Y and one upper part of height X again.

Also available in: Unified diff