/ - Diff - Magic Cube - Distorted Android

« Previous | Next »

Revision 5e254115

auto-compute the bandaged status from dimension of the CENTERS. Make 'computeBitmapFromRow' generic for bandageed and not bandaged objects.

         return reaches ? stickerIndex*NUM_FACES + face : NUM_STICKERS*NUM_FACES;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     // this implements the fact that certain cubits have multiple 'centers' and this means the cubit
     // might span more than one layer along a given axis - i.e. that this is a bandaged puzzle.
       int computeBitmapFromRow(int rowBitmap, int axis)
+        {
         int bitmap, initBitmap=0;
         while( initBitmap!=rowBitmap )
+          {
           initBitmap = rowBitmap;
           for(int cubit=0; cubit<NUM_CUBITS; cubit++)
+            {
             bitmap = CUBITS[cubit].mRotationRow[axis];
             if( (rowBitmap & bitmap) != 0 ) rowBitmap |= bitmap;
+            }
+          }
         return rowBitmap;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       float returnMultiplier()

       private final DistortedTexture mTexture;
       private final float mInitScreenRatio;
       private final int mSolvedFunctionIndex;
       private final boolean mIsBandaged;
       private float mObjectScreenRatio;
       private int[][] mSolvedQuats;
       private int[][] mQuatMult;
-...
         NUM_TEXTURES = getNumStickerTypes(mNumLayers)*NUM_FACES;
         NUM_AXIS = mAxis.length;
         boolean bandaged=false;
         for(int c=0; c<NUM_CUBITS; c++)
+          {
           if( mOrigPos[c].length>3 )
+            {
             bandaged=true;
             break;
+            }
+          }
         mIsBandaged = bandaged;
         mQuatDebug = new int[NUM_CUBITS];
         if( mObjectScreenRatio>MAX_SIZE_CHANGE) mObjectScreenRatio = MAX_SIZE_CHANGE;
-...
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     // normal, not bandaged, object.
       int computeBitmapFromRow(int rowBitmap, int axis)
+        {
         if( mIsBandaged )
+          {
           int bitmap, initBitmap=0;
           while( initBitmap!=rowBitmap )
+            {
             initBitmap = rowBitmap;
             for(int cubit=0; cubit<NUM_CUBITS; cubit++)
+              {
               bitmap = CUBITS[cubit].mRotationRow[axis];
               if( (rowBitmap & bitmap) != 0 ) rowBitmap |= bitmap;
+              }
+            }
+          }
         return rowBitmap;
+        }

         return mStickerType[variant][cubitface]*FACE_COLORS.length + mStickerColor[cubit][cubitface];
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     // this implements the fact that corner cubits have multiple 'centers' and this means the cubit
     // might span more than one layer along a given axis - i.e. that this is a bandaged puzzle.
       int computeBitmapFromRow(int rowBitmap, int axis)
+        {
         int bitmap, initBitmap=0;
         while( initBitmap!=rowBitmap )
+          {
           initBitmap = rowBitmap;
           for(int cubit=0; cubit<NUM_CUBITS; cubit++)
+            {
             bitmap = CUBITS[cubit].mRotationRow[axis];
             if( (rowBitmap & bitmap) != 0 ) rowBitmap |= bitmap;
+            }
+          }
         return rowBitmap;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       private boolean cornerIsUp(int index)

Also available in: Unified diff