commit e0613906ec003f04fbb7d138e2b49ceef70e9483
Author: Leszek Koltunski <leszek@koltunski.pl>
Date:   Fri Aug 6 01:27:46 2021 +0200

    Convert the Rex corner sticker to the new mechanism.

diff --git a/src/main/java/org/distorted/helpers/FactorySticker.java b/src/main/java/org/distorted/helpers/FactorySticker.java
index 14da94bf..46fcc490 100644
--- a/src/main/java/org/distorted/helpers/FactorySticker.java
+++ b/src/main/java/org/distorted/helpers/FactorySticker.java
@@ -329,6 +329,8 @@ public class FactorySticker
 
   public void drawRexCornerSticker(Canvas canvas, Paint paint, int left, int top, int color, float stroke, float radius1, float radius2)
     {
+
+/*
     paint.setColor(color);
     paint.setStyle(Paint.Style.FILL);
     canvas.drawRect(left,top,left+TEXTURE_HEIGHT,top+TEXTURE_HEIGHT,paint);
@@ -366,6 +368,7 @@ public class FactorySticker
     float cy2 = top  + (0.5f-2*G/3 + radius1/REX_S)*TEXTURE_HEIGHT;
     float R3  = TEXTURE_HEIGHT*(radius1 + 0.5f*stroke);
     canvas.drawArc( cx7-R3, cy2-R3, cx7+R3, cy2+R3, 270-(90-REX_B/2), 180-REX_B, false ,paint);
+*/
     }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/main/java/org/distorted/objects/TwistyRex.java b/src/main/java/org/distorted/objects/TwistyRex.java
index b3d4f6fb..c9fad8f0 100644
--- a/src/main/java/org/distorted/objects/TwistyRex.java
+++ b/src/main/java/org/distorted/objects/TwistyRex.java
@@ -553,25 +553,31 @@ public class TwistyRex extends TwistyObject
     {
     int COLORS = FACE_COLORS.length;
     FactorySticker factory = FactorySticker.getInstance();
-    float S1 = 0.050f;
-    float S2 = 0.051f;
-    float R1 = 0.07f;
-    float R2 = 0.02f;
-    float R3 = 0.06f;
-    float R4 = 0.04f;
 
     if( face<COLORS )
       {
-      factory.drawRexCornerSticker(canvas, paint, left, top, FACE_COLORS[face%COLORS], S1, R2, R3);
+      float S = 0.05f;
+      float R = 0.02f;
+      float ANGLE = (float)(Math.PI/15);
+      float F = REX_D*SQ2;
+      float G = (1-REX_D)*SQ2/2;
+      float[] vertices = new float[] { F/2, -G/3, -F/2, -G/3, 0, 2*G/3 };
+      float[] angles   = new float[] { -ANGLE/2, ANGLE, ANGLE };
+
+      factory.drawRoundedPolygon(canvas, paint, left, top, vertices, angles, S, FACE_COLORS[face%COLORS], R);
       }
     else if( face<2*COLORS )
       {
+      float S = 0.035f;
+      float R = 0.040f;
       float[] vertices = { -REX_D,0.0f, 0.0f, -REX_D, +REX_D, 0.0f, 0.0f, +REX_D};
-      factory.drawRoundedPolygon(canvas, paint, left, top, vertices, null, S1, FACE_COLORS[face%COLORS], R4);
+      factory.drawRoundedPolygon(canvas, paint, left, top, vertices, null, S, FACE_COLORS[face%COLORS], R);
       }
     else
       {
-      factory.drawRexEdgeSticker(canvas, paint, left, top, FACE_COLORS[face%COLORS], S2, R1);
+      float S = 0.051f;
+      float R = 0.070f;
+      factory.drawRexEdgeSticker(canvas, paint, left, top, FACE_COLORS[face%COLORS], S, R);
       }
     }