commit 50ec342b6667ac7d56dd1f47953b243974b79c1e
Author: Leszek Koltunski <leszek@koltunski.pl>
Date:   Fri Mar 25 11:53:38 2022 +0100

    Cleanups.

diff --git a/src/main/java/org/distorted/bandaged/BandagedCreatorActivity.java b/src/main/java/org/distorted/bandaged/BandagedCreatorActivity.java
index bd46e662..56ed23d6 100644
--- a/src/main/java/org/distorted/bandaged/BandagedCreatorActivity.java
+++ b/src/main/java/org/distorted/bandaged/BandagedCreatorActivity.java
@@ -213,6 +213,14 @@ public class BandagedCreatorActivity extends AppCompatActivity
       return mFirebaseAnalytics;
       }
 
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+    public BandagedCreatorRenderer getRenderer()
+      {
+      BandagedCreatorView view = findViewById(R.id.bandagedCreatorObjectView);
+      return view.getRenderer();
+      }
+
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
     public int getHeightBar()
diff --git a/src/main/java/org/distorted/bandaged/BandagedCreatorRenderer.java b/src/main/java/org/distorted/bandaged/BandagedCreatorRenderer.java
index 6047a8e3..d6b526a9 100644
--- a/src/main/java/org/distorted/bandaged/BandagedCreatorRenderer.java
+++ b/src/main/java/org/distorted/bandaged/BandagedCreatorRenderer.java
@@ -43,43 +43,43 @@ public class BandagedCreatorRenderer implements GLSurfaceView.Renderer, Distorte
 
    private final float[][] POSITIONS = new float[][]
         {
-          {-1.0f, +1.0f, +1.0f},
-          {-1.0f, +1.0f, +0.0f},
-          {-1.0f, +1.0f, -1.0f},
-          {-1.0f,  0.0f, +1.0f},
-          {-1.0f,  0.0f, +0.0f},
-          {-1.0f,  0.0f, -1.0f},
-          {-1.0f, -1.0f, +1.0f},
-          {-1.0f, -1.0f, +0.0f},
-          {-1.0f, -1.0f, -1.0f},
-          { 0.0f, -1.0f, +1.0f},
-          { 0.0f, -1.0f, +0.0f},
-          { 0.0f, +1.0f, +1.0f},
-          { 0.0f, +1.0f, +0.0f},
-          { 0.0f, +1.0f, -1.0f},
-          { 0.0f,  0.0f, +1.0f},
-          { 0.0f,  0.0f, -1.0f},
-          { 1.0f, +1.0f, +1.0f},
-          { 1.0f, +1.0f, +0.0f},
-          { 1.0f, +1.0f, -1.0f},
-          { 1.0f,  0.0f, +1.0f},
-          { 1.0f,  0.0f, +0.0f},
-          { 1.0f, -1.0f, +1.0f},
-          { 1.0f,  0.0f, -1.0f },
-          { 1.0f, -1.0f, -1.0f },
-          { 1.0f, -1.0f, +0.0f },
-          { 0.0f, -1.0f, -1.0f },
+          {-1,  1,  1},
+          {-1,  1,  0},
+          {-1,  1, -1},
+          {-1,  0,  1},
+          {-1,  0,  0},
+          {-1,  0, -1},
+          {-1, -1,  1},
+          {-1, -1,  0},
+          {-1, -1, -1},
+          { 0, -1,  1},
+          { 0, -1,  0},
+          { 0,  1,  1},
+          { 0,  1,  0},
+          { 0,  1, -1},
+          { 0,  0,  1},
+          { 0,  0, -1},
+          { 1,  1,  1},
+          { 1,  1,  0},
+          { 1,  1, -1},
+          { 1,  0,  1},
+          { 1,  0,  0},
+          { 1, -1,  1},
+          { 1,  0, -1},
+          { 1, -1, -1},
+          { 1, -1,  0},
+          { 0, -1, -1},
         };
 
    private final BandagedCreatorView mView;
    private final DistortedScreen mScreen;
    private final Static3D mScale;
    private final BandagedCubit[] mCubits;
-   private final Static4D mQuat1, mQuat2;
+   private final Static4D mQuatT, mQuatA;
    private float mScaleValue;
 
    private float mX, mY, mZ, mW;
-   private boolean mResetQuats, mSetQuat1;
+   private boolean mResetQuats, mSetQuatT;
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -87,13 +87,13 @@ public class BandagedCreatorRenderer implements GLSurfaceView.Renderer, Distorte
      {
      final float BRIGHTNESS = 0.333f;
 
-     mQuat1 = new Static4D(0,0,0,1);
-     mQuat2 = new Static4D(-0.25189602f,0.3546389f,0.009657208f,0.90038127f);
+     mQuatT = new Static4D(0,0,0,1);
+     mQuatA = new Static4D(-0.25189602f,0.3546389f,0.009657208f,0.90038127f);
 
      mView = v;
 
      mResetQuats = false;
-     mSetQuat1   = false;
+     mSetQuatT   = false;
 
      mScreen = new DistortedScreen();
      mScreen.glClearColor(BRIGHTNESS, BRIGHTNESS, BRIGHTNESS, 1.0f);
@@ -110,7 +110,7 @@ public class BandagedCreatorRenderer implements GLSurfaceView.Renderer, Distorte
 
      for(int c=0; c<len; c++)
        {
-       cubits[c] = new BandagedCubit(POSITIONS[c],mQuat1,mQuat2,mScale,COLOR_DEFAULT);
+       cubits[c] = new BandagedCubit(POSITIONS[c],mQuatT,mQuatA,mScale,COLOR_DEFAULT);
        }
 
      return cubits;
@@ -124,33 +124,33 @@ public class BandagedCreatorRenderer implements GLSurfaceView.Renderer, Distorte
      long time = System.currentTimeMillis();
      mScreen.render(time);
 
-     if( mSetQuat1 )
+     if( mSetQuatT )
        {
-       mSetQuat1 = false;
-       mQuat1.set(mX,mY,mZ,mW);
+       mSetQuatT = false;
+       mQuatT.set(mX,mY,mZ,mW);
        }
 
      if( mResetQuats )
        {
        mResetQuats = false;
 
-       float qx = mQuat1.get0();
-       float qy = mQuat1.get1();
-       float qz = mQuat1.get2();
-       float qw = mQuat1.get3();
+       float qx = mQuatT.get0();
+       float qy = mQuatT.get1();
+       float qz = mQuatT.get2();
+       float qw = mQuatT.get3();
 
-       float rx = mQuat2.get0();
-       float ry = mQuat2.get1();
-       float rz = mQuat2.get2();
-       float rw = mQuat2.get3();
+       float rx = mQuatA.get0();
+       float ry = mQuatA.get1();
+       float rz = mQuatA.get2();
+       float rw = mQuatA.get3();
 
        float tx = rw*qx - rz*qy + ry*qz + rx*qw;
        float ty = rw*qy + rz*qx + ry*qw - rx*qz;
        float tz = rw*qz + rz*qw - ry*qx + rx*qy;
        float tw = rw*qw - rz*qz - ry*qy - rx*qx;
 
-       mQuat1.set(0f, 0f, 0f, 1f);
-       mQuat2.set(tx, ty, tz, tw);
+       mQuatT.set(0f, 0f, 0f, 1f);
+       mQuatA.set(tx, ty, tz, tw);
        }
      }
 
@@ -248,27 +248,34 @@ public class BandagedCreatorRenderer implements GLSurfaceView.Renderer, Distorte
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-    public Static4D getQuat2()
-      {
-      return mQuat2;
-      }
+   public Static4D getQuatAccu()
+     {
+     return mQuatA;
+     }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-    public void setQuat1(float x, float y, float z, float w)
-      {
-      mX = x;
-      mY = y;
-      mZ = z;
-      mW = w;
+   public void setQuatTemp(float x, float y, float z, float w)
+     {
+     mX = x;
+     mY = y;
+     mZ = z;
+     mW = w;
 
-      mSetQuat1 = true;
-      }
+     mSetQuatT = true;
+     }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-    public void resetQuats()
-      {
-      mResetQuats = true;
-      }
+   public void resetQuats()
+     {
+     mResetQuats = true;
+     }
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+   public void reset()
+     {
+
+     }
 }
diff --git a/src/main/java/org/distorted/bandaged/BandagedCreatorScreen.java b/src/main/java/org/distorted/bandaged/BandagedCreatorScreen.java
index c2fc0ffc..f4fca105 100644
--- a/src/main/java/org/distorted/bandaged/BandagedCreatorScreen.java
+++ b/src/main/java/org/distorted/bandaged/BandagedCreatorScreen.java
@@ -90,7 +90,8 @@ public class BandagedCreatorScreen
       @Override
       public void onClick(View v)
         {
-
+        BandagedCreatorRenderer renderer = act.getRenderer();
+        renderer.reset();
         }
       });
     }
diff --git a/src/main/java/org/distorted/bandaged/BandagedCreatorView.java b/src/main/java/org/distorted/bandaged/BandagedCreatorView.java
index 0cf2caa5..14b3bc53 100644
--- a/src/main/java/org/distorted/bandaged/BandagedCreatorView.java
+++ b/src/main/java/org/distorted/bandaged/BandagedCreatorView.java
@@ -93,6 +93,13 @@ public class BandagedCreatorView extends GLSurfaceView
         }
       }
 
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+    public BandagedCreatorRenderer getRenderer()
+      {
+      return mRenderer;
+      }
+
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
     public void setScreenSize(int width, int height)
@@ -116,7 +123,7 @@ public class BandagedCreatorView extends GLSurfaceView
          case MotionEvent.ACTION_DOWN: float x1 = (x -  mScreenWidth*0.5f)/mScreenMin;
                                        float y1 = (mScreenHeight*0.5f - y)/mScreenMin;
 
-                                       int index = mTouchControl.cubitTouched(x1,y1,mRenderer.getQuat2() );
+                                       int index = mTouchControl.cubitTouched(x1,y1,mRenderer.getQuatAccu() );
 
                                        if( index<0 )
                                          {
@@ -162,7 +169,7 @@ public class BandagedCreatorView extends GLSurfaceView
                                            float cosA = (float)Math.cos(plen*3.14f/mScreenMin);
                                            float sinA = (float)Math.sqrt(1-cosA*cosA);
 
-                                           mRenderer.setQuat1(px*sinA, py*sinA, pz*sinA, cosA);
+                                           mRenderer.setQuatTemp(px*sinA, py*sinA, pz*sinA, cosA);
                                            }
                                          }
                                        if( (mX-x)*(mX-x) + (mY-y)*(mY-y) > mScreenMin*mScreenMin/(DIRECTION_SENSITIVITY*DIRECTION_SENSITIVITY) )