/ - Diff - Magic Cube - Distorted Android

« Previous | Next »

Revision 49595e4b

Added by Leszek Koltunski over 4 years ago

ID 49595e4b976c8e3dbbccd6830d5b68bcf3b789e3
Parent 6b6504fe
Child b4143852

Fix for one bug seen in Firebase and additional debugging for another.

src/main/java/org/distorted/main/RubikSurfaceView.java
389	389	mInitDistance = distNow;
390	390
391	391	RubikObject object = mPreRender.getObject();
392		object.setObjectRatio(distQuot);
	392	if( object!=null ) object.setObjectRatio(distQuot);
393	393	}
394	394	else
395	395	{

     import android.graphics.Canvas;
     import android.graphics.Paint;
     import com.google.firebase.crashlytics.FirebaseCrashlytics;
     import org.distorted.library.effect.VertexEffectDeform;
     import org.distorted.library.effect.VertexEffectMove;
     import org.distorted.library.effect.VertexEffectRotate;
-...
         StringBuilder objectString = new StringBuilder();
         int size = getSize();
         int len = size*size;
         int cubitIndex, row, col;
         int color;
         int cubitIndex=-1, row=-1, col=-1;
         int color=-1, face=-1;
         final int RIGHT= 0;
         final int LEFT = 1;
-...
         final char[] FACE_NAMES = { 'R', 'L', 'U', 'D', 'F', 'B'};
     /////////////////////
     // LIVE DEBUGGING
     /////////////////////
     try
+      {
     /////////////////////
         face = UP;
         for(int i=0; i<len; i++)
+          {
           row = i/size;
           col = i%size;
           cubitIndex = col<size-1 ? (size-1)*(size+4*col) + row : 6*size*size - 13*size + 8 + row;
           color = getCubitFaceColorIndex(cubitIndex,UP);
           color = getCubitFaceColorIndex(cubitIndex,face);
           objectString.append(FACE_NAMES[color]);
+          }
         face = RIGHT;
         for(int i=0; i<len; i++)
+          {
           cubitIndex = 6*size*size - 12*size +7 - i;
           color = getCubitFaceColorIndex(cubitIndex,RIGHT);
           color = getCubitFaceColorIndex(cubitIndex,face);
           objectString.append(FACE_NAMES[color]);
+          }
          face = FRONT;
         for(int i=0; i<len; i++)
+          {
           row = i/size;
-...
             else         cubitIndex = size*size + size-1 + 4*(col-1)*(size-1) + 2*(size-1-row);
+            }
           color = getCubitFaceColorIndex(cubitIndex,FRONT);
           color = getCubitFaceColorIndex(cubitIndex,face);
           objectString.append(FACE_NAMES[color]);
+          }
         face = DOWN;
         for(int i=0; i<len; i++)
+          {
           row = i/size;
           col = i%size;
           cubitIndex = col==0 ? size-1-row : size*size + size-1 + 4*(col-1)*(size-1) - row;
           color = getCubitFaceColorIndex(cubitIndex,DOWN);
           color = getCubitFaceColorIndex(cubitIndex,face);
           objectString.append(FACE_NAMES[color]);
+          }
         face = LEFT;
         for(int i=0; i<len; i++)
+          {
           row = i/size;
           col = i%size;
           cubitIndex = (size-1-row)*size + col;
           color = getCubitFaceColorIndex(cubitIndex,LEFT);
           color = getCubitFaceColorIndex(cubitIndex,face);
           objectString.append(FACE_NAMES[color]);
+          }
         face = BACK;
         for(int i=0; i<len; i++)
+          {
           row = i/size;
-...
             else              cubitIndex = size*size + 4*(size-2-col)*(size-1) + size + 2*(size-2-row);
+            }
           color = getCubitFaceColorIndex(cubitIndex,BACK);
           color = getCubitFaceColorIndex(cubitIndex,face);
           objectString.append(FACE_NAMES[color]);
+          }
     /////////////////////
+      }
     catch(java.lang.ArrayIndexOutOfBoundsException ex)
+      {
       FirebaseCrashlytics crashlytics = FirebaseCrashlytics.getInstance();
       String str="";
       for(int i=0; i<NUM_CUBITS; i++)
+        {
         str += (CUBITS[i].mQuatIndex+" ");
+        }
       crashlytics.setCustomKey("ObjectString", "color="+color+" cubitIndex="+cubitIndex+" face="+face+" row="+row+" col="+col );
       crashlytics.setCustomKey("Quaternion", "NUM_CUBITS: "+NUM_CUBITS+" quats: "+str );
       crashlytics.recordException(ex);
+      }
     /////////////////////
     // END LIVE DEBUGGING
     /////////////////////
         return objectString.toString();
+        }
+    }

Also available in: Unified diff

Project

General

Profile

Magic Cube

Revision 49595e4b

Added by Leszek Koltunski over 4 years ago