Project

General

Profile

« Previous | Next » 

Revision c3639697

Added by Leszek Koltunski over 2 years ago

Add the 7x7 cube.

View differences:

src/main/java/org/distorted/objectlib/main/ObjectType.java
36 36
  CUBE_4 ( new int[] {4,4,4}      , 24, 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.drawable.cube_5s, R.drawable.cube_5m, R.drawable.cube_5b, R.drawable.cube_5h),
38 38
  CUBE_6 ( new int[] {6,6,6}      , 35, 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.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.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.drawable.diam_4s, R.drawable.diam_4m, R.drawable.diam_4b, R.drawable.diam_4h),
39
  CUBE_7 ( new int[] {7,7,7}      , 42, R.drawable.cube_7s, R.drawable.cube_7m, R.drawable.cube_7b, R.drawable.cube_7h),
40
  MIRR_2 ( new int[] {2,2,2}      , 12, R.drawable.mirr_2s, R.drawable.mirr_2m, R.drawable.mirr_2b, R.drawable.mirr_2h),
41
  MIRR_3 ( new int[] {3,3,3}      , 17, R.drawable.mirr_3s, R.drawable.mirr_3m, R.drawable.mirr_3b, R.drawable.mirr_3h),
42 42
  JING_2 ( new int[] {2,2,2,2}    , 11, R.drawable.jing_2s, R.drawable.jing_2m, R.drawable.jing_2b, R.drawable.jing_2h),
43 43
  PYRA_3 ( new int[] {3,3,3,3}    , 10, R.drawable.pyra_3s, R.drawable.pyra_3m, R.drawable.pyra_3b, R.drawable.pyra_3h),
44 44
  PYRA_4 ( new int[] {4,4,4,4}    , 17, R.drawable.pyra_4s, R.drawable.pyra_4m, R.drawable.pyra_4b, R.drawable.pyra_4h),
......
48 48
  MEGA_3 ( new int[] {3,3,3,3,3,3}, 21, R.drawable.mega_3s, R.drawable.mega_3m, R.drawable.mega_3b, R.drawable.mega_3h),
49 49
  MEGA_5 ( new int[] {5,5,5,5,5,5}, 37, R.drawable.mega_5s, R.drawable.mega_5m, R.drawable.mega_5b, R.drawable.mega_5h),
50 50
  ULTI_2 ( new int[] {2,2,2,2}    , 18, R.drawable.ulti_2s, R.drawable.ulti_2m, R.drawable.ulti_2b, R.drawable.ulti_2h),
51
  DIAM_2 ( new int[] {2,2,2,2}    , 12, R.drawable.diam_2s, R.drawable.diam_2m, R.drawable.diam_2b, R.drawable.diam_2h),
52
  DIAM_3 ( new int[] {3,3,3,3}    , 24, R.drawable.diam_3s, R.drawable.diam_3m, R.drawable.diam_3b, R.drawable.diam_3h),
53
  DIAM_4 ( new int[] {4,4,4,4}    , 32, R.drawable.diam_4s, R.drawable.diam_4m, R.drawable.diam_4b, R.drawable.diam_4h),
51 54
  DINO_3 ( new int[] {3,3,3,3}    , 10, R.drawable.dino_3s, R.drawable.dino_3m, R.drawable.dino_3b, R.drawable.dino_3h),
52 55
  DIN4_3 ( new int[] {3,3,3,3}    ,  7, R.drawable.din4_3s, R.drawable.din4_3m, R.drawable.din4_3b, R.drawable.din4_3h),
53 56
  REDI_3 ( new int[] {3,3,3,3}    , 16, R.drawable.redi_3s, R.drawable.redi_3m, R.drawable.redi_3b, R.drawable.redi_3h),
57
  HELI_3 ( new int[] {3,3,3,3,3,3}, 20, R.drawable.heli_3s, R.drawable.heli_3m, R.drawable.heli_3b, R.drawable.heli_3h),
54 58
  SKEW_2 ( new int[] {2,2,2,2}    , 11, R.drawable.skew_2s, R.drawable.skew_2m, R.drawable.skew_2b, R.drawable.skew_2h),
55 59
  SKEW_3 ( new int[] {3,3,3,3}    , 21, R.drawable.skew_3s, R.drawable.skew_3m, R.drawable.skew_3b, R.drawable.skew_3h),
56 60
  IVY_2  ( new int[] {2,2,2,2}    ,  8, R.drawable.ivy_2s , R.drawable.ivy_2m , R.drawable.ivy_2b , R.drawable.ivy_2h ),
......
61 65
  BAN4_3 ( new int[] {3,3,3}      , 16, R.drawable.ban4_3s, R.drawable.ban4_3m, R.drawable.ban4_3b, R.drawable.ban4_3h),
62 66
  SQU1_3 ( new int[] {3,2,3}      , 24, R.drawable.squ1_3s, R.drawable.squ1_3m, R.drawable.squ1_3b, R.drawable.squ1_3h),
63 67
  SQU2_3 ( new int[] {3,2,3}      , 24, R.drawable.squ2_3s, R.drawable.squ2_3m, R.drawable.squ2_3b, R.drawable.squ2_3h),
64
  MIRR_2 ( new int[] {2,2,2}      , 12, R.drawable.mirr_2s, R.drawable.mirr_2m, R.drawable.mirr_2b, R.drawable.mirr_2h),
65
  MIRR_3 ( new int[] {3,3,3}      , 17, R.drawable.mirr_3s, R.drawable.mirr_3m, R.drawable.mirr_3b, R.drawable.mirr_3h),
66 68
  CU_323 ( new int[] {3,2,3}      , 15, R.drawable.cu_323s, R.drawable.cu_323m, R.drawable.cu_323b, R.drawable.cu_323h),
67 69
  CU_232 ( new int[] {2,3,2}      , 16, R.drawable.cu_232s, R.drawable.cu_232m, R.drawable.cu_232b, R.drawable.cu_232h),
68 70
  CU_343 ( new int[] {3,4,3}      , 23, 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.drawable.heli_3s, R.drawable.heli_3m, R.drawable.heli_3b, R.drawable.heli_3h),
70 71
  ;
71 72

  
72 73
  public static final int NUM_OBJECTS = values().length;
......
148 149
      case  1:
149 150
      case  2:
150 151
      case  3:
151
      case  4: return new TwistyCuboid        (numL, quat, move, meshStream);
152
      case  5:
152
      case  4:
153
      case  5: return new TwistyCuboid        (numL, quat, move, meshStream);
153 154
      case  6:
154
      case  7: return new TwistyDiamond       (numL, quat, move, meshStream);
155
      case  7: return new TwistyMirror        (numL, quat, move, meshStream);
155 156
      case  8: return new TwistyJing          (numL, quat, move, meshStream);
156 157
      case  9:
157 158
      case 10:
......
161 162
      case 14:
162 163
      case 15: return new TwistyMegaminx      (numL, quat, move, meshStream);
163 164
      case 16: return new TwistyUltimate      (numL, quat, move, meshStream);
164
      case 17: return new TwistyDino6         (numL, quat, move, meshStream);
165
      case 18: return new TwistyDino4         (numL, quat, move, meshStream);
166
      case 19: return new TwistyRedi          (numL, quat, move, meshStream);
167
      case 20:
168
      case 21: return new TwistySkewb         (numL, quat, move, meshStream);
169
      case 22: return new TwistyIvy           (numL, quat, move, meshStream);
170
      case 23: return new TwistyRex           (numL, quat, move, meshStream);
171
      case 24: return new TwistyBandagedFused (numL, quat, move, meshStream);
172
      case 25: return new TwistyBandaged2Bar  (numL, quat, move, meshStream);
173
      case 26: return new TwistyBandaged3Plate(numL, quat, move, meshStream);
174
      case 27: return new TwistyBandagedEvil  (numL, quat, move, meshStream);
175
      case 28: return new TwistySquare1       (numL, quat, move, meshStream);
176
      case 29: return new TwistySquare2       (numL, quat, move, meshStream);
177
      case 30:
178
      case 31: return new TwistyMirror        (numL, quat, move, meshStream);
179
      case 32:
180
      case 33:
181
      case 34: return new TwistyCuboid        (numL, quat, move, meshStream);
182
      case 35: return new TwistyHelicopter    (numL, quat, move, meshStream);
165
      case 17:
166
      case 18:
167
      case 19: return new TwistyDiamond       (numL, quat, move, meshStream);
168

  
169
      case 20: return new TwistyDino6         (numL, quat, move, meshStream);
170
      case 21: return new TwistyDino4         (numL, quat, move, meshStream);
171
      case 22: return new TwistyRedi          (numL, quat, move, meshStream);
172
      case 23: return new TwistyHelicopter    (numL, quat, move, meshStream);
173
      case 24:
174
      case 25: return new TwistySkewb         (numL, quat, move, meshStream);
175
      case 26: return new TwistyIvy           (numL, quat, move, meshStream);
176
      case 27: return new TwistyRex           (numL, quat, move, meshStream);
177
      case 28: return new TwistyBandagedFused (numL, quat, move, meshStream);
178
      case 29: return new TwistyBandaged2Bar  (numL, quat, move, meshStream);
179
      case 30: return new TwistyBandaged3Plate(numL, quat, move, meshStream);
180
      case 31: return new TwistyBandagedEvil  (numL, quat, move, meshStream);
181
      case 32: return new TwistySquare1       (numL, quat, move, meshStream);
182
      case 33: return new TwistySquare2       (numL, quat, move, meshStream);
183
      case 34:
184
      case 35:
185
      case 36: return new TwistyCuboid        (numL, quat, move, meshStream);
183 186
      }
184 187

  
185 188
    return null;
src/main/java/org/distorted/objectlib/objects/TwistyCuboid.java
752 752
      case 4: return ObjectType.CUBE_4;
753 753
      case 5: return ObjectType.CUBE_5;
754 754
      case 6: return ObjectType.CUBE_6;
755
      case 7: return ObjectType.CUBE_7;
755 756
      }
756 757

  
757 758
    return ObjectType.CUBE_3;
......
767 768
      case 3: return "Rubik Cube";
768 769
      case 4: return "Rubik's Revenge";
769 770
      case 5: return "Professor's Cube";
770
      case 6: return "6x6 V-Cube";
771
      case 6: return "6x6 Cube";
772
      case 7: return "7x7 Cube";
771 773
      }
772 774
    return "Rubik Cube";
773 775
    }
......
782 784
      case 3: return "Ernő Rubik";
783 785
      case 4: return "Péter Sebestény";
784 786
      case 5: return "Udo Krell";
785
      case 6: return "Panagiotis Verdes";
787
      case 6:
788
      case 7: return "Panagiotis Verdes";
786 789
      }
787 790
    return "Ernő Rubik";
788 791
    }
......
797 800
      case 3: return 1974;
798 801
      case 4: return 1981;
799 802
      case 5: return 2002;
800
      case 8: return 2008;
803
      case 6:
804
      case 7: return 2008;
801 805
      }
802 806
    return 1974;
803 807
    }

Also available in: Unified diff