commit 74686c7117d0e0f9d85366f5689e88d96b73800a
Author: Leszek Koltunski <leszek@koltunski.pl>
Date:   Fri Feb 21 11:24:40 2020 +0000

    Small improvement.

diff --git a/src/main/java/org/distorted/magic/RubikRenderer.java b/src/main/java/org/distorted/magic/RubikRenderer.java
index a69ac598..68f2ec5a 100644
--- a/src/main/java/org/distorted/magic/RubikRenderer.java
+++ b/src/main/java/org/distorted/magic/RubikRenderer.java
@@ -24,11 +24,8 @@ import android.opengl.GLSurfaceView;
 
 import org.distorted.effect.BaseEffect;
 import org.distorted.library.effect.VertexEffectSink;
-import org.distorted.library.main.DistortedEffects;
 import org.distorted.library.main.DistortedLibrary;
 import org.distorted.library.main.DistortedScreen;
-import org.distorted.library.main.DistortedTexture;
-import org.distorted.library.mesh.MeshFlat;
 import org.distorted.library.message.EffectListener;
 import org.distorted.object.RubikObject;
 import org.distorted.object.RubikObjectList;
@@ -57,7 +54,6 @@ public class RubikRenderer implements GLSurfaceView.Renderer, EffectListener
     private boolean mIsSolved;
     private RubikObject mOldObject, mNewObject;
     private int mScreenWidth, mScreenHeight;
-    private MeshFlat mMesh;
     private SharedPreferences mPreferences;
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -86,8 +82,6 @@ public class RubikRenderer implements GLSurfaceView.Renderer, EffectListener
       mCanUI       = true;
 
       mEffectID = new long[BaseEffect.Type.LENGTH];
-
-      mMesh= new MeshFlat(20,20);
       }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -99,10 +93,7 @@ public class RubikRenderer implements GLSurfaceView.Renderer, EffectListener
      if( mOldObject!=null ) mOldObject.releaseResources();
      mOldObject = mNewObject;
 
-     DistortedTexture texture = new DistortedTexture(TEXTURE_SIZE,TEXTURE_SIZE);
-     DistortedEffects effects = new DistortedEffects();
-
-     mNewObject = object.create(mView.getQuatCurrent(), mView.getQuatAccumulated(), texture, mMesh, effects);
+     mNewObject = object.create(mView.getQuatCurrent(), mView.getQuatAccumulated());
      mNewObject.createTexture();
      mView.setMovement(object.getObjectMovementClass());
 
diff --git a/src/main/java/org/distorted/object/RubikCubeMovement.java b/src/main/java/org/distorted/object/RubikCubeMovement.java
index 019e3f28..926205d2 100644
--- a/src/main/java/org/distorted/object/RubikCubeMovement.java
+++ b/src/main/java/org/distorted/object/RubikCubeMovement.java
@@ -67,7 +67,7 @@ class RubikCubeMovement extends RubikObjectMovement
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // retFace{X,Y,Z}axis: 3 functions which return which real AXIS gets mapped to which when we look
 // directly at a given face. For example, when we look at the RIGHT face of the cube (with TOP still
-// in the top) then the 'real' X axis becomes the 'Z' axis, thus retFaceZaxis(RIGHT) = VECTX.
+// in the top) then the 'real' X axis becomes the 'Z' axis, thus retFaceXaxis(RIGHT) = VECTZ.
 
     private int retFaceXaxis(int face)
       {
diff --git a/src/main/java/org/distorted/object/RubikObject.java b/src/main/java/org/distorted/object/RubikObject.java
index 106b0057..87106e5b 100644
--- a/src/main/java/org/distorted/object/RubikObject.java
+++ b/src/main/java/org/distorted/object/RubikObject.java
@@ -181,10 +181,12 @@ public abstract class RubikObject extends DistortedNode
   public abstract long finishRotationNow(EffectListener listener);
   public abstract void removeRotationNow();
 
-  public abstract void releaseResources();
-  public abstract void createTexture();
   public abstract void apply(Effect effect, int position);
   public abstract void remove(long effectID);
+
+  public abstract void releaseResources();
+  public abstract void createTexture();
+
   public abstract void solve();
   public abstract boolean isSolved();
   }
diff --git a/src/main/java/org/distorted/object/RubikObjectList.java b/src/main/java/org/distorted/object/RubikObjectList.java
index fec751d6..65404a15 100644
--- a/src/main/java/org/distorted/object/RubikObjectList.java
+++ b/src/main/java/org/distorted/object/RubikObjectList.java
@@ -25,6 +25,8 @@ import org.distorted.library.mesh.MeshFlat;
 import org.distorted.library.type.Static4D;
 import org.distorted.magic.R;
 
+import static org.distorted.magic.RubikRenderer.TEXTURE_SIZE;
+
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 public enum RubikObjectList
@@ -82,13 +84,19 @@ public enum RubikObjectList
     }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
+// TODO - currently all objects in the list are RubikCubes of various sizes
 
-  public RubikObject create(Static4D quatCur, Static4D quatAcc, DistortedTexture texture, MeshFlat mesh, DistortedEffects effects)
+  public RubikObject create(Static4D quatCur, Static4D quatAcc)
     {
+    DistortedTexture texture = new DistortedTexture(TEXTURE_SIZE,TEXTURE_SIZE);
+    DistortedEffects effects = new DistortedEffects();
+    MeshFlat mesh= new MeshFlat(20,20);
+
     return new RubikCube(mObjectSize, quatCur, quatAcc, texture, mesh, effects);
     }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
+// TODO - currently all objects in the list are RubikCubes of various sizes
 
   public RubikObjectMovement getObjectMovementClass()
     {
