Project

General

Profile

« Previous | Next » 

Revision 37310d4f

Added by Leszek Koltunski about 1 year ago

Dino solveers: change the rot axis

View differences:

src/main/java/org/distorted/objectlib/helpers/QuatGroupGenerator.java
12 12
import org.distorted.library.main.QuatHelper;
13 13
import org.distorted.library.type.Static3D;
14 14
import org.distorted.library.type.Static4D;
15
import org.distorted.objectlib.main.ObjectControl;
16 15

  
17 16
///////////////////////////////////////////////////////////////////////////////////////////////////
18 17

  
src/main/java/org/distorted/objectlib/objects/TwistyDino.java
31 31
  static final Static3D[] ROT_AXIS = new Static3D[]
32 32
         {
33 33
           new Static3D( SQ3/3, SQ3/3, SQ3/3),
34
           new Static3D( SQ3/3, SQ3/3,-SQ3/3),
35
           new Static3D( SQ3/3,-SQ3/3, SQ3/3),
36
           new Static3D( SQ3/3,-SQ3/3,-SQ3/3)
34
           new Static3D(-SQ3/3,-SQ3/3, SQ3/3),
35
           new Static3D(-SQ3/3, SQ3/3,-SQ3/3),
36
           new Static3D( SQ3/3,-SQ3/3,-SQ3/3),
37 37
         };
38 38

  
39 39
  private int[][] mBasicAngle;
......
147 147

  
148 148
  public Static4D getCubitQuats(int cubit, int[] numLayers)
149 149
    {
150
    if( mQuatIndex==null ) mQuatIndex = new int[] { 0,2,10,8,1,4,6,7,11,5,9,3 };
150
    if( mQuatIndex==null ) mQuatIndex = new int[] { 0,2,10,8,1,3,5,7,11,6,9,4 };
151 151
    return mObjectQuats[mQuatIndex[cubit]];
152 152
    }
153 153

  
src/main/java/org/distorted/objectlib/tablebases/TBDino4.java
59 59
    return new Static3D[]
60 60
         {
61 61
           new Static3D( SQ3/3, SQ3/3, SQ3/3),
62
           new Static3D( SQ3/3, SQ3/3,-SQ3/3),
63
           new Static3D( SQ3/3,-SQ3/3, SQ3/3),
64
           new Static3D( SQ3/3,-SQ3/3,-SQ3/3)
62
           new Static3D(-SQ3/3,-SQ3/3, SQ3/3),
63
           new Static3D(-SQ3/3, SQ3/3,-SQ3/3),
64
           new Static3D( SQ3/3,-SQ3/3,-SQ3/3),
65 65
         };
66 66
    }
67 67

  
src/main/java/org/distorted/objectlib/tablebases/TBDino6.java
24 24

  
25 25
  private static final int[][] QUATS =
26 26
      {
27
          {0,2,10,8, 1,4,6,7,   11,5,9,3},
28
          {1,0,6,10, 2,5,8,3,   7,9,4,11},
29
          {10,5,0,3, 7,6,4,1,   9,2,11,8},
30
          {7,10,4,0, 5,2,3,8,   1,11,6,9},
31
          {2,1,8,6,  0,9,10,11, 3,4,5,7 },
32
          {3,6,5,1,  9,0,11,10, 2,7,8,4 },
33
          {5,7,3,4,  10,11,0,9, 8,6,2,1 },
34
          {8,4,2,7,  11,10,9,0, 5,1,3,6 },
35
          {11,8,9,2, 4,1,7,6,   0,3,10,5},
36
          {6,9,1,11, 3,8,5,2,   4,0,7,10},
37
          {9,3,11,5, 6,7,1,4,   10,8,0,2},
38
          {4,11,7,9, 8,3,2,5,   6,10,1,0}
27
          {0,2,10,8, 1,3,5,7,   11,6,9,4},
28
          {1,0,5,10, 2,6,8,4,   7,9,3,11},
29
          {10,6,0,4, 7,5,3,1,   9,2,11,8},
30
          {7,10,3,0, 6,2,4,8,   1,11,5,9},
31
          {2,1,8,5,  0,9,10,11, 4,3,6,7 },
32
          {4,5,6,1,  9,0,11,10, 2,7,8,3 },
33
          {6,7,4,3,  10,11,0,9, 8,5,2,1 },
34
          {8,3,2,7,  11,10,9,0, 6,1,4,5 },
35
          {11,8,9,2, 3,1,7,5,   0,4,10,6},
36
          {5,9,1,11, 4,8,6,2,   3,0,7,10},
37
          {9,4,11,6, 5,7,1,3,   10,8,0,2},
38
          {3,11,7,9, 8,4,2,6,   5,10,1,0}
39 39
      };
40 40

  
41 41
  private int[][] mAngles;
......
74 74
    return new Static3D[]
75 75
         {
76 76
           new Static3D( SQ3/3, SQ3/3, SQ3/3),
77
           new Static3D( SQ3/3, SQ3/3,-SQ3/3),
78
           new Static3D( SQ3/3,-SQ3/3, SQ3/3),
79
           new Static3D( SQ3/3,-SQ3/3,-SQ3/3)
77
           new Static3D(-SQ3/3,-SQ3/3, SQ3/3),
78
           new Static3D(-SQ3/3, SQ3/3,-SQ3/3),
79
           new Static3D( SQ3/3,-SQ3/3,-SQ3/3),
80 80
         };
81 81
    }
82 82

  

Also available in: Unified diff