commit da69c279e2d9cf4b57e66148a986ae55630491e2
Author: Leszek Koltunski <leszek@koltunski.pl>
Date:   Tue Jun 8 13:44:00 2021 +0200

    Square-2: progress.

diff --git a/src/main/java/org/distorted/objects/ObjectList.java b/src/main/java/org/distorted/objects/ObjectList.java
index 853bd929..724d6922 100644
--- a/src/main/java/org/distorted/objects/ObjectList.java
+++ b/src/main/java/org/distorted/objects/ObjectList.java
@@ -215,7 +215,7 @@ public enum ObjectList
 
   SQU1 (
          new int[][] {
-                       {3 , 18, 0, R.drawable.ui_small_diam2, R.drawable.ui_medium_diam2, R.drawable.ui_big_diam2, R.drawable.ui_huge_diam2} ,
+                       {3 , 24, 0, R.drawable.ui_small_diam2, R.drawable.ui_medium_diam2, R.drawable.ui_big_diam2, R.drawable.ui_huge_diam2} ,
                      },
          TwistySquare1.class,
          new MovementSquare(),
@@ -225,7 +225,7 @@ public enum ObjectList
 
   SQU2 (
          new int[][] {
-                       {3 , 18, 0, R.drawable.ui_small_diam2, R.drawable.ui_medium_diam2, R.drawable.ui_big_diam2, R.drawable.ui_huge_diam2} ,
+                       {3 , 24, 0, R.drawable.ui_small_diam2, R.drawable.ui_medium_diam2, R.drawable.ui_big_diam2, R.drawable.ui_huge_diam2} ,
                      },
          TwistySquare2.class,
          new MovementSquare(),
diff --git a/src/main/java/org/distorted/objects/TwistyObject.java b/src/main/java/org/distorted/objects/TwistyObject.java
index 5d43c69a..a3e406bb 100644
--- a/src/main/java/org/distorted/objects/TwistyObject.java
+++ b/src/main/java/org/distorted/objects/TwistyObject.java
@@ -888,28 +888,6 @@ public abstract class TwistyObject extends DistortedNode
         int index = CUBITS[i].removeRotationNow(quat);
         mMesh.setEffectAssociation(i, CUBITS[i].computeAssociation(),index);
         }
-/*
-    if( NUM_CUBITS==18 )
-      {
-      boolean error=false;
-      String str="";
-
-      for(int i=10; i<18; i++)
-        {
-        int q = CUBITS[i].mQuatIndex;
-
-        str += (" "+q);
-
-        if( (((i%2)==0) && (q==2 || q== 8 || q==17 || q==23)) ||
-            (((i%2)==1) && (q==5 || q==11 || q==14 || q==20))  )
-           error=true;
-        }
-
-      if( error ) str+= " ERROR";
-      android.util.Log.e("D", "cubit: "+str);
-      }
-
- */
     }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/main/java/org/distorted/objects/TwistySquare1.java b/src/main/java/org/distorted/objects/TwistySquare1.java
index e8b4f350..29271dfc 100644
--- a/src/main/java/org/distorted/objects/TwistySquare1.java
+++ b/src/main/java/org/distorted/objects/TwistySquare1.java
@@ -354,17 +354,10 @@ class TwistySquare1 extends TwistySquare
     {
     for(int corner=0; corner<8; corner++)
       {
-//android.util.Log.e("D", "isPermittedUp: up corner: "+corner+" angle: "+angle);
-
-
       if( cornerIsUp(corner) )
         {
         int currQuat = mCornerQuat[corner];
         int finalQuat= QUAT_MULT[angle][currQuat];
-
-//boolean bad = quatIsBad(finalQuat,corner);
-//android.util.Log.e("D", "isPermittedUp: up corner: "+corner+" angle: "+angle+" is bad: "+bad);
-
         if( quatIsBad(finalQuat,corner) ) return false;
         }
       }
@@ -389,25 +382,6 @@ class TwistySquare1 extends TwistySquare
       {
       if( isPermittedUp(angle ) ) mPermittedAngles[1][mPermittedUp++] = angle;
       }
-/*
-    String strDo="";
-
-    for(int i=0; i<mPermittedDo; i++)
-      {
-      strDo += (" "+mPermittedAngles[0][i]);
-      }
-
-    String strUp="";
-
-    for(int i=0; i<mPermittedUp; i++)
-      {
-      strUp += (" "+mPermittedAngles[1][i]);
-      }
-
-    android.util.Log.e("D", "up  : "+strUp);
-    android.util.Log.e("D", "down: "+strDo);
-
- */
     }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -475,16 +449,6 @@ class TwistySquare1 extends TwistySquare
         mCornerQuat[corner] = QUAT_MULT[quat][curr];
         }
       }
-/*
-    String q="";
-
-    for(int c=0; c<8; c++)
-      {
-      q += (" "+mCornerQuat[c]);
-      }
-
-    android.util.Log.d("D", "quat="+quat+" corner quats now= "+q);
-*/
     }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -517,9 +481,6 @@ class TwistySquare1 extends TwistySquare
                     scramble[num][2] = nextAngle;
                     mLastRot = layer==0 ? LAST_LO : LAST_UP;
                     updateCornerQuats(scramble[num]);
-
-//android.util.Log.e("D", "SL axis="+scramble[num][0]+" layer="+scramble[num][1]+" angle="+scramble[num][2]);
-
                     break;
       case LAST_LO:
       case LAST_UP: layer = mLastRot==LAST_LO ? 1:0;
@@ -532,7 +493,6 @@ class TwistySquare1 extends TwistySquare
                       scramble[num][2] = nextAngle;
                       updateCornerQuats(scramble[num]);
                       mLastRot = LAST_UL;
-//android.util.Log.e("D", "LO/UP 1 axis="+scramble[num][0]+" layer="+scramble[num][1]+" angle="+scramble[num][2]);
                       }
                     else
                       {
@@ -542,7 +502,6 @@ class TwistySquare1 extends TwistySquare
                       mLastRot = LAST_SL;
                       updateCornerQuats(scramble[num]);
                       computePermittedAngles();
-//android.util.Log.e("D", "LO/UP 2 axis="+scramble[num][0]+" layer="+scramble[num][1]+" angle="+scramble[num][2]);
                       }
 
                     break;
@@ -552,8 +511,6 @@ class TwistySquare1 extends TwistySquare
                     mLastRot = LAST_SL;
                     updateCornerQuats(scramble[num]);
                     computePermittedAngles();
-//android.util.Log.e("D", "UL axis="+scramble[num][0]+" layer="+scramble[num][1]+" angle="+scramble[num][2]);
-
                     break;
       }
     }
diff --git a/src/main/java/org/distorted/objects/TwistySquare2.java b/src/main/java/org/distorted/objects/TwistySquare2.java
index 45ea0461..3084c7e0 100644
--- a/src/main/java/org/distorted/objects/TwistySquare2.java
+++ b/src/main/java/org/distorted/objects/TwistySquare2.java
@@ -47,8 +47,8 @@ class TwistySquare2 extends TwistySquare
     {
       0, 6,
       0, 9, 6, 3, 18, 15, 12, 21,
-      0, 9, 6, 3, 15, 12, 21, 18,
-      0, 9, 6, 3, 15, 12, 21, 18
+      0, 9, 6, 3, 0, 9, 6, 3,
+      15, 12, 21, 18, 15, 12, 21, 18
     };
 
   // centers of the 2 middles + 8 edges + 8 left corners + 8 right corners
@@ -143,15 +143,16 @@ class TwistySquare2 extends TwistySquare
       { 2, 0, 0, 0, 0, 0 },
       { 2, 0, 5, 0, 0, 0 },
       { 2, 0, 1, 0, 0, 0 },
+
       { 0, 3, 4, 0, 0, 0 },
       { 0, 3, 0, 0, 0, 0 },
       { 0, 3, 5, 0, 0, 0 },
       { 0, 3, 1, 0, 0, 0 },
 
-      { 0, 2, 4, 0, 0, 0 }, // 18
-      { 0, 2, 0, 0, 0, 0 },
+      { 0, 2, 0, 0, 0, 0 }, // 18
       { 0, 2, 5, 0, 0, 0 },
       { 0, 2, 1, 0, 0, 0 },
+      { 0, 2, 4, 0, 0, 0 },
       { 3, 0, 0, 0, 0, 0 },
       { 3, 0, 5, 0, 0, 0 },
       { 3, 0, 1, 0, 0, 0 },
@@ -173,14 +174,7 @@ class TwistySquare2 extends TwistySquare
 
   private Static4D getQuat(int cubit)
     {
-    if( (cubit>=0 && cubit<=13) || (cubit>=22))
-      {
-      return QUATS[QUAT_NUMBER[cubit]];
-      }
-    else
-      {
-      return QUATS[0];
-      }
+    return QUATS[QUAT_NUMBER[cubit]];
     }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -191,10 +185,10 @@ class TwistySquare2 extends TwistySquare
       {
       float[][] bands= new float[][]
         {
-          {0.038f,35,0.9f,1.0f, 5,2,1},
+          {0.030f,35,0.9f,1.0f, 5,2,1},
           {0.001f,35,0.9f,1.0f, 5,2,1}
         };
-      int[] bandIndexes   = new int[] { 0,1,0,1,1 };
+      int[] bandIndexes   = new int[] { 0,0,0,1,1 };
       float[][] corners   = new float[][] { {0.05f,0.13f} };
       int[] cornerIndexes = new int[] { 0,0,-1,0,0,-1 };
       float[][] centers   = new float[][] { { 0.0f, 0.0f,-0.5f} };