/src/main/java/org/distorted/objectlib/objects/TwistyPyraminx.java - Diff - TwistyPuzzleLib - Distorted Android

« Previous | Next »

Revision 00f4980d

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

       private float getRadius()
+        {
         return 0.06f;
         return 0.08f;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
-...
         return stroke;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       private float[][] getAngles()
+        {
         return null;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       public ObjectSticker retSticker(int sticker)
-...
+          {
           float rad = getRadius();
           float str = getStroke();
           float[][] angles = getAngles();
           int numStickers = mStickerCoords.length;
           mStickers = new ObjectSticker[numStickers];
-...
             float scale = mStickerScales[s];
             float radius = rad / scale;
             float stroke = str / scale;
             int len = mStickerCoords[s].length;
             int len = mStickerCoords[s].length/2;
             float[] radii = new float[len];
             for(int r=0; r<len; r++) radii[r] = radius;
             mStickers[s] = new ObjectSticker(mStickerCoords[s],null,radii,stroke);
             for(int r=0; r<len; r++) radii[r] = radius*computeRadiusCorrection(mStickerCoords[s],r,len);
             mStickers[s] = new ObjectSticker(mStickerCoords[s],angles==null ? null : angles[s],radii,stroke);
+            }
+          }

Also available in: Unified diff