Project

General

Profile

« Previous | Next » 

Revision 4d7002eb

Added by Leszek Koltunski 7 months ago

Rediminx: enabled, rotation factor, tutorials.

View differences:

src/main/java/org/distorted/objectlib/objects/TwistyRediminx.java
145 145
      final float sinA  = (float)Math.sin(ANGLE);
146 146

  
147 147
      float TAN54 = SIN54/COS54;
148
      float R  = 1.5f*(TAN54-(1/TAN54));
148
      float R  = 0.9f*(TAN54-(1/TAN54));
149 149
      float X1 = R*COS54;
150 150
      float Y1 = R*SIN54;
151 151
      float X2 = R*COS18;
......
359 359
    {
360 360
    return new int[][][]
361 361
      {
362
          {{2,3},{3,5},{1,5},{1,4},{2,4}},
363
          {{0,5},{2,5},{2,3},{3,4},{0,4}},
364
          {{2,3},{2,5},{0,5},{0,4},{3,4}},
365
          {{1,5},{3,5},{2,3},{2,4},{1,4}},
366
          {{0,3},{0,4},{4,5},{1,5},{1,3}},
367
          {{1,2},{1,4},{4,5},{0,5},{0,2}},
368
          {{4,5},{1,4},{1,2},{0,2},{0,5}},
369
          {{4,5},{0,4},{0,3},{1,3},{1,5}},
370
          {{0,2},{0,1},{1,3},{3,5},{2,5}},
371
          {{3,4},{2,4},{1,2},{0,1},{0,3}},
372
          {{2,4},{3,4},{0,3},{0,1},{1,2}},
373
          {{1,3},{0,1},{0,2},{2,5},{3,5}},
362
          {{4},{7},{3},{2},{6}},
363
          {{3},{8},{5},{9},{2}},
364
          {{5},{8},{3},{2},{9}},
365
          {{3},{7},{4},{6},{2}},
366
          {{4},{6},{0},{8},{5}},
367
          {{5},{9},{1},{7},{4}},
368
          {{1},{9},{5},{4},{7}},
369
          {{0},{6},{4},{5},{8}},
370
          {{6},{2},{9},{1},{0}},
371
          {{1},{0},{8},{3},{7}},
372
          {{0},{1},{7},{3},{8}},
373
          {{9},{2},{6},{0},{1}},
374 374
      };
375 375
    }
376 376

  
......
383 383
    return new boolean[][] {t,t,t,t,t,t,t,t,t,t};
384 384
    }
385 385

  
386
///////////////////////////////////////////////////////////////////////////////////////////////////
387

  
388
  @Override
389
  public float[][] returnRotationFactor()
390
    {
391
    final float F = 2.5f;
392
    float[] f = {F,F,F};
393
    return new float[][] { f,f,f,f,f,f,f,f,f,f };
394
    }
395

  
386 396
///////////////////////////////////////////////////////////////////////////////////////////////////
387 397

  
388 398
  public String getShortName()
......
395 405
  public String[][] getTutorials()
396 406
    {
397 407
    return new String[][]{
398
                          {"gb","tFSGC9esay0","Pyraminx Crystal Tutorial","twistypuzzling"},
399
                          {"es","AmrIwSICFB8","Como resolver Pyraminx Crystal","Tutoriales Rubik"},
400
                          {"ru","3AKeT8JIU0E","Как собрать Crystal Pyraminx","RBcuber"},
401
                          {"fr","SPsrHhQzmVg","Résolution du Pyraminx Crystal","asthalis"},
402
                          {"de","EH4sw7_21eA","Crystal Pyraminx Tutorial","GerCubing"},
403
                          {"pl","AmrIwSICFB8","Crystal Pyraminx TUTORIAL PL","MrUK"},
404
                          {"br","13pz0cNBVow","Como resolver o Pyraminx Crystal 1/3","RafaelCinoto"},
405
                          {"br","eT654oZsBg0","Como resolver o Pyraminx Crystal 2/3","RafaelCinoto"},
406
                          {"br","MnooQbVFbfU","Como resolver o Pyraminx Crystal 3/3","RafaelCinoto"},
407
                          {"kr","o-w_ZzDrfFU","피라밍크스 크리스탈 해법 1/2","SlowCuberToumai"},
408
                          {"kr","ExMg8SAge4Q","피라밍크스 크리스탈 해법 2/2","SlowCuberToumai"},
409
                          {"vn","MxF4bKlnIMU","Tutorial N.28 - Pyraminx Crystal","Duy Thích Rubik"},
408
                          {"gb","U3b6fsoT47Y","Rediminx Tutorial","JJ Cuber"},
409
                          {"es","BTkL_EPzJ2E","Tutorial Rediminx","QBAndo"},
410
                          {"ru","3XFIHKLN6Mw","Как собрать Редиминкс","Никита Брулевич"},
411
                          {"fr","ztcGbrwqN8Y","Résolution du Rediminx","asthalis"},
412
                          {"de","ibmSSpFg_y0","Rediminx Tutorial","Pezcraft"},
413
                          {"pl","scmz64d_Q9s","Rediminx TUTORIAL PL","MrUK"},
414
                          {"br","mb65m5YAO-A","Rediminx - review, tutorial","marqüalrélio"},
415
                          {"kr","9vdCN_Pch98","레디밍크스 큐브 큐브공식","큐브사랑"},
416
                          {"vn","CrD2umwt_1M","Hướng Dẫn Giải Rediminx","Rubik Cube"},
417
                          {"tw","TROnI8VX3xY","梅花魔術方塊教學全集","3C生活應用"},
410 418
                         };
411 419
    }
412 420
}

Also available in: Unified diff