Project

General

Profile

« Previous | Next » 

Revision b2e19fa7

Added by Leszek Koltunski about 1 year ago

Coin tetrahedron: bugfix, new mesh & json; move to json version 10.

View differences:

src/main/java/org/distorted/objectlib/objects/TwistyCoinTetrahedron.java
422 422
    int[][] ret = new int[3+3*(N-1)+1][];
423 423

  
424 424
    ret[0] = new int[3*N];
425
    for(int i=0; i<3*N; i++) ret[0][i] = 3*N-1-i;
425
    for(int i=0; i<3*N; i++) ret[0][i] = i;
426 426

  
427 427
    for(int i=1; i<=N-1; i++)
428 428
      {
429 429
      ret[i] = new int[3];
430
      ret[i][0] = i;
431
      ret[i][1] = i-1;
430
      ret[i][0] = i-1;
431
      ret[i][1] = i;
432 432
      ret[i][2] = 3*N;
433 433

  
434 434
      ret[N-1+i] = new int[3];
435
      ret[N-1+i][0] = N+i;
436
      ret[N-1+i][1] = N+i-1;
435
      ret[N-1+i][0] = N+i-1;
436
      ret[N-1+i][1] = N+i;
437 437
      ret[N-1+i][2] = 3*N;
438 438

  
439 439
      ret[2*N-2+i] = new int[3];
440
      ret[2*N-2+i][0] = 2*N+i;
441
      ret[2*N-2+i][1] = 2*N+i-1;
440
      ret[2*N-2+i][0] = 2*N+i-1;
441
      ret[2*N-2+i][1] = 2*N+i;
442 442
      ret[2*N-2+i][2] = 3*N;
443 443
      }
444 444

  
......
504 504
    {
505 505
    if( variant==0 )
506 506
      {
507
      float h1 = isInIconMode() ? 0.001f : 0.03f;
508
      float h2 = isInIconMode() ? 0.001f : 0.01f;
507
      float h1 = isInIconMode() ? 0.0001f : 0.03f;
508
      float h2 = isInIconMode() ? 0.0001f : 0.01f;
509 509
      float[][] bands = { {h1,35,0.2f,0.4f,5,2,1}, {h2,35,0.2f,0.4f,2,0,0} };
510 510
      int num = 9+3*N+3;
511 511
      int[] indices   = new int[num];
......
516 516
      }
517 517
    else if( variant==1 )
518 518
      {
519
      float h1 = isInIconMode() ? 0.001f : 0.00f;
520
      float h2 = isInIconMode() ? 0.001f : 0.00f;
521
      float[][] bands = { {h1,15,0.1f,0.2f,5,0,0}, {h2,15,0.1f,0.2f,2,0,0} };
519
      float h = isInIconMode() ? 0.0001f : 0.001f;
520
      float[][] bands = { {h,15,0.05f,0.1f,5,0,0}, {h,15,0.05f,0.1f,2,0,0} };
522 521
      int num = 3+3*(N-1)+1;
523 522
      int[] indices   = new int[num];
524 523
      for(int i=1; i<num; i++) indices[i] = 1;
......
526 525
      }
527 526
    else
528 527
      {
529
      float h1 = isInIconMode() ? 0.001f : 0.015f;
530
      float h2 = isInIconMode() ? 0.001f : 0.00f;
528
      float h1 = isInIconMode() ? 0.0001f : 0.015f;
529
      float h2 = isInIconMode() ? 0.0001f : 0.001f;
531 530
      float[][] bands = { {h1,15,0.250f,0.7f,5,0,0}, {h2,15,0.125f,0.2f,2,0,0} };
532 531
      int num = 2+2*(N-1)+1;
533 532
      int[] indices   = new int[num];
......
604 603
    float Z = 0.06422593f - 0.25f*L;
605 604
    float X = 0.5f - L;
606 605

  
607
    float K = 1.48f;
606
    float K = 1.45f;
608 607
    float A = K*0.50f;
609 608
    float B = K*0.25f;
610 609
    float C = K*0.43301257f;
......
617 616
    mStickerCoords = new float[][]
618 617
          {
619 618
            { -D, E, 0.0f, -0.5f, D, E, F, G, -F, G },
620
            { -C, -B, 0.0f, A, C, -B },
619
            { -C, B, C, B, 0.0f, -A },
621 620
            { -X, Z, X, Z }
622 621
          };
623 622
    }

Also available in: Unified diff