commit c4175d85c011f9fa7ed042744878ef339ff611d5
Author: Leszek Koltunski <leszek@koltunski.pl>
Date:   Fri Oct 1 22:33:06 2021 +0200

    Simplify TwistyObject's API.

diff --git a/src/main/java/org/distorted/main/RubikActivity.java b/src/main/java/org/distorted/main/RubikActivity.java
index 7ce62efd..270fc7ec 100644
--- a/src/main/java/org/distorted/main/RubikActivity.java
+++ b/src/main/java/org/distorted/main/RubikActivity.java
@@ -468,7 +468,7 @@ public class RubikActivity extends TwistyActivity
 
         if( oldObject!=null )
           {
-          ObjectType oldList = oldObject.getObjectList();
+          ObjectType oldList = oldObject.getObjectType();
           float fps = view.getRenderer().getFPS();
           fps = (int)(fps+0.5f);
           StringBuilder name = new StringBuilder();
diff --git a/src/main/java/org/distorted/main/RubikPreRender.java b/src/main/java/org/distorted/main/RubikPreRender.java
index a8981856..ad894339 100644
--- a/src/main/java/org/distorted/main/RubikPreRender.java
+++ b/src/main/java/org/distorted/main/RubikPreRender.java
@@ -246,7 +246,7 @@ public class RubikPreRender implements EffectController, TwistyPreRender
     {
     mChangeObject = false;
 
-    if ( mNewObject==null || mNewObject.getObjectList()!=mNextObject )
+    if ( mNewObject==null || mNewObject.getObjectType()!=mNextObject )
       {
       blockEverything(BlockController.RUBIK_PLACE_1);
       createObjectNow(mNextObject, null);
@@ -260,7 +260,7 @@ public class RubikPreRender implements EffectController, TwistyPreRender
     {
     mSetupObject = false;
 
-    if ( mNewObject==null || mNewObject.getObjectList()!=mNextObject)
+    if ( mNewObject==null || mNewObject.getObjectType()!=mNextObject)
       {
       blockEverything(BlockController.RUBIK_PLACE_2);
       createObjectNow(mNextObject, mNextMoves);
@@ -322,7 +322,6 @@ public class RubikPreRender implements EffectController, TwistyPreRender
   private void resetAllTextureMapsNow()
     {
     mResetAllTextureMaps = false;
-
     if( mNewObject!=null ) mNewObject.resetAllTextureMaps();
     }
 
diff --git a/src/main/java/org/distorted/main/RubikSurfaceView.java b/src/main/java/org/distorted/main/RubikSurfaceView.java
index e3d12547..ac73d640 100644
--- a/src/main/java/org/distorted/main/RubikSurfaceView.java
+++ b/src/main/java/org/distorted/main/RubikSurfaceView.java
@@ -257,7 +257,7 @@ public class RubikSurfaceView extends GLSurfaceView
               int color = solver.getCurrentColor();
               mLastCubit = object.getCubit(point);
               mPreRender.setTextureMap( mLastCubit, mLastCubitFace, color );
-              mLastCubitColor = SolverMain.cubitIsLocked(object.getObjectList(), mLastCubit);
+              mLastCubitColor = SolverMain.cubitIsLocked(object.getObjectType(), mLastCubit);
               }
             }
           }
diff --git a/src/main/java/org/distorted/solvers/SolverMain.java b/src/main/java/org/distorted/solvers/SolverMain.java
index 2c13fc66..6cff8bac 100644
--- a/src/main/java/org/distorted/solvers/SolverMain.java
+++ b/src/main/java/org/distorted/solvers/SolverMain.java
@@ -248,7 +248,7 @@ public class SolverMain implements Runnable
     {
     RubikScreenSolver solver = (RubikScreenSolver) ScreenList.SVER.getScreenClass();
 
-    if( mObject.getObjectList()== ObjectType.CUBE_3 )
+    if( mObject.getObjectType()== ObjectType.CUBE_3 )
       {
       solveCube3(solver);
       }
diff --git a/src/main/java/org/distorted/tutorials/TutorialPreRender.java b/src/main/java/org/distorted/tutorials/TutorialPreRender.java
index 58385cfd..21bad76b 100644
--- a/src/main/java/org/distorted/tutorials/TutorialPreRender.java
+++ b/src/main/java/org/distorted/tutorials/TutorialPreRender.java
@@ -39,7 +39,7 @@ public class TutorialPreRender implements EffectController, TwistyPreRender
   private final TutorialSurfaceView mView;
   private boolean mFinishRotation, mRemoveRotation, mAddRotation,
                   mSetQuat, mChangeObject, mSetupObject, mSolveObject, mScrambleObject,
-                  mInitializeObject, mResetAllTextureMaps, mRemovePatternRotation, mSolve;
+                  mInitializeObject, mRemovePatternRotation, mSolve;
   private boolean mUIBlocked, mTouchBlocked;
   private boolean mIsSolved;
   private ObjectType mNextObject;
@@ -187,7 +187,7 @@ public class TutorialPreRender implements EffectController, TwistyPreRender
     {
     mChangeObject = false;
 
-    if ( mNewObject==null || mNewObject.getObjectList()!=mNextObject)
+    if ( mNewObject==null || mNewObject.getObjectType()!=mNextObject)
       {
       blockEverything(BlockController.TUTORIAL_PLACE_1);
       createObjectNow(mNextObject);
@@ -201,7 +201,7 @@ public class TutorialPreRender implements EffectController, TwistyPreRender
     {
     mSetupObject = false;
 
-    if ( mNewObject==null || mNewObject.getObjectList()!=mNextObject)
+    if ( mNewObject==null || mNewObject.getObjectType()!=mNextObject)
       {
       blockEverything(BlockController.TUTORIAL_PLACE_2);
       createObjectNow(mNextObject);
@@ -248,15 +248,6 @@ public class TutorialPreRender implements EffectController, TwistyPreRender
     mNewObject.initializeObject(null);
     }
 
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-  private void resetAllTextureMapsNow()
-    {
-    mResetAllTextureMaps = false;
-
-    if( mNewObject!=null ) mNewObject.resetAllTextureMaps();
-    }
-
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
   private void setQuatNow()
@@ -312,7 +303,6 @@ public class TutorialPreRender implements EffectController, TwistyPreRender
     if( mScrambleObject        ) scrambleObjectNow();
     if( mAddRotation           ) addRotationNow();
     if( mInitializeObject      ) initializeObjectNow();
-    if( mResetAllTextureMaps   ) resetAllTextureMapsNow();
     if( mRemovePatternRotation ) removePatternRotationNow();
     }