Project

General

Profile

« Previous | Next » 

Revision 387b6326

Added by Leszek Koltunski over 2 years ago

Make the Kilo and Megaminxes standard size (dodecahedron size=3,5, i.e. equal to numLayers so that DIST2D and DIST3D are standard)

View differences:

src/main/java/org/distorted/objects/TwistyMinx.java
121 121
    mBasicCornerV = new Static4D[3];
122 122
    mCurrCornerV  = new Static4D[3];
123 123

  
124
    mBasicCornerV[0] = new Static4D( (SQ5+1)*0.125f, (SQ5-1)*0.125f, -0.250f, 0.0f );
125
    mBasicCornerV[1] = new Static4D(-(SQ5+1)*0.125f, (SQ5-1)*0.125f, -0.250f, 0.0f );
126
    mBasicCornerV[2] = new Static4D(              0,        -0.500f,    0.0f, 0.0f );
124
    mBasicCornerV[0] = new Static4D( (SQ5+1)*0.375f, (SQ5-1)*0.375f, -0.750f, 0.0f );
125
    mBasicCornerV[1] = new Static4D(-(SQ5+1)*0.375f, (SQ5-1)*0.375f, -0.750f, 0.0f );
126
    mBasicCornerV[2] = new Static4D(              0,        -1.500f,    0.0f, 0.0f );
127 127
    }
128 128

  
129 129
///////////////////////////////////////////////////////////////////////////////////////////////////
......
316 316

  
317 317
  void initializeCorners()
318 318
    {
319
    float cA = 1.5f;
320
    float cB = 3*C2;
321
    float cC = 3*SIN54;
322

  
319 323
    mCorners = new float[][]
320 324
         {
321
             {  0.0f,  0.5f,    C2},
322
             {  0.0f,  0.5f,   -C2},
323
             {  0.0f, -0.5f,    C2},
324
             {  0.0f, -0.5f,   -C2},
325
             {    C2,  0.0f,  0.5f},
326
             {    C2,  0.0f, -0.5f},
327
             {   -C2,  0.0f,  0.5f},
328
             {   -C2,  0.0f, -0.5f},
329
             {  0.5f,    C2,  0.0f},
330
             {  0.5f,   -C2,  0.0f},
331
             { -0.5f,    C2,  0.0f},
332
             { -0.5f,   -C2,  0.0f},
333
             { SIN54, SIN54, SIN54},
334
             { SIN54, SIN54,-SIN54},
335
             { SIN54,-SIN54, SIN54},
336
             { SIN54,-SIN54,-SIN54},
337
             {-SIN54, SIN54, SIN54},
338
             {-SIN54, SIN54,-SIN54},
339
             {-SIN54,-SIN54, SIN54},
340
             {-SIN54,-SIN54,-SIN54},
325
             {  0, cA, cB},
326
             {  0, cA,-cB},
327
             {  0,-cA, cB},
328
             {  0,-cA,-cB},
329
             { cB,  0, cA},
330
             { cB,  0,-cA},
331
             {-cB,  0, cA},
332
             {-cB,  0,-cA},
333
             { cA, cB,  0},
334
             { cA,-cB,  0},
335
             {-cA, cB,  0},
336
             {-cA,-cB,  0},
337
             { cC, cC, cC},
338
             { cC, cC,-cC},
339
             { cC,-cC, cC},
340
             { cC,-cC,-cC},
341
             {-cC, cC, cC},
342
             {-cC, cC,-cC},
343
             {-cC,-cC, cC},
344
             {-cC,-cC,-cC},
341 345
         };
342 346
    }
343 347

  

Also available in: Unified diff