Project

General

Profile

« Previous | Next » 

Revision 7af68038

Added by Leszek Koltunski over 2 years ago

Progress

View differences:

src/main/java/org/distorted/objectlib/objects/TwistyUltimate.java
319 319
    {
320 320
    if( mStickers==null )
321 321
      {
322
      float[][] STICKERS = new float[][]
323
         {
324
           { -0.14400357f, -0.47894150f, 0.50000000f,-0.011045523f, 0.37700626f, 0.36749030f,-0.26699730f, 0.36749026f, -0.46600536f, -0.24499352f }, // Big cubit 1st
325
           {  0.36327127f,  0.26393202f,-0.36327127f, 0.500000000f,-0.36327127f,-0.26393202f, 0.36327127f,-0.50000000f },                             // Big cubit 2nd
326
           { -0.29389262f, -0.50000000f, 0.29389262f,-0.309017000f, 0.29389262f, 0.30901700f,-0.29389262f, 0.50000000f },                             // Small cubit 1st
327
         };
328

  
329
      final float R1 = 0.08f;
330
      final float R2 = 0.13f;
322
      final float R1 = 0.13f;
323
      final float R2 = 0.08f;
331 324
      final float R3 = 0.11f;
332
      final float[][] radii  = { {R1,R1,R1,R1,R1},{R2,R2,R2,R2},{R3,R3,R3,R3} };
333
      float[] strokes = { 0.07f, 0.09f, 0.08f };
325
      final float[][] radii  = { {R1,R1,R1,R1},{R2,R2,R2,R2,R2},{R3,R3,R3,R3} };
326
      float[] strokes = { 0.09f, 0.07f, 0.08f };
334 327

  
335 328
      if( ObjectControl.isInIconMode() )
336 329
        {
......
340 333
        strokes[2]*=mult;
341 334
        }
342 335

  
343
      mStickers = new ObjectSticker[STICKERS.length];
336
      mStickers = new ObjectSticker[mStickerCoords.length];
344 337

  
345
      for(int s=0; s<STICKERS.length; s++)
338
      for(int s=0; s<mStickerCoords.length; s++)
346 339
        {
347
        mStickers[s] = new ObjectSticker(STICKERS[s],null,radii[s],strokes[s]);
340
        mStickers[s] = new ObjectSticker(mStickerCoords[s],null,radii[s],strokes[s]);
348 341
        }
349 342
      }
350 343

  
......
426 419
    return null;
427 420
    }
428 421

  
429
///////////////////////////////////////////////////////////////////////////////////////////////////
430

  
431
  public int getNumStickerTypes(int[] numLayers)
432
    {
433
    return 3;
434
    }
435

  
436 422
///////////////////////////////////////////////////////////////////////////////////////////////////
437 423

  
438 424
  public int getNumCubitFaces()

Also available in: Unified diff