Project

General

Profile

« Previous | Next » 

Revision 00f4980d

Added by Leszek Koltunski over 2 years ago

Progress standarising stickering - adjust sticker radii based on cos of the angle at the sticker vertex.

View differences:

src/main/java/org/distorted/objectlib/objects/TwistyDiamond.java
507 507

  
508 508
  private float getRadius()
509 509
    {
510
    return 0.06f;
510
    return 0.08f;
511 511
    }
512 512

  
513 513
///////////////////////////////////////////////////////////////////////////////////////////////////
......
532 532
    return stroke;
533 533
    }
534 534

  
535
///////////////////////////////////////////////////////////////////////////////////////////////////
536

  
537
  private float[][] getAngles()
538
    {
539
    return null;
540
    }
541

  
535 542
///////////////////////////////////////////////////////////////////////////////////////////////////
536 543

  
537 544
  public ObjectSticker retSticker(int sticker)
......
540 547
      {
541 548
      float rad = getRadius();
542 549
      float str = getStroke();
550
      float[][] angles = getAngles();
543 551
      int numStickers = mStickerCoords.length;
544 552
      mStickers = new ObjectSticker[numStickers];
545 553

  
......
548 556
        float scale = mStickerScales[s];
549 557
        float radius = rad / scale;
550 558
        float stroke = str / scale;
551
        int len = mStickerCoords[s].length;
559
        int len = mStickerCoords[s].length/2;
552 560
        float[] radii = new float[len];
553
        for(int r=0; r<len; r++) radii[r] = radius;
554
        mStickers[s] = new ObjectSticker(mStickerCoords[s],null,radii,stroke);
561
        for(int r=0; r<len; r++) radii[r] = radius*computeRadiusCorrection(mStickerCoords[s],r,len);
562
        mStickers[s] = new ObjectSticker(mStickerCoords[s],angles==null ? null : angles[s],radii,stroke);
555 563
        }
556 564
      }
557 565

  

Also available in: Unified diff