commit 064ccc31fbaf247d5b9a72a64459cbf8f445a08d
Author: Leszek Koltunski <leszek@koltunski.pl>
Date:   Sun Oct 18 01:02:39 2020 +0100

    Missing meshes; fix the Solver.

diff --git a/src/main/java/org/distorted/objects/TwistyCube.java b/src/main/java/org/distorted/objects/TwistyCube.java
index 8e5c52f6..59f029b6 100644
--- a/src/main/java/org/distorted/objects/TwistyCube.java
+++ b/src/main/java/org/distorted/objects/TwistyCube.java
@@ -421,7 +421,7 @@ class TwistyCube extends TwistyObject
       objectString.append(FACE_NAMES[color]);
       }
 
-     face = FRONT;
+    face = FRONT;
 
     for(int i=0; i<len; i++)
       {
diff --git a/src/main/java/org/distorted/objects/TwistyObject.java b/src/main/java/org/distorted/objects/TwistyObject.java
index d6897b1a..eaa7fd33 100644
--- a/src/main/java/org/distorted/objects/TwistyObject.java
+++ b/src/main/java/org/distorted/objects/TwistyObject.java
@@ -346,7 +346,11 @@ public abstract class TwistyObject extends DistortedNode
   int getCubitFaceColorIndex(int cubit, int face)
     {
     Static4D texMap = mMesh.getTextureMap(NUM_FACES*cubit + face);
-    return (int)(texMap.get0() / texMap.get2());
+
+    int x = (int)(texMap.get0()/texMap.get2());
+    int y = (int)(texMap.get1()/texMap.get3());
+
+    return (mNumTexRows-1-y)*NUM_STICKERS_IN_ROW + x;
     }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -561,10 +565,13 @@ public abstract class TwistyObject extends DistortedNode
 
   public void setTextureMap(int cubit, int face, int newColor)
     {
-    final float ratio = 1.0f/(NUM_TEXTURES+1);
+    final float ratioW = 1.0f/mNumTexCols;
+    final float ratioH = 1.0f/mNumTexRows;
     final Static4D[] maps = new Static4D[NUM_CUBIT_FACES];
+    int row = (mNumTexRows-1) - newColor/mNumTexCols;
+    int col = newColor%mNumTexCols;
 
-    maps[face] = new Static4D( newColor*ratio, 0.0f, ratio, 1.0f);
+    maps[face] = new Static4D( col*ratioW, row*ratioH, ratioW, ratioH);
     mMesh.setTextureMap(maps,NUM_CUBIT_FACES*cubit);
     }
 
diff --git a/src/main/res/raw/diamond.dmesh b/src/main/res/raw/diamond.dmesh
index bce44f53..0a2cb526 100644
Binary files a/src/main/res/raw/diamond.dmesh and b/src/main/res/raw/diamond.dmesh differ
diff --git a/src/main/res/raw/skewm.dmesh b/src/main/res/raw/skewm.dmesh
new file mode 100644
index 00000000..bfd84505
Binary files /dev/null and b/src/main/res/raw/skewm.dmesh differ