commit bebd7af5e6f595e479f272c9930ba4d7179a0d35
Author: Leszek Koltunski <leszek@koltunski.pl>
Date:   Mon Mar 21 14:36:44 2022 +0100

    Cleanups.

diff --git a/src/main/java/org/distorted/bandaged/BandagedCreatorActivity.java b/src/main/java/org/distorted/bandaged/BandagedCreatorActivity.java
index b4906e62..8b9b8894 100644
--- a/src/main/java/org/distorted/bandaged/BandagedCreatorActivity.java
+++ b/src/main/java/org/distorted/bandaged/BandagedCreatorActivity.java
@@ -35,11 +35,6 @@ import org.distorted.dialogs.RubikDialogError;
 import org.distorted.library.main.DistortedLibrary;
 import org.distorted.main.R;
 import org.distorted.main.RubikActivity;
-import org.distorted.objectlib.main.ObjectControl;
-import org.distorted.objects.RubikObject;
-import org.distorted.objects.RubikObjectList;
-
-import java.io.InputStream;
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -62,7 +57,6 @@ public class BandagedCreatorActivity extends AppCompatActivity
     private static int mScreenWidth, mScreenHeight;
     private int mCurrentApiVersion;
     private BandagedCreatorScreen mScreen;
-    private int mObjectOrdinal;
     private int mHeightBar;
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -190,7 +184,7 @@ public class BandagedCreatorActivity extends AppCompatActivity
       view.onResume();
 
       if( mScreen==null ) mScreen = new BandagedCreatorScreen();
-      mScreen.onAttachedToWindow(this,mObjectOrdinal);
+      mScreen.onAttachedToWindow(this);
       }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -210,31 +204,8 @@ public class BandagedCreatorActivity extends AppCompatActivity
       errDiag.show(getSupportFragmentManager(), null);
       }
 
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-    private void changeIfDifferent(RubikObject object,int ordinal,ObjectControl control)
-      {
-      if( object!=null )
-        {
-        int meshState          = object.getMeshState();
-        InputStream jsonStream = object.getObjectStream(this);
-        InputStream meshStream = object.getMeshStream(this);
-        String name            = object.getUpperName();
-
-        control.changeIfDifferent(ordinal,name,meshState,jsonStream,meshStream);
-        }
-      }
-
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // PUBLIC API
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-    public void changeObject(int ordinal)
-      {
-      mObjectOrdinal = ordinal;
-
-      }
-
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
     public FirebaseAnalytics getAnalytics()
diff --git a/src/main/java/org/distorted/bandaged/BandagedCreatorScreen.java b/src/main/java/org/distorted/bandaged/BandagedCreatorScreen.java
index c88ac69e..c2fc0ffc 100644
--- a/src/main/java/org/distorted/bandaged/BandagedCreatorScreen.java
+++ b/src/main/java/org/distorted/bandaged/BandagedCreatorScreen.java
@@ -31,7 +31,6 @@ import org.distorted.main.RubikActivity;
 public class BandagedCreatorScreen
 {
   private TransparentImageButton mBackButton, mResetButton, mDoneButton;
-  private int mObjectOrdinal;
   private int mBarHeight;
   private float mButtonSize;
 
@@ -98,14 +97,12 @@ public class BandagedCreatorScreen
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-  void onAttachedToWindow(final BandagedCreatorActivity act, final int objectOrdinal)
+  void onAttachedToWindow(final BandagedCreatorActivity act)
     {
     int width = act.getScreenWidthInPixels();
     mBarHeight = act.getHeightBar();
     mButtonSize = width*RubikActivity.BUTTON_TEXT_SIZE;
 
-    mObjectOrdinal = objectOrdinal;
-
     LinearLayout.LayoutParams paramsL = new LinearLayout.LayoutParams(width/4, LinearLayout.LayoutParams.MATCH_PARENT);
     LinearLayout.LayoutParams paramsM = new LinearLayout.LayoutParams(width/2, LinearLayout.LayoutParams.MATCH_PARENT);
     LinearLayout.LayoutParams paramsR = new LinearLayout.LayoutParams(width/4, LinearLayout.LayoutParams.MATCH_PARENT);
diff --git a/src/main/java/org/distorted/bandaged/BandagedCreatorView.java b/src/main/java/org/distorted/bandaged/BandagedCreatorView.java
index b7234b02..eacfd767 100644
--- a/src/main/java/org/distorted/bandaged/BandagedCreatorView.java
+++ b/src/main/java/org/distorted/bandaged/BandagedCreatorView.java
@@ -81,13 +81,6 @@ public class BandagedCreatorView extends GLSurfaceView
         }
       }
 
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-    public BandagedCreatorRenderer getRenderer()
-      {
-      return mRenderer;
-      }
-
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
     private void resetQuats()
@@ -160,6 +153,5 @@ public class BandagedCreatorView extends GLSurfaceView
 
       return true;
       }
-
 }
 
diff --git a/src/main/java/org/distorted/bandaged/BandagedCubit.java b/src/main/java/org/distorted/bandaged/BandagedCubit.java
index 63e98860..2d52f8e7 100644
--- a/src/main/java/org/distorted/bandaged/BandagedCubit.java
+++ b/src/main/java/org/distorted/bandaged/BandagedCubit.java
@@ -29,6 +29,11 @@ import org.distorted.library.mesh.MeshBase;
 import org.distorted.library.type.Static3D;
 import org.distorted.library.type.Static4D;
 import org.distorted.objectlib.helpers.FactoryBandaged3x3Cubit;
+import org.distorted.objectlib.helpers.FactoryCubit;
+import org.distorted.objectlib.helpers.ObjectFaceShape;
+import org.distorted.objectlib.helpers.ObjectShape;
+
+import static org.distorted.objectlib.main.TwistyObject.MESH_NICE;
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/main/java/org/distorted/config/ConfigRenderer.java b/src/main/java/org/distorted/config/ConfigRenderer.java
index b6a42d09..f1236fc3 100644
--- a/src/main/java/org/distorted/config/ConfigRenderer.java
+++ b/src/main/java/org/distorted/config/ConfigRenderer.java
@@ -68,15 +68,6 @@ public class ConfigRenderer implements GLSurfaceView.Renderer, DistortedLibrary.
       {
       mScreen.resize(width,height);
       mView.setScreenSize(width,height);
-      /*
-      int debugWidth = (int)(0.2f*width);
-      int debugHeight= (int)(0.5*debugWidth);
-      int gap        = (int)(width*PADDING_RATIO);
-      int textColor  = 0xffffffff;
-      int backColor  = 0xff333333;
-
-      mScreen.showFPS(debugWidth,debugHeight,gap,textColor,backColor);
-      */
       }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////