Project

General

Profile

« Previous | Next » 

Revision 81141862

Added by Leszek Koltunski over 2 years ago

Remove the 'setupObject()' redundant API.

View differences:

src/main/java/org/distorted/objectlib/main/ObjectType.java
149 149

  
150 150
///////////////////////////////////////////////////////////////////////////////////////////////////
151 151

  
152
  public TwistyObject create(Static4D quat, int[][] moves, Resources res, int scrWidth)
152
  public TwistyObject create(Static4D quat, Resources res, int scrWidth)
153 153
    {
154 154
    DistortedTexture texture = new DistortedTexture();
155 155
    DistortedEffects effects = new DistortedEffects();
......
163 163
      case  0:
164 164
      case  1:
165 165
      case  2:
166
      case  3: return new TwistyCube          (size, quat, texture, mesh, effects, moves, res, scrWidth);
167
      case  4: return new TwistyJing          (size, quat, texture, mesh, effects, moves, res, scrWidth);
166
      case  3: return new TwistyCube          (size, quat, texture, mesh, effects, res, scrWidth);
167
      case  4: return new TwistyJing          (size, quat, texture, mesh, effects, res, scrWidth);
168 168
      case  5:
169 169
      case  6:
170
      case  7: return new TwistyPyraminx      (size, quat, texture, mesh, effects, moves, res, scrWidth);
170
      case  7: return new TwistyPyraminx      (size, quat, texture, mesh, effects, res, scrWidth);
171 171
      case  8:
172
      case  9: return new TwistyKilominx      (size, quat, texture, mesh, effects, moves, res, scrWidth);
172
      case  9: return new TwistyKilominx      (size, quat, texture, mesh, effects, res, scrWidth);
173 173
      case 10:
174
      case 11: return new TwistyMegaminx      (size, quat, texture, mesh, effects, moves, res, scrWidth);
175
      case 12: return new TwistyUltimate      (size, quat, texture, mesh, effects, moves, res, scrWidth);
174
      case 11: return new TwistyMegaminx      (size, quat, texture, mesh, effects, res, scrWidth);
175
      case 12: return new TwistyUltimate      (size, quat, texture, mesh, effects, res, scrWidth);
176 176
      case 13:
177 177
      case 14:
178
      case 15: return new TwistyDiamond       (size, quat, texture, mesh, effects, moves, res, scrWidth);
179
      case 16: return new TwistyDino6         (size, quat, texture, mesh, effects, moves, res, scrWidth);
180
      case 17: return new TwistyDino4         (size, quat, texture, mesh, effects, moves, res, scrWidth);
181
      case 18: return new TwistyRedi          (size, quat, texture, mesh, effects, moves, res, scrWidth);
182
      case 19: return new TwistyHelicopter    (size, quat, texture, mesh, effects, moves, res, scrWidth);
178
      case 15: return new TwistyDiamond       (size, quat, texture, mesh, effects, res, scrWidth);
179
      case 16: return new TwistyDino6         (size, quat, texture, mesh, effects, res, scrWidth);
180
      case 17: return new TwistyDino4         (size, quat, texture, mesh, effects, res, scrWidth);
181
      case 18: return new TwistyRedi          (size, quat, texture, mesh, effects, res, scrWidth);
182
      case 19: return new TwistyHelicopter    (size, quat, texture, mesh, effects, res, scrWidth);
183 183
      case 20:
184
      case 21: return new TwistySkewb         (size, quat, texture, mesh, effects, moves, res, scrWidth);
185
      case 22: return new TwistyIvy           (size, quat, texture, mesh, effects, moves, res, scrWidth);
186
      case 23: return new TwistyRex           (size, quat, texture, mesh, effects, moves, res, scrWidth);
187
      case 24: return new TwistyBandagedFused (size, quat, texture, mesh, effects, moves, res, scrWidth);
188
      case 25: return new TwistyBandaged2Bar  (size, quat, texture, mesh, effects, moves, res, scrWidth);
189
      case 26: return new TwistyBandaged3Plate(size, quat, texture, mesh, effects, moves, res, scrWidth);
190
      case 27: return new TwistyBandagedEvil  (size, quat, texture, mesh, effects, moves, res, scrWidth);
191
      case 28: return new TwistySquare1       (size, quat, texture, mesh, effects, moves, res, scrWidth);
192
      case 29: return new TwistySquare2       (size, quat, texture, mesh, effects, moves, res, scrWidth);
184
      case 21: return new TwistySkewb         (size, quat, texture, mesh, effects, res, scrWidth);
185
      case 22: return new TwistyIvy           (size, quat, texture, mesh, effects, res, scrWidth);
186
      case 23: return new TwistyRex           (size, quat, texture, mesh, effects, res, scrWidth);
187
      case 24: return new TwistyBandagedFused (size, quat, texture, mesh, effects, res, scrWidth);
188
      case 25: return new TwistyBandaged2Bar  (size, quat, texture, mesh, effects, res, scrWidth);
189
      case 26: return new TwistyBandaged3Plate(size, quat, texture, mesh, effects, res, scrWidth);
190
      case 27: return new TwistyBandagedEvil  (size, quat, texture, mesh, effects, res, scrWidth);
191
      case 28: return new TwistySquare1       (size, quat, texture, mesh, effects, res, scrWidth);
192
      case 29: return new TwistySquare2       (size, quat, texture, mesh, effects, res, scrWidth);
193 193
      case 30:
194
      case 31: return new TwistyMirror        (size, quat, texture, mesh, effects, moves, res, scrWidth);
194
      case 31: return new TwistyMirror        (size, quat, texture, mesh, effects, res, scrWidth);
195 195
      }
196 196

  
197 197
    return null;

Also available in: Unified diff