Project

General

Profile

« Previous | Next » 

Revision 62ec404d

Added by Leszek Koltunski over 2 years ago

Mirror Cubes: make them still more off-center.

View differences:

src/main/java/org/distorted/objects/ObjectList.java
248 248

  
249 249
  MIRR (
250 250
         new int[][] {
251
                       {2 , 12, 12, R.raw.mirr2, R.drawable.ui_small_mirr2, R.drawable.ui_medium_mirr2, R.drawable.ui_big_mirr2, R.drawable.ui_huge_mirr2} ,
252
                       {3 , 16, 17, R.raw.mirr3, R.drawable.ui_small_mirr3, R.drawable.ui_medium_mirr3, R.drawable.ui_big_mirr3, R.drawable.ui_huge_mirr3} ,
251
                       {2 , 12, 12, 0, R.drawable.ui_small_mirr2, R.drawable.ui_medium_mirr2, R.drawable.ui_big_mirr2, R.drawable.ui_huge_mirr2} ,
252
                       {3 , 16, 17, 0, R.drawable.ui_small_mirr3, R.drawable.ui_medium_mirr3, R.drawable.ui_big_mirr3, R.drawable.ui_huge_mirr3} ,
253 253
                     },
254 254
         TwistyMirror.class,
255 255
         new MovementCube(),
src/main/java/org/distorted/objects/TwistyMirror.java
44 44

  
45 45
  private static final int[] FACE_COLORS = new int[] { COLOR_WHITE };
46 46
  private static final float DX = 0.10f;
47
  private static final float DY = 0.18f;
48
  private static final float DZ = 0.26f;
47
  private static final float DY = 0.25f;
48
  private static final float DZ = 0.40f;
49 49

  
50 50
  private ScrambleState[] mStates;
51 51
  private Static4D[] mQuats;
......
245 245
                if( cubit==15 ) return  0;
246 246
                if( cubit==24 ) return 13;
247 247
                if( cubit== 8 ) return  9;
248
                if( cubit==16 ) return  6; // ditto, theoretically 10
248
                if( cubit==16 ) return 20; // ditto, theoretically 10
249 249
                if( cubit==25 ) return 11;
250 250
                return NUM_TEXTURES;
251 251
        case 3: if( cubit== 0 ) return 14;
......
255 255
                if( cubit==10 ) return  0;
256 256
                if( cubit==18 ) return 13;
257 257
                if( cubit== 2 ) return  9;
258
                if( cubit==11 ) return  6; // ditto, theoretically 10
258
                if( cubit==11 ) return 20; // ditto, theoretically 10
259 259
                if( cubit==19 ) return 11;
260 260
                return NUM_TEXTURES;
261 261
        case 4: if( cubit== 8 ) return  1;
src/main/java/org/distorted/tutorials/TutorialList.java
298 298
                          {"es","2-Gf2cmEJDs","Resolver Ivy Cube","Cuby"},
299 299
                          {"ru","pbkfOCnnfsA","Как собрать Иви куб","Алексей Ярыгин"},
300 300
                          {"fr","mn7YTnYu3Uc","Comment résoudre le Ivy Cube","ValentinoCube"},
301
                          {"de","vaW5fSUG_O8","Ivy Cube ","ThomasStadler"},
301
                          {"de","vaW5fSUG_O8","Ivy Cube","ThomasStadler"},
302 302
                          {"pl","8s_0VxNvFA8","Jak ułożyć Ivy Cube","DubiCube"},
303 303
                          {"kr","TmSPgjtSFac","15분만에 아이비큐브 완전정복하기!","초등취미생활"},
304 304
                         }
......
380 380
                          {"pl","SukHyoMzcgM","Square-2 TUTORIAL PL","MrUk"},
381 381
                          {"kr","psG9Ar4pBrc","초보자를 위한 스퀘어2 해법","SlowCuberToumai"},
382 382
                         }
383
       ),
384

  
385
  MIRR3 ( ObjectList.MIRR, 3,
386
          new String[][] {
387
                          {"gb","YkzXIWnqbSw","How to Solve the Mirror Cube","Z3"},
388
                          {"es","ZTkunMo51l0","Resolver cubo de Rubik MIRROR","Cuby"},
389
                          {"ru","1QPAD3Q4r78","Как собрать Зеркальный Куб","Алексей Ярыгин"},
390
                          {"fr","tlFLE2UvjFo","Tutoriel: le rubik's cube mirroir","Le Cubiste"},
391
                          {"de","Qf2EadLLiZo","Mirror Cube lösen","Pezcraft"},
392
                          {"pl","r1-MzAL3TxE","Jak ułożyć kostkę mirror","Cube Masters"},
393
                          {"kr","p3OJSbWopqg","미러블럭 해법","듀나메스 큐브 해법연구소"},
394
                         }
383 395
       );
384 396

  
397

  
385 398
  public static final int NUM_OBJECTS = values().length;
386 399
  private final ObjectList mObject;
387 400
  private final int mSize;

Also available in: Unified diff