commit 74d67e50c941ad5bf940db3d9f079046e36baf8a
Author: Leszek Koltunski <leszek@koltunski.pl>
Date:   Thu Sep 16 00:00:11 2021 +0200

    Make the Skewbs standard size (cube size=2,3, i.e. equal to numLayers so that DIST2D and DIST3D are standard)

diff --git a/src/main/java/org/distorted/objects/MovementSkewb.java b/src/main/java/org/distorted/objects/MovementSkewb.java
index 857f164c..977c42c6 100644
--- a/src/main/java/org/distorted/objects/MovementSkewb.java
+++ b/src/main/java/org/distorted/objects/MovementSkewb.java
@@ -25,8 +25,8 @@ import org.distorted.library.type.Static3D;
 
 class MovementSkewb extends Movement
 {
-  static final float DIST3D = 0.25f;
-  static final float DIST2D = 0.25f;
+  static final float DIST3D = 0.5f;
+  static final float DIST2D = 0.5f;
 
   static final Static3D[] FACE_AXIS = new Static3D[]
          {
diff --git a/src/main/java/org/distorted/objects/TwistySkewb.java b/src/main/java/org/distorted/objects/TwistySkewb.java
index 1d07a0fc..8215a9af 100644
--- a/src/main/java/org/distorted/objects/TwistySkewb.java
+++ b/src/main/java/org/distorted/objects/TwistySkewb.java
@@ -139,7 +139,7 @@ public class TwistySkewb extends TwistyObject
 
   float getScreenRatio()
     {
-    return 1.0f;
+    return 0.5f;
     }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -186,7 +186,7 @@ public class TwistySkewb extends TwistyObject
       {
       case 2: float[] c2 = new float[] {0.0f};
               return new float[][] { c2,c2,c2,c2 };
-      case 3: float[] c3 = new float[] {-SQ3/12,+SQ3/12};
+      case 3: float[] c3 = new float[] {-SQ3/6,+SQ3/6};
               return new float[][] { c3,c3,c3,c3 };
       }
     return null;
@@ -203,9 +203,9 @@ public class TwistySkewb extends TwistyObject
 
   float[][] getCubitPositions(int numLayers)
     {
-    final float DIST_CORNER = (numLayers-1)*0.50f;
-    final float DIST_EDGE   = (numLayers-1)*0.50f;
-    final float DIST_CENTER = (numLayers-1)*0.50f;
+    final float DIST_CORNER = numLayers-1;
+    final float DIST_EDGE   = numLayers-1;
+    final float DIST_CENTER = numLayers-1;
 
     final int numCorners = getNumCorners();
     final int numEdges   = getNumEdges(numLayers);
@@ -246,9 +246,9 @@ public class TwistySkewb extends TwistyObject
 
     for (float[] edges : edgeTable)
       {
-      float c = (3-numLayers)*0.5f;
+      float c = 3-numLayers;
 
-      for (int j=0; j<numLayers-2; j++, c+=1.0f, index++)
+      for (int j=0; j<numLayers-2; j++, c+=2, index++)
         {
         CENTERS[index] = new float[] { edges[0]==0 ? c : edges[0] ,
                                        edges[1]==0 ? c : edges[1] ,
@@ -275,13 +275,13 @@ public class TwistySkewb extends TwistyObject
 
     for( float[] centers : centerTable )
       {
-      x = (2-numLayers)*0.5f;
+      x = 2-numLayers;
 
-      for(int i=0; i<numLayers-1; i++, x+=1.0f)
+      for(int i=0; i<numLayers-1; i++, x+=2)
         {
-        y = (2-numLayers)*0.5f;
+        y = 2-numLayers;
 
-        for(int j=0; j<numLayers-1; j++, y+=1.0f, index++)
+        for(int j=0; j<numLayers-1; j++, y+=2, index++)
           {
                if( centers[0]==Y ) cen0 = y;
           else if( centers[0]==X ) cen0 = x;
@@ -299,13 +299,13 @@ public class TwistySkewb extends TwistyObject
           }
         }
 
-      x = (3-numLayers)*0.5f;
+      x = 3-numLayers;
 
-      for(int i=0; i<numLayers-2; i++, x+=1.0f)
+      for(int i=0; i<numLayers-2; i++, x+=2)
         {
-        y = (3-numLayers)*0.5f;
+        y = 3-numLayers;
 
-        for(int j=0; j<numLayers-2; j++, y+=1.0f, index++)
+        for(int j=0; j<numLayers-2; j++, y+=2, index++)
           {
                if( centers[0]==Y ) cen0 = y;
           else if( centers[0]==X ) cen0 = x;
@@ -395,22 +395,22 @@ public class TwistySkewb extends TwistyObject
 
     if( variant==0 )
       {
-      double[][] vertices = new double[][] { {-0.5f, 0.0f, 0.0f},{ 0.0f,-0.5f, 0.0f},{ 0.0f, 0.0f,-0.5f},{-0.5f,-0.5f,-0.5f},{ 0.0f, 0.0f, 0.0f} };
+      double[][] vertices = new double[][] { {-1,0,0},{0,-1,0},{0,0,-1},{-1,-1,-1},{0,0,0} };
       int[][] vert_indices = new int[][] { {0,1,4},{2,0,4},{1,2,4},{3,1,0},{3,2,1},{3,0,2} };
       int N = numLayers==2 ? 7:5;
       int E1= numLayers==2 ? 3:2;
       int E2= numLayers==2 ? 5:3;
-      float[][] bands     = new float[][] { {0.028f,35,0.16f,0.7f,N,E1,E1}, {0.000f, 0,1.00f,0.0f,3,1,E2} };
+      float[][] bands     = new float[][] { {0.020f,35,0.16f,0.7f,N,E1,E1}, {0.000f, 0,1.00f,0.0f,3,1,E2} };
       int[] bandIndices   = new int[] { 0,0,0,1,1,1 };
-      float[][] corners   = new float[][] { {0.08f,0.15f}, {0.08f,0.20f} };
+      float[][] corners   = new float[][] { {0.05f,0.25f}, {0.05f,0.20f} };
       int[] cornerIndices = new int[] { 1,1,1,0,0 };
-      float[][] centers   = new float[][] { {-0.25f, -0.25f, -0.25f} };
+      float[][] centers   = new float[][] { {-0.5f, -0.5f, -0.5f} };
       int[] centerIndices = new int[] { 0,0,0,-1,0 };
       return new ObjectShape(vertices,vert_indices,bands,bandIndices,corners,cornerIndices,centers,centerIndices,getNumCubitFaces(), null);
       }
     else if( variant==1 )
       {
-      double[][] vertices = new double[][] { {-0.5, 0.0, 0.0},{ 0.5, 0.0, 0.0},{ 0.0,-0.5, 0.0},{ 0.0, 0.0,-0.5} };
+      double[][] vertices = new double[][] { {-1,0,0},{1,0,0},{0,-1,0},{0,0,-1} };
       int[][] vert_indices = new int[][] { {2,1,0},{3,0,1},{2,3,1},{3,2,0} };
       int N = numLayers==2 ? 7:5;
       int E = numLayers==2 ? 5:2;
@@ -418,21 +418,21 @@ public class TwistySkewb extends TwistyObject
       int[] bandIndices   = new int[] { 0,0,1,1 };
       float[][] corners   = new float[][] { {0.07f,0.20f}, {0.02f,0.30f} };
       int[] cornerIndices = new int[] { 0,0,1,1 };
-      float[][] centers   = new float[][] { {0.0f, -0.25f, -0.25f} };
+      float[][] centers   = new float[][] { {0.0f, -0.5f, -0.5f} };
       int[] centerIndices = new int[] { 0,0,0,0 };
       return new ObjectShape(vertices,vert_indices,bands,bandIndices,corners,cornerIndices,centers,centerIndices,getNumCubitFaces(), null);
       }
     else
       {
-      double[][] vertices = new double[][] { {-0.5f, 0.0f, 0.0f },{ 0.0f,-0.5f, 0.0f },{ 0.5f, 0.0f, 0.0f },{ 0.0f, 0.5f, 0.0f },{ 0.0f, 0.0f,-0.5f } };
+      double[][] vertices = new double[][] { {-1,0,0},{0,-1,0},{1,0,0},{0,1,0},{0,0,-1} };
       int[][] vert_indices = new int[][] { {0,1,2,3},{4,1,0},{4,2,1},{4,3,2},{4,0,3} };
       int N = numLayers==2 ? 7:6;
       int E = numLayers==2 ? 3:1;
-      float[][] bands     = new float[][] { {0.051f,35,SQ2/8,0.9f,N,E,E}, {0.000f,0,1,0.0f,3,0,0} };
+      float[][] bands     = new float[][] { {0.04f,35,SQ2/8,0.9f,N,E,E}, {0.000f,0,1,0.0f,3,0,0} };
       int[] bandIndices   = new int[] { 0,1,1,1,1 };
-      float[][] corners   = new float[][] { {0.06f,0.10f} };
+      float[][] corners   = new float[][] { {0.06f,0.15f} };
       int[] cornerIndices = new int[] { 0,0,0,0,0 };
-      float[][] centers   = new float[][] { {0,0,-0.2f} };
+      float[][] centers   = new float[][] { {0,0,-0.4f} };
       int[] centerIndices = new int[] { 0,0,0,0,-1 };
       return new ObjectShape(vertices,vert_indices,bands,bandIndices,corners,cornerIndices,centers,centerIndices,getNumCubitFaces(), null);
       }
diff --git a/src/main/res/raw/skew2.dmesh b/src/main/res/raw/skew2.dmesh
index 483505f7..637dbc83 100644
Binary files a/src/main/res/raw/skew2.dmesh and b/src/main/res/raw/skew2.dmesh differ
diff --git a/src/main/res/raw/skew3.dmesh b/src/main/res/raw/skew3.dmesh
index 9d794f30..deae07bf 100644
Binary files a/src/main/res/raw/skew3.dmesh and b/src/main/res/raw/skew3.dmesh differ