Project

General

Profile

« Previous | Next » 

Revision 53e7de7e

Added by Leszek Koltunski over 3 years ago

Face-Turning Octahedron & Skewb Ultimate meshes.

View differences:

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

  
62 62
  ULTI (
63 63
         new int[][] {
64
                       {2 , 18, R.raw.diam2, R.drawable.ui_small_diam, R.drawable.ui_medium_diam, R.drawable.ui_big_diam, R.drawable.ui_huge_diam} ,
64
                       {2 , 18, R.raw.ulti, R.drawable.ui_small_diam, R.drawable.ui_medium_diam, R.drawable.ui_big_diam, R.drawable.ui_huge_diam} ,
65 65
                     },
66 66
         TwistyUltimate.class,
67 67
         new MovementUltimate(),
......
205 205
  DIAM (
206 206
         new int[][] {
207 207
                       {2 , 10, R.raw.diam2, R.drawable.ui_small_diam, R.drawable.ui_medium_diam, R.drawable.ui_big_diam, R.drawable.ui_huge_diam} ,
208
                       {3 , 18, R.raw.diam2, R.drawable.ui_small_diam, R.drawable.ui_medium_diam, R.drawable.ui_big_diam, R.drawable.ui_huge_diam} ,
208
                       {3 , 18, R.raw.diam3, R.drawable.ui_small_diam, R.drawable.ui_medium_diam, R.drawable.ui_big_diam, R.drawable.ui_huge_diam} ,
209 209
                     },
210 210
         TwistyDiamond.class,
211 211
         new MovementDiamond(),
......
596 596
      case  0: return new TwistyCube          (size, quat, texture, mesh, effects, moves, res, scrWidth);
597 597
      case  1: return new TwistyPyraminx      (size, quat, texture, mesh, effects, moves, res, scrWidth);
598 598
      case  2: return new TwistyUltimate      (size, quat, texture, mesh, effects, moves, res, scrWidth);
599
      case  3: return new TwistyDino6         (size, quat, texture, mesh, effects, moves, res, scrWidth);
600
      case  4: return new TwistyDino4         (size, quat, texture, mesh, effects, moves, res, scrWidth);
601
      case  5: return new TwistyRedi          (size, quat, texture, mesh, effects, moves, res, scrWidth);
602
      case  6: return new TwistyHelicopter    (size, quat, texture, mesh, effects, moves, res, scrWidth);
603
      case  7: return new TwistySkewb         (size, quat, texture, mesh, effects, moves, res, scrWidth);
604
      case  8: return new TwistyIvy           (size, quat, texture, mesh, effects, moves, res, scrWidth);
605
      case  9: return new TwistyRex           (size, quat, texture, mesh, effects, moves, res, scrWidth);
606
      case 10: return new TwistyKilominx      (size, quat, texture, mesh, effects, moves, res, scrWidth);
607
      case 11: return new TwistyMegaminx      (size, quat, texture, mesh, effects, moves, res, scrWidth);
599
      case  3: return new TwistyKilominx      (size, quat, texture, mesh, effects, moves, res, scrWidth);
600
      case  4: return new TwistyMegaminx      (size, quat, texture, mesh, effects, moves, res, scrWidth);
601
      case  5: return new TwistyDino6         (size, quat, texture, mesh, effects, moves, res, scrWidth);
602
      case  6: return new TwistyDino4         (size, quat, texture, mesh, effects, moves, res, scrWidth);
603
      case  7: return new TwistyRedi          (size, quat, texture, mesh, effects, moves, res, scrWidth);
604
      case  8: return new TwistyHelicopter    (size, quat, texture, mesh, effects, moves, res, scrWidth);
605
      case  9: return new TwistySkewb         (size, quat, texture, mesh, effects, moves, res, scrWidth);
606
      case 10: return new TwistyIvy           (size, quat, texture, mesh, effects, moves, res, scrWidth);
607
      case 11: return new TwistyRex           (size, quat, texture, mesh, effects, moves, res, scrWidth);
608 608
      case 12: return new TwistyBandagedFused (size, quat, texture, mesh, effects, moves, res, scrWidth);
609 609
      case 13: return new TwistyBandaged2Bar  (size, quat, texture, mesh, effects, moves, res, scrWidth);
610 610
      case 14: return new TwistyBandaged3Plate(size, quat, texture, mesh, effects, moves, res, scrWidth);
src/main/java/org/distorted/objects/TwistyObject.java
81 81
  private static final float MAX_SIZE_CHANGE = 1.35f;
82 82
  private static final float MIN_SIZE_CHANGE = 0.75f;
83 83

  
84
  private static final boolean mCreateFromDMesh = false;
84
  private static final boolean mCreateFromDMesh = true;
85 85

  
86 86
  private static final Static3D CENTER = new Static3D(0,0,0);
87 87
  private static final int POST_ROTATION_MILLISEC = 500;

Also available in: Unified diff