commit 9f1f377d5981942025181fcbe45c026a8ae2033b
Author: Leszek Koltunski <leszek@koltunski.pl>
Date:   Wed Mar 11 23:22:07 2020 +0000

    Progress with object Movement.

diff --git a/src/main/java/org/distorted/object/RubikCubeMovement.java b/src/main/java/org/distorted/object/RubikCubeMovement.java
index 7ba9d599..590617c2 100644
--- a/src/main/java/org/distorted/object/RubikCubeMovement.java
+++ b/src/main/java/org/distorted/object/RubikCubeMovement.java
@@ -56,10 +56,10 @@ class RubikCubeMovement extends RubikObjectMovement
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-  float fillUpRotationVectAndOffset(float[] v, int[] possible)
+  float fillUpRotationVectAndOffset(float[] v, float[] touch, int[] possible)
     {
     mRotationVect = isVertical(v[possible[0]],v[possible[1]]) ? possible[0] : possible[1];
-    return mTouch[mRotationVect]+0.5f;
+    return touch[mRotationVect]+0.5f;
     }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/main/java/org/distorted/object/RubikObjectMovement.java b/src/main/java/org/distorted/object/RubikObjectMovement.java
index a6d26b7e..9fc16125 100644
--- a/src/main/java/org/distorted/object/RubikObjectMovement.java
+++ b/src/main/java/org/distorted/object/RubikObjectMovement.java
@@ -27,10 +27,9 @@ import org.distorted.library.type.Static4D;
 
 public abstract class RubikObjectMovement
   {
-  float[] mTouch;
   int mRotationVect, mLastTouchedAxis;
 
-  private float[] mPoint, mCamera, mDiff, m2Dpoint;
+  private float[] mPoint, mCamera, mDiff, mTouch, m2Dpoint;
   private int mLastTouchedLR;
   private int mNumAxis, mNumFacesPerAxis;
   private int[] mPossible;
@@ -40,7 +39,7 @@ public abstract class RubikObjectMovement
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
   abstract boolean isInsideFace(float[] point);
-  abstract float fillUpRotationVectAndOffset(float[] vect, int[] possible);
+  abstract float fillUpRotationVectAndOffset(float[] vect, float[] touch, int[] possible);
   abstract float returnAngle(float[] vect, int[] possible);
   abstract void fillPossibleRotations(int axis, int[] output);
 
@@ -208,7 +207,7 @@ public abstract class RubikObjectMovement
     mDiff[1] -= mTouch[1];
     mDiff[2] -= mTouch[2];
 
-    float offset = fillUpRotationVectAndOffset(mDiff, mPossible);
+    float offset = fillUpRotationVectAndOffset(mDiff, mTouch, mPossible);
     return new Static2D(mRotationVect,offset);
     }
 
diff --git a/src/main/java/org/distorted/object/RubikPyraminxMovement.java b/src/main/java/org/distorted/object/RubikPyraminxMovement.java
index cf263846..84db0b2c 100644
--- a/src/main/java/org/distorted/object/RubikPyraminxMovement.java
+++ b/src/main/java/org/distorted/object/RubikPyraminxMovement.java
@@ -51,7 +51,6 @@ class RubikPyraminxMovement extends RubikObjectMovement
     }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-// TODO
 
   boolean isInsideFace(float[] p)
     {
@@ -65,7 +64,7 @@ class RubikPyraminxMovement extends RubikObjectMovement
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // TODO
 
-  float fillUpRotationVectAndOffset(float[] v, int[] possible)
+  float fillUpRotationVectAndOffset(float[] v, float[] touch, int[] possible)
     {
     //mRotationVect = isVertical(v[possible[0]],v[possible[1]]) ? possible[0] : possible[1];
     //return mTouch[mRotationVect]+0.5f;