commit 5581ba2ba6f785a8936743123c4b424bd028d762
Author: Leszek Koltunski <leszek@koltunski.pl>
Date:   Fri Sep 25 19:33:11 2020 +0100

    Progress with the Skewb Diamond.

diff --git a/src/main/java/org/distorted/objects/TwistyDiamond.java b/src/main/java/org/distorted/objects/TwistyDiamond.java
index 9147d808..0ee7f861 100644
--- a/src/main/java/org/distorted/objects/TwistyDiamond.java
+++ b/src/main/java/org/distorted/objects/TwistyDiamond.java
@@ -73,10 +73,10 @@ public class TwistyDiamond extends TwistyObject
 
   private static final int[] FACE_COLORS = new int[]
          {
-           COLOR_YELLOW, COLOR_WHITE,
-           COLOR_BLUE  , COLOR_GREEN,
-           COLOR_RED   , COLOR_BROWN,
-           COLOR_PINK  , COLOR_VIOLET
+           COLOR_YELLOW, COLOR_WHITE ,
+           COLOR_BLUE  , COLOR_GREEN ,
+           COLOR_PINK  , COLOR_VIOLET,
+           COLOR_RED   , COLOR_BROWN ,
          };
 
   // All legal rotation quats of a Diamond: unit + three 180 deg turns + 8 generators
@@ -163,11 +163,11 @@ public class TwistyDiamond extends TwistyObject
     float[] vertices = { -F,-E/3, +F,-E/3, 0.0f,2*E/3};
 
     float[] bands = new float[] { 1.0f    , 0,
-                                  1.0f  -C, D*0.50f,
-                                  1.0f-2*C, D*0.80f,
-                                  1.0f-4*C, D*1.00f,
-                                  0.5f    , D*1.20f,
-                                  0.0f    , D*1.25f };
+                                  1.0f  -C, D*0.55f,
+                                  1.0f-2*C, D*0.85f,
+                                  1.0f-4*C, D*1.20f,
+                                  0.5f    , D*1.40f,
+                                  0.0f    , D*1.50f };
 
     MeshBase[] meshes = new MeshPolygon[FACES_PER_CUBIT];
     meshes[0] = new MeshPolygon(vertices, bands, 2,2);
@@ -281,9 +281,9 @@ public class TwistyDiamond extends TwistyObject
     float[] bands = new float[] { 1.0f    , 0,
                                   1.0f  -C, D*0.50f,
                                   1.0f-2*C, D*0.80f,
-                                  1.0f-4*C, D*1.00f,
-                                  0.5f    , D*1.20f,
-                                  0.0f    , D*1.25f };
+                                  1.0f-4*C, D*1.10f,
+                                  0.5f    , D*1.30f,
+                                  0.0f    , D*1.35f };
 
     MeshBase[] meshes = new MeshBase[FACES_PER_CUBIT];
     meshes[0] = new MeshPolygon(vertices, bands, 2,2);
@@ -424,7 +424,7 @@ public class TwistyDiamond extends TwistyObject
 
   float getBasicStep()
     {
-    return SQ6/6;
+    return SQ6/4;
     }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/main/java/org/distorted/objects/TwistyObject.java b/src/main/java/org/distorted/objects/TwistyObject.java
index 59cf3cec..02b88dd3 100644
--- a/src/main/java/org/distorted/objects/TwistyObject.java
+++ b/src/main/java/org/distorted/objects/TwistyObject.java
@@ -61,8 +61,8 @@ public abstract class TwistyObject extends DistortedNode
   static final int COLOR_GREEN  = 0xff00ff00;
   static final int COLOR_RED    = 0xffff0000;
   static final int COLOR_BROWN  = 0xffb5651d;
-  static final int COLOR_PINK   = 0xffe134eb;
-  static final int COLOR_VIOLET = 0xffa534eb;
+  static final int COLOR_PINK   = 0xffff90ff;
+  static final int COLOR_VIOLET = 0xff7700bb;
 
   private static final float NODE_RATIO = 1.32f;
   private static final float MAX_SIZE_CHANGE = 1.3f;