Project

General

Profile

« Previous | Next » 

Revision cb8cae2f

Added by Leszek Koltunski over 2 years ago

Rearrange object so that they look better in tthe popup.

View differences:

src/main/java/org/distorted/objectlib/main/ObjectType.java
35 35 
  CUBE_3 ( new int[] {3,3,3}      , 17, R.raw.json_cube_3, R.raw.cube_3, R.drawable.cube_3s, R.drawable.cube_3m, R.drawable.cube_3b, R.drawable.cube_3h),
36 36 
  CUBE_4 ( new int[] {4,4,4}      , 24, R.raw.json_cube_4, R.raw.cube_4, R.drawable.cube_4s, R.drawable.cube_4m, R.drawable.cube_4b, R.drawable.cube_4h),
37 37 
  CUBE_5 ( new int[] {5,5,5}      , 28, R.raw.json_cube_5, R.raw.cube_5, R.drawable.cube_5s, R.drawable.cube_5m, R.drawable.cube_5b, R.drawable.cube_5h),
38 
  CUBE_6 ( new int[] {6,6,6}      , 35, R.raw.json_cube_6, R.raw.json_cube_6, R.drawable.cube_6s, R.drawable.cube_6m, R.drawable.cube_6b, R.drawable.cube_6h),
38 
  CUBE_6 ( new int[] {6,6,6}      , 35, R.raw.json_cube_6, R.raw.cube_6, R.drawable.cube_6s, R.drawable.cube_6m, R.drawable.cube_6b, R.drawable.cube_6h),
39 
  DIAM_2 ( new int[] {2,2,2,2}    , 12, R.raw.json_diam_2, R.raw.diam_2, R.drawable.diam_2s, R.drawable.diam_2m, R.drawable.diam_2b, R.drawable.diam_2h),
40 
  DIAM_3 ( new int[] {3,3,3,3}    , 24, R.raw.json_diam_3, R.raw.diam_3, R.drawable.diam_3s, R.drawable.diam_3m, R.drawable.diam_3b, R.drawable.diam_3h),
41 
  DIAM_4 ( new int[] {4,4,4,4}    , 32, R.raw.json_diam_4, R.raw.diam_4, R.drawable.diam_4s, R.drawable.diam_4m, R.drawable.diam_4b, R.drawable.diam_4h),
39 42 
  JING_2 ( new int[] {2,2,2,2}    , 11, R.raw.json_jing_2, R.raw.jing_2, R.drawable.jing_2s, R.drawable.jing_2m, R.drawable.jing_2b, R.drawable.jing_2h),
40 43 
  PYRA_3 ( new int[] {3,3,3,3}    , 10, R.raw.json_pyra_3, R.raw.pyra_3, R.drawable.pyra_3s, R.drawable.pyra_3m, R.drawable.pyra_3b, R.drawable.pyra_3h),
41 44 
  PYRA_4 ( new int[] {4,4,4,4}    , 17, R.raw.json_pyra_4, R.raw.pyra_4, R.drawable.pyra_4s, R.drawable.pyra_4m, R.drawable.pyra_4b, R.drawable.pyra_4h),
......
45 48 
  MEGA_3 ( new int[] {3,3,3,3,3,3}, 21, R.raw.json_mega_3, R.raw.mega_3, R.drawable.mega_3s, R.drawable.mega_3m, R.drawable.mega_3b, R.drawable.mega_3h),
46 49 
  MEGA_5 ( new int[] {5,5,5,5,5,5}, 37, R.raw.json_mega_5, R.raw.mega_5, R.drawable.mega_5s, R.drawable.mega_5m, R.drawable.mega_5b, R.drawable.mega_5h),
47 50 
  ULTI_2 ( new int[] {2,2,2,2}    , 18, R.raw.json_ulti_2, R.raw.ulti_2, R.drawable.ulti_2s, R.drawable.ulti_2m, R.drawable.ulti_2b, R.drawable.ulti_2h),
48 
  DIAM_2 ( new int[] {2,2,2,2}    , 12, R.raw.json_diam_2, R.raw.diam_2, R.drawable.diam_2s, R.drawable.diam_2m, R.drawable.diam_2b, R.drawable.diam_2h),
49 
  DIAM_3 ( new int[] {3,3,3,3}    , 24, R.raw.json_diam_3, R.raw.diam_3, R.drawable.diam_3s, R.drawable.diam_3m, R.drawable.diam_3b, R.drawable.diam_3h),
50 
  DIAM_4 ( new int[] {4,4,4,4}    , 32, R.raw.json_diam_4, R.raw.diam_4, R.drawable.diam_4s, R.drawable.diam_4m, R.drawable.diam_4b, R.drawable.diam_4h),
51 51 
  DINO_3 ( new int[] {3,3,3,3}    , 10, R.raw.json_dino_3, R.raw.dino_3, R.drawable.dino_3s, R.drawable.dino_3m, R.drawable.dino_3b, R.drawable.dino_3h),
52 52 
  DIN4_3 ( new int[] {3,3,3,3}    ,  7, R.raw.json_din4_3, R.raw.dino_3, R.drawable.din4_3s, R.drawable.din4_3m, R.drawable.din4_3b, R.drawable.din4_3h),
53 53 
  REDI_3 ( new int[] {3,3,3,3}    , 16, R.raw.json_redi_3, R.raw.redi_3, R.drawable.redi_3s, R.drawable.redi_3m, R.drawable.redi_3b, R.drawable.redi_3h),
54 
  HELI_3 ( new int[] {3,3,3,3,3,3}, 20, R.raw.json_heli_3, R.raw.heli_3, R.drawable.heli_3s, R.drawable.heli_3m, R.drawable.heli_3b, R.drawable.heli_3h),
55 54 
  SKEW_2 ( new int[] {2,2,2,2}    , 11, R.raw.json_skew_2, R.raw.skew_2, R.drawable.skew_2s, R.drawable.skew_2m, R.drawable.skew_2b, R.drawable.skew_2h),
56 55 
  SKEW_3 ( new int[] {3,3,3,3}    , 21, R.raw.json_skew_3, R.raw.skew_3, R.drawable.skew_3s, R.drawable.skew_3m, R.drawable.skew_3b, R.drawable.skew_3h),
57 56 
  IVY_2  ( new int[] {2,2,2,2}    ,  8, R.raw.json_ivy_2 , R.raw.ivy_2 , R.drawable.ivy_2s , R.drawable.ivy_2m , R.drawable.ivy_2b , R.drawable.ivy_2h ),
......
67 66 
  CU_323 ( new int[] {3,2,3}      , 15, R.raw.json_cu_323, R.raw.cu_323, R.drawable.cu_323s, R.drawable.cu_323m, R.drawable.cu_323b, R.drawable.cu_323h),
68 67 
  CU_232 ( new int[] {2,3,2}      , 16, R.raw.json_cu_232, R.raw.cu_232, R.drawable.cu_232s, R.drawable.cu_232m, R.drawable.cu_232b, R.drawable.cu_232h),
69 68 
  CU_343 ( new int[] {3,4,3}      , 23, R.raw.json_cu_343, R.raw.cu_343, R.drawable.cu_343s, R.drawable.cu_343m, R.drawable.cu_343b, R.drawable.cu_343h),
69 
  HELI_3 ( new int[] {3,3,3,3,3,3}, 20, R.raw.json_heli_3, R.raw.heli_3, R.drawable.heli_3s, R.drawable.heli_3m, R.drawable.heli_3b, R.drawable.heli_3h),
70 70 
  ;
71 71 

  		




  72
  72
  
    
  public static final int NUM_OBJECTS = values().length;


  		




  ......




  185
  185
  
    
      case  2:


  		




  186
  186
  
    
      case  3:


  		




  187
  187
  
    
      case  4: return new TwistyCuboid        (numL, quat, move, stream);


  		




  188
  
  
    
      case  5: return new TwistyJing          (numL, quat, move, stream);


  		




  
  188
  
    
      case  5:


  		




  189
  189
  
    
      case  6:


  		




  190
  
  
    
      case  7:


  		




  191
  
  
    
      case  8: return new TwistyPyraminx      (numL, quat, move, stream);


  		




  
  190
  
    
      case  7: return new TwistyDiamond       (numL, quat, move, stream);


  		




  
  191
  
    
      case  8: return new TwistyJing          (numL, quat, move, stream);


  		




  192
  192
  
    
      case  9:


  		




  193
  
  
    
      case 10: return new TwistyKilominx      (numL, quat, move, stream);


  		




  194
  
  
    
      case 11:


  		




  195
  
  
    
      case 12: return new TwistyMegaminx      (numL, quat, move, stream);


  		




  196
  
  
    
      case 13: return new TwistyUltimate      (numL, quat, move, stream);


  		




  
  193
  
    
      case 10:


  		




  
  194
  
    
      case 11: return new TwistyPyraminx      (numL, quat, move, stream);


  		




  
  195
  
    
      case 12:


  		




  
  196
  
    
      case 13: return new TwistyKilominx      (numL, quat, move, stream);


  		




  197
  197
  
    
      case 14:


  		




  198
  
  
    
      case 15:


  		




  199
  
  
    
      case 16: return new TwistyDiamond       (numL, quat, move, stream);


  		




  
  198
  
    
      case 15: return new TwistyMegaminx      (numL, quat, move, stream);


  		




  
  199
  
    
      case 16: return new TwistyUltimate      (numL, quat, move, stream);


  		




  200
  200
  
    
      case 17: return new TwistyDino6         (numL, quat, move, stream);


  		




  201
  201
  
    
      case 18: return new TwistyDino4         (numL, quat, move, stream);


  		




  202
  202
  
    
      case 19: return new TwistyRedi          (numL, quat, move, stream);


  		




  203
  
  
    
      case 20: return new TwistyHelicopter    (numL, quat, move, stream);


  		




  204
  
  
    
      case 21:


  		




  205
  
  
    
      case 22: return new TwistySkewb         (numL, quat, move, stream);


  		




  206
  
  
    
      case 23: return new TwistyIvy           (numL, quat, move, stream);


  		




  207
  
  
    
      case 24: return new TwistyRex           (numL, quat, move, stream);


  		




  208
  
  
    
      case 25: return new TwistyBandagedFused (numL, quat, move, stream);


  		




  209
  
  
    
      case 26: return new TwistyBandaged2Bar  (numL, quat, move, stream);


  		




  210
  
  
    
      case 27: return new TwistyBandaged3Plate(numL, quat, move, stream);


  		




  211
  
  
    
      case 28: return new TwistyBandagedEvil  (numL, quat, move, stream);


  		




  212
  
  
    
      case 29: return new TwistySquare1       (numL, quat, move, stream);


  		




  213
  
  
    
      case 30: return new TwistySquare2       (numL, quat, move, stream);


  		




  214
  
  
    
      case 31:


  		




  215
  
  
    
      case 32: return new TwistyMirror        (numL, quat, move, stream);


  		




  
  203
  
    
      case 20:


  		




  
  204
  
    
      case 21: return new TwistySkewb         (numL, quat, move, stream);


  		




  
  205
  
    
      case 22: return new TwistyIvy           (numL, quat, move, stream);


  		




  
  206
  
    
      case 23: return new TwistyRex           (numL, quat, move, stream);


  		




  
  207
  
    
      case 24: return new TwistyBandagedFused (numL, quat, move, stream);


  		




  
  208
  
    
      case 25: return new TwistyBandaged2Bar  (numL, quat, move, stream);


  		




  
  209
  
    
      case 26: return new TwistyBandaged3Plate(numL, quat, move, stream);


  		




  
  210
  
    
      case 27: return new TwistyBandagedEvil  (numL, quat, move, stream);


  		




  
  211
  
    
      case 28: return new TwistySquare1       (numL, quat, move, stream);


  		




  
  212
  
    
      case 29: return new TwistySquare2       (numL, quat, move, stream);


  		




  
  213
  
    
      case 30:


  		




  
  214
  
    
      case 31: return new TwistyMirror        (numL, quat, move, stream);


  		




  
  215
  
    
      case 32:


  		




  216
  216
  
    
      case 33:


  		




  217
  
  
    
      case 34:


  		




  218
  
  
    
      case 35: return new TwistyCuboid        (numL, quat, move, stream);


  		




  
  217
  
    
      case 34: return new TwistyCuboid        (numL, quat, move, stream);


  		




  
  218
  
    
      case 35: return new TwistyHelicopter    (numL, quat, move, stream);


  		




  219
  219
  
    
      }


  		




  220
  220
  
    

  		




  221
  221
  
    
    return null;


  		












Also available in:  Unified diff