Project

General

Profile

« Previous | Next » 

Revision 1c90a93d

Added by Leszek Koltunski 12 months ago

Ancient Coin: better scrambling.

View differences:

src/main/java/org/distorted/objectlib/main/ObjectType.java
109 109
  DINO_3 ( TwistyDino6.class          , 10, R.drawable.dino_3, true,     0, new InitData(new int[] {3,3,3,3})),
110 110
  DIN4_3 ( TwistyDino4.class          ,  9, R.drawable.din4_3, true,    30, new InitData(new int[] {3,3,3,3})),
111 111

  
112
  COIH_3 ( TwistyCoinHexahedron.class , 25, R.drawable.coih_3, true,   50, new InitData(new int[] {3,3,3,3,3,3,3})),
112
  COIH_3 ( TwistyCoinHexahedron.class , 35, R.drawable.coih_3, true,   50, new InitData(new int[] {3,3,3,3,3,3,3})),
113 113

  
114 114
  COIN_3 ( TwistyCoinTetrahedron.class, 15, R.drawable.coin_3, true,   40, new InitData(new int[] {3,3,3,3})),
115 115
  TINS_5 ( TwistyTins.class           , 28, R.drawable.tins_5, true,   60, new InitData(new int[] {5,5,5,5})),
src/main/java/org/distorted/objectlib/objects/TwistyCoinHexahedron.java
67 67
    {
68 68
    if( mEdges==null )
69 69
      {
70
      setUpRotatable();
71
      mEdges = ScrambleEdgeGenerator.getScrambleEdgesSingle(mBasicAngle, mRotatable);
70
      mEdges = new int[][]
71
        {
72
          {0,1,1,1, 2,2,3,2, 4,3,5,3, 6,4,7,4, 8,5,9,5, 10,6,11,6, 12,7,13,7, 14,8,15,8},
73
          {16, 9,17, 9,18, 9, 22,11,23,11,24,11, 28,13,29,13,30,13},
74
          {19,10,20,10,21,10, 25,12,26,12,27,12, 31,14,32,14,33,14},
75
          {16, 9,17, 9,18, 9, 22,11,23,11,24,11, 31,14,32,14,33,14},
76
          {19,10,20,10,21,10, 25,12,26,12,27,12, 28,13,29,13,30,13},
77
          {16, 9,17, 9,18, 9, 25,12,26,12,27,12, 28,13,29,13,30,13},
78
          {19,10,20,10,21,10, 22,11,23,11,24,11, 31,14,32,14,33,14},
79
          {16, 9,17, 9,18, 9, 25,12,26,12,27,12, 31,14,32,14,33,14},
80
          {19,10,20,10,21,10, 22,11,23,11,24,11, 28,13,29,13,30,13},
81
          { 0, 1, 1, 1,  4, 3, 5, 3,   8, 5, 9, 5,  12, 7,13, 7},
82
          { 2, 2, 3, 2,  6, 4, 7, 4,  10, 6,11, 6,  14, 8,15, 8},
83
          { 0, 1, 1, 1,  4, 3, 5, 3,  10, 6,11, 6,  14, 8,15, 8},
84
          { 2, 2, 3, 2,  6, 4, 7, 4,   8, 5, 9, 5,  12, 7,13, 7},
85
          { 0, 1, 1, 1,  6, 4, 7, 4,   8, 5, 9, 5,  14, 8,15, 8},
86
          { 2, 2, 3, 2,  4, 3, 5, 3,  10, 6,11, 6,  12, 7,13, 7}
87
        };
72 88
      }
73 89

  
74 90
    return mEdges;

Also available in: Unified diff