Project

General

Profile

« Previous | Next » 

Revision 14fe8a07

Added by Leszek Koltunski almost 4 years ago

Minor.

View differences:

src/main/java/org/distorted/objects/ObjectList.java
130 130
         3
131 131
       ),
132 132

  
133
  MINX (
133
  KILO (
134 134
         new int[][] {
135 135
                       {3 , 18, R.raw.minx3, R.drawable.ui_small_minx3, R.drawable.ui_medium_minx3, R.drawable.ui_big_minx3, R.drawable.ui_huge_minx3} ,
136 136
                     },
src/main/java/org/distorted/objects/TwistyMinx.java
47 47
  static final float C2 = (SQ5+3)/4;
48 48
  static final float LEN= (float)(Math.sqrt(1.25f+0.5f*SQ5));
49 49

  
50
  // the six rotation axis of a RubikMinx. Must be normalized.
50
  // the six rotation axis of a Kilominx. Must be normalized.
51 51
  static final Static3D[] ROT_AXIS = new Static3D[]
52 52
         {
53 53
           new Static3D( C2/LEN, C1/LEN, 0      ),
......
78 78
           MINX_DBLUE , MINX_DYELLOW, MINX_WHITE , MINX_GREY
79 79
         };
80 80

  
81
  // All 60 legal rotation quats of a RubikMinx
81
  // All 60 legal rotation quats of a Kilominx
82 82
  private static final Static4D[] QUATS = new Static4D[]
83 83
         {
84 84
           new Static4D(  0.0f,  0.0f,  0.0f,  1.0f ),
......
179 179
  TwistyMinx(int size, Static4D quat, DistortedTexture texture,
180 180
             MeshSquare mesh, DistortedEffects effects, int[][] moves, Resources res, int scrWidth)
181 181
    {
182
    super(size, size, 30, quat, texture, mesh, effects, moves, ObjectList.MINX, res, scrWidth);
182
    super(size, size, 30, quat, texture, mesh, effects, moves, ObjectList.KILO, res, scrWidth);
183 183
    }
184 184

  
185 185
///////////////////////////////////////////////////////////////////////////////////////////////////
......
413 413
    }
414 414

  
415 415
///////////////////////////////////////////////////////////////////////////////////////////////////
416
// only needed for solvers - there are no Minx solvers ATM)
416
// only needed for solvers - there are no Kilominx solvers ATM)
417 417

  
418 418
  public String retObjectString()
419 419
    {
src/main/java/org/distorted/tutorial/TutorialList.java
184 184
                         }
185 185
        ),
186 186

  
187
  MINX3( ObjectList.MINX, 3,
187
  KILO3( ObjectList.KILO, 3,
188 188
          new String[][] {
189 189
                          {"gb","grgGgUSxiQg","How to Solve the Kilominx","Z3"},
190 190
                          {"es","g6WMYjkCLok","Resolver MEGAMINX 2x2","Cuby"},

Also available in: Unified diff