commit 5da517d3a2b7e10b2971ce73c45cbfeaa44230f2
Author: Leszek Koltunski <leszek@koltunski.pl>
Date:   Sun Sep 19 13:04:56 2021 +0200

    Minor

diff --git a/src/main/java/org/distorted/objects/TwistyDiamond.java b/src/main/java/org/distorted/objects/TwistyDiamond.java
index 7ed7efab..4f36451e 100644
--- a/src/main/java/org/distorted/objects/TwistyDiamond.java
+++ b/src/main/java/org/distorted/objects/TwistyDiamond.java
@@ -52,7 +52,6 @@ public class TwistyDiamond extends TwistyObject
            COLOR_GREEN , COLOR_GREY
          };
 
-  private static final float DIST = 0.50f;
   private static final int FACES_PER_CUBIT =8;
 
   private ScrambleState[] mStates;
@@ -181,7 +180,7 @@ public class TwistyDiamond extends TwistyObject
     else
       {
       float[][] cuts = new float[4][numLayers-1];
-      float dist = SQ6*0.666f*DIST;
+      float dist = SQ6/3;
       float cut  = 0.5f*dist*(2-numLayers);
 
       for(int i=0; i<numLayers-1; i++)
@@ -222,12 +221,12 @@ public class TwistyDiamond extends TwistyObject
 
   private int createOctaPositions(float[][] centers, int index, int layers, float height)
     {
-    float x = DIST*(layers-1);
-    float z = DIST*(layers+1);
+    float x = (layers-1)*0.5f;
+    float z = (layers+1)*0.5f;
 
     for(int i=0; i<layers; i++, index++)
       {
-      z -= 2*DIST;
+      z -= 1;
       centers[index][0] = x;
       centers[index][1] = height;
       centers[index][2] = z;
@@ -235,7 +234,7 @@ public class TwistyDiamond extends TwistyObject
 
     for(int i=0; i<layers-1; i++, index++)
       {
-      x -= 2*DIST;
+      x -= 1;
       centers[index][0] = x;
       centers[index][1] = height;
       centers[index][2] = z;
@@ -243,7 +242,7 @@ public class TwistyDiamond extends TwistyObject
 
     for(int i=0; i<layers-1; i++, index++)
       {
-      z += 2*DIST;
+      z += 1;
       centers[index][0] = x;
       centers[index][1] = height;
       centers[index][2] = z;
@@ -251,7 +250,7 @@ public class TwistyDiamond extends TwistyObject
 
     for(int i=0; i<layers-2; i++, index++)
       {
-      x += 2*DIST;
+      x += 1;
       centers[index][0] = x;
       centers[index][1] = height;
       centers[index][2] = z;
@@ -264,45 +263,45 @@ public class TwistyDiamond extends TwistyObject
 
   private int createTetraPositions(float[][] centers, int index, int layers, float height)
     {
-    float x = DIST*(layers-1);
-    float z = DIST*layers;
+    float x = (layers-1)*0.5f;
+    float z =  layers*0.5f;
 
     for(int i=0; i<layers-1; i++, index++)
       {
-      z -= 2*DIST;
+      z -= 1;
       centers[index][0] = x;
       centers[index][1] = height;
       centers[index][2] = z;
       }
 
-    x += DIST;
-    z -= DIST;
+    x += 0.5f;
+    z -= 0.5f;
 
     for(int i=0; i<layers-1; i++, index++)
       {
-      x -= 2*DIST;
+      x -= 1;
       centers[index][0] = x;
       centers[index][1] = height;
       centers[index][2] = z;
       }
 
-    x -= DIST;
-    z -= DIST;
+    x -= 0.5f;
+    z -= 0.5f;
 
     for(int i=0; i<layers-1; i++, index++)
       {
-      z += 2*DIST;
+      z += 1;
       centers[index][0] = x;
       centers[index][1] = height;
       centers[index][2] = z;
       }
 
-    x -= DIST;
-    z += DIST;
+    x -= 0.5f;
+    z += 0.5f;
 
     for(int i=0; i<layers-1; i++, index++)
       {
-      x += 2*DIST;
+      x += 1;
       centers[index][0] = x;
       centers[index][1] = height;
       centers[index][2] = z;
@@ -326,18 +325,18 @@ public class TwistyDiamond extends TwistyObject
 
     for(int i=layers-1; i>0; i--)
       {
-      height += SQ2*DIST;
+      height += SQ2/2;
       index = createOctaPositions(CENTERS,index,i,+height);
       index = createOctaPositions(CENTERS,index,i,-height);
       }
 
-    height = DIST*SQ2/2;
+    height = SQ2/4;
 
     for(int i=layers; i>1; i--)
       {
       index = createTetraPositions(CENTERS,index,i,+height);
       index = createTetraPositions(CENTERS,index,i,-height);
-      height += SQ2*DIST;
+      height += SQ2/2;
       }
 
     return CENTERS;
diff --git a/src/main/java/org/distorted/objects/TwistyPyraminx.java b/src/main/java/org/distorted/objects/TwistyPyraminx.java
index 520f754e..391d0303 100644
--- a/src/main/java/org/distorted/objects/TwistyPyraminx.java
+++ b/src/main/java/org/distorted/objects/TwistyPyraminx.java
@@ -224,13 +224,13 @@ public class TwistyPyraminx extends TwistyObject
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-  float[][] getCuts(int size)
+  float[][] getCuts(int numLayers)
     {
-    float[][] cuts = new float[4][size-1];
+    float[][] cuts = new float[4][numLayers-1];
 
-    for(int i=0; i<size-1; i++)
+    for(int i=0; i<numLayers-1; i++)
       {
-      float cut = (1.0f-0.25f*size+i)*(SQ6/3);
+      float cut = (1.0f+i-numLayers/3.0f)*(SQ6/3);
       cuts[0][i] = cut;
       cuts[1][i] = cut;
       cuts[2][i] = cut;