commit 35476762eb684eef9ccad1e5a68f70e5da8893a7
Author: Leszek Koltunski <leszek@koltunski.pl>
Date:   Sun Mar 1 00:52:50 2020 +0000

    Convert RubikCube to the new V&F center schema!

diff --git a/src/main/java/org/distorted/library/effectqueue/EffectQueue.java b/src/main/java/org/distorted/library/effectqueue/EffectQueue.java
index c4d304b..1fc1d2e 100644
--- a/src/main/java/org/distorted/library/effectqueue/EffectQueue.java
+++ b/src/main/java/org/distorted/library/effectqueue/EffectQueue.java
@@ -118,10 +118,10 @@ public abstract class EffectQueue implements InternalMaster.Slave
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-  public static void send( EffectQueue[] queues, int width, int height, float distance, float mipmap,
+  public static void send( EffectQueue[] queues, float distance, float mipmap,
                            float[] projection, float inflate, float halfW, float halfH, float halfZ, int variant )
     {
-    ((EffectQueueMatrix  )queues[0]).send(width, height, distance, mipmap, projection, halfW, halfH, halfZ, variant);
+    ((EffectQueueMatrix  )queues[0]).send(distance, mipmap, projection, halfW, halfH, halfZ, variant);
     ((EffectQueueVertex  )queues[1]).send(inflate, variant);
     ((EffectQueueFragment)queues[2]).send(variant);
     }
diff --git a/src/main/java/org/distorted/library/effectqueue/EffectQueueMatrix.java b/src/main/java/org/distorted/library/effectqueue/EffectQueueMatrix.java
index 44754df..6a91eb6 100644
--- a/src/main/java/org/distorted/library/effectqueue/EffectQueueMatrix.java
+++ b/src/main/java/org/distorted/library/effectqueue/EffectQueueMatrix.java
@@ -143,18 +143,14 @@ class EffectQueueMatrix extends EffectQueue
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-  void send(int width, int height, float distance, float mipmap, float[] projection, float halfX, float halfY, float halfZ, int variant)
+  void send(float distance, float mipmap, float[] projection, float halfX, float halfY, float halfZ, int variant)
     {
     Matrix.setIdentityM(mViewMatrix, 0);
-    //Matrix.translateM(mViewMatrix, 0, -width*0.5f, -height*0.5f, -distance);
-
     Matrix.translateM(mViewMatrix, 0, 0,0, -distance);
 
     if( mipmap!=1 ) Matrix.scaleM(mViewMatrix, 0, mipmap, mipmap, mipmap);
 
     for(int i=mNumEffects-1; i>=0; i--) ((MatrixEffect)mEffects[i]).apply(mViewMatrix,mUniforms,i);
-
-  //  Matrix.translateM(mViewMatrix, 0, halfX,halfY,halfZ);
     Matrix.multiplyMM(mMVPMatrix, 0, projection, 0, mViewMatrix, 0);
 
     GLES31.glUniform3f( mObjDH[variant] , halfX, halfY, halfZ);
diff --git a/src/main/java/org/distorted/library/effectqueue/EffectQueuePostprocess.java b/src/main/java/org/distorted/library/effectqueue/EffectQueuePostprocess.java
index 9c39a83..239d8fa 100644
--- a/src/main/java/org/distorted/library/effectqueue/EffectQueuePostprocess.java
+++ b/src/main/java/org/distorted/library/effectqueue/EffectQueuePostprocess.java
@@ -189,7 +189,7 @@ public class EffectQueuePostprocess extends EffectQueue
 
       float inflate=0.0f;
 
-      matrix.send(width, height, distance, mipmap, projection, halfW, halfH, halfZ, 2);
+      matrix.send(distance, mipmap, projection, halfW, halfH, halfZ, 2);
 
       if( mHalo!=0.0f )
         {
diff --git a/src/main/java/org/distorted/library/main/DistortedLibrary.java b/src/main/java/org/distorted/library/main/DistortedLibrary.java
index 0fb050d..986a20f 100644
--- a/src/main/java/org/distorted/library/main/DistortedLibrary.java
+++ b/src/main/java/org/distorted/library/main/DistortedLibrary.java
@@ -445,19 +445,17 @@ public class DistortedLibrary
     float halfY       = mesh.getStretchY() / 2.0f;
     float halfZ       = mesh.getStretchZ() / 2.0f;
     float inflate     = mesh.getInflate();
-    int width         = surface.mWidth;
-    int height        = surface.mHeight;
     float distance    = surface.mDistance;
     float mipmap      = surface.mMipmap;
     float[] projection= surface.mProjectionMatrix;
 
-    EffectQueue.send(queues, width, height, distance, mipmap, projection, inflate, halfX, halfY, halfZ, 1 );
+    EffectQueue.send(queues, distance, mipmap, projection, inflate, halfX, halfY, halfZ, 1 );
     GLES31.glDrawArrays(GLES31.GL_TRIANGLE_STRIP, 0, mesh.getNumVertices() );
 
     if( mesh.getShowNormals() )
       {
       DistortedLibrary.mMainProgram.useProgram();
-      EffectQueue.send(queues, width, height, distance, mipmap, projection, inflate, halfX, halfY, halfZ, 0 );
+      EffectQueue.send(queues, distance, mipmap, projection, inflate, halfX, halfY, halfZ, 0 );
       displayNormals(queues,mesh);
       }
     }
@@ -479,13 +477,11 @@ public class DistortedLibrary
     float halfY       = mesh.getStretchY() / 2.0f;
     float halfZ       = mesh.getStretchZ() / 2.0f;
     float inflate     = mesh.getInflate();
-    int width         = surface.mWidth;
-    int height        = surface.mHeight;
     float distance    = surface.mDistance;
     float mipmap      = surface.mMipmap;
     float[] projection= surface.mProjectionMatrix;
 
-    EffectQueue.send(queues, width, height, distance, mipmap, projection, inflate, halfX, halfY, halfZ, 0 );
+    EffectQueue.send(queues, distance, mipmap, projection, inflate, halfX, halfY, halfZ, 0 );
     GLES31.glDrawArrays(GLES31.GL_TRIANGLE_STRIP, 0, mesh.getNumVertices() );
 
     if( mesh.getShowNormals() ) displayNormals(queues,mesh);