Project

General

Profile

« Previous | Next » 

Revision 3f7fad4f

Added by Leszek Koltunski over 2 years ago

Add Cube6.

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 39 
  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),
39 40 
  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),
40 41 
  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),
......
182 183 
      case  0:
183 184 
      case  1:
184 185 
      case  2:
185 
      case  3: return new TwistyCuboid        (numL, quat, move, stream);
186 
      case  4: return new TwistyJing          (numL, quat, move, stream);
187 
      case  5:
186 
      case  3:
187 
      case  4: return new TwistyCuboid        (numL, quat, move, stream);
188 
      case  5: return new TwistyJing          (numL, quat, move, stream);
188 189 
      case  6:
189 
      case  7: return new TwistyPyraminx      (numL, quat, move, stream);
190 
      case  8:
191 
      case  9: return new TwistyKilominx      (numL, quat, move, stream);
192 
      case 10:
193 
      case 11: return new TwistyMegaminx      (numL, quat, move, stream);
194 
      case 12: return new TwistyUltimate      (numL, quat, move, stream);
195 
      case 13:
190 
      case  7:
191 
      case  8: return new TwistyPyraminx      (numL, quat, move, stream);
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);
196 197 
      case 14:
197 
      case 15: return new TwistyDiamond       (numL, quat, move, stream);
198 
      case 16: return new TwistyDino6         (numL, quat, move, stream);
199 
      case 17: return new TwistyDino4         (numL, quat, move, stream);
200 
      case 18: return new TwistyRedi          (numL, quat, move, stream);
201 
      case 19: return new TwistyHelicopter    (numL, quat, move, stream);
202 
      case 20:
203 
      case 21: return new TwistySkewb         (numL, quat, move, stream);
204 
      case 22: return new TwistyIvy           (numL, quat, move, stream);
205 
      case 23: return new TwistyRex           (numL, quat, move, stream);
206 
      case 24: return new TwistyBandagedFused (numL, quat, move, stream);
207 
      case 25: return new TwistyBandaged2Bar  (numL, quat, move, stream);
208 
      case 26: return new TwistyBandaged3Plate(numL, quat, move, stream);
209 
      case 27: return new TwistyBandagedEvil  (numL, quat, move, stream);
210 
      case 28: return new TwistySquare1       (numL, quat, move, stream);
211 
      case 29: return new TwistySquare2       (numL, quat, move, stream);
212 
      case 30:
213 
      case 31: return new TwistyMirror        (numL, quat, move, stream);
214 
      case 32:
198 
      case 15:
199 
      case 16: return new TwistyDiamond       (numL, quat, move, stream);
200 
      case 17: return new TwistyDino6         (numL, quat, move, stream);
201 
      case 18: return new TwistyDino4         (numL, quat, move, stream);
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);
215 216 
      case 33:
216 
      case 34: return new TwistyCuboid        (numL, quat, move, stream);
217 
      case 34:
218 
      case 35: return new TwistyCuboid        (numL, quat, move, stream);
217 219 
      }
218 220 

  		




  219
  221
  
    
    return null;


  		












  

    
      src/main/java/org/distorted/objectlib/objects/TwistyCuboid.java
    
  





  263
  263
  
    
      }


  		




  264
  264
  
    
    else


  		




  265
  265
  
    
      {


  		




  266
  
  
    
      int extraI2, extraV2, num2;


  		




  267
  
  
    

  		




  268
  
  
    
      switch(numL)


  		




  269
  
  
    
        {


  		




  270
  
  
    
        case 2 : num2 = 6; extraI2 = 2; extraV2 = 2; break;


  		




  271
  
  
    
        case 3 : num2 = 5; extraI2 = 1; extraV2 = 0; break;


  		




  272
  
  
    
        case 4 : num2 = 4; extraI2 = 0; extraV2 = 0; break;


  		




  273
  
  
    
        default: num2 = 3; extraI2 = 0; extraV2 = 0; break;


  		




  274
  
  
    
        }


  		




  
  266
  
    
      int extraI2 = numL<=3 ? num-2 : 0;


  		




  275
  267
  
    

  		




  276
  268
  
    
      float[][] bands   = new float[][]


  		




  277
  269
  
    
        {


  		




  278
  
  
    
          {height,35,0.5f,0.7f,num ,extraI ,extraV },


  		




  279
  
  
    
          {height,35,0.5f,0.7f,num2,extraI2,extraV2},


  		




  280
  
  
    
          {height,35,0.5f,0.7f,   2,      0,      0},


  		




  
  270
  
    
          {height,35,0.5f,0.7f,num,extraI ,extraV},


  		




  
  271
  
    
          {height,35,0.5f,0.7f,  2,extraI2,     0},


  		




  
  272
  
    
          {height,35,0.5f,0.7f,  2,      0,     0},


  		




  281
  273
  
    
        };


  		




  282
  274
  
    
      int[] bandIndices = new int[] { 1,1,1,1,0,2};


  		




  283
  275
  
    
      return new ObjectShape(vertices,vert_indices,bands,bandIndices,corners,cornerIndices,centers,centerIndices,getNumCubitFaces(), null);


  		




  ......




  449
  441
  
    

  		




  450
  442
  
    
  public int getVariantFaceColor(int variant, int face, int[] numLayers)


  		




  451
  443
  
    
    {


  		




  452
  
  
    
    return (variant==0 || face==4) ? 0 : -1;


  		




  
  444
  
    
    return 0;


  		




  453
  445
  
    
    }


  		




  454
  446
  
    

  		




  455
  447
  
    
///////////////////////////////////////////////////////////////////////////////////////////////////


  		












Also available in:  Unified diff