/ - Diff - Magic Cube - Distorted Android

         return 0.5f;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       int getFaceColor(int cubit, int cubitface, int size)
+        {
         boolean belongs = isOnFace(cubit, cubitface/2, cubitface%2==0 ? size-1:0 );
         return belongs ? cubitface : NUM_FACES;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       MeshBase createCubitMesh(int cubit)

                new Static3D(-0.5f, 0.0f,-0.5f )
              };
       private static final int[] mFaceMap = {2,4, 4,0, 3,4, 4,1,
 ,2, 0,3, 1,3, 1,2,
 ,5, 5,0, 3,5, 5,1 };
       private static MeshBase mMesh;
     ///////////////////////////////////////////////////////////////////////////////////////////////////
-...
         return mesh;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       int getFaceColor(int cubit, int cubitface, int size)
+        {
         switch(cubitface)
+          {
           case 0 : return mFaceMap[2*cubit];
           case 1 : return mFaceMap[2*cubit+1];
           default: return NUM_FACES;
+          }
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       void createFaceTexture(Canvas canvas, Paint paint, int face, int left, int top, int side)

         return ((1<<cubitRow)&rowBitmap)!=0;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     // we cannot use belongsToRotation for deciding if to texture a face. Counterexample: the 'rotated'
     // tetrahedrons of Pyraminx nearby the edge: they belong to rotation but their face which is rotated
     // away from the face of the Pyraminx shouldn't be textured.
       private boolean isOnFace( int cubit, int axis, int row)
+        {
         final float MAX_ERROR = 0.0001f;
         float diff = mCubits[cubit].mRotationRow[axis] - row;
         return diff*diff < MAX_ERROR;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     // note the minus in front of the sin() - we rotate counterclockwise
     // when looking towards the direction where the axis increases in values.
-...
+          }
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     // we cannot use belongsToRotation for deciding if to texture a face. Counterexample: the 'rotated'
     // tetrahedrons of Pyraminx nearby the edge: they belong to rotation but their face which is rotated
     // away from the face of the Pyraminx shouldn't be textured.
       boolean isOnFace( int cubit, int axis, int row)
+        {
         final float MAX_ERROR = 0.0001f;
         float diff = mCubits[cubit].mRotationRow[axis] - row;
         return diff*diff < MAX_ERROR;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       int getCubitFaceColorIndex(int cubit, int face)
-...
       public void resetAllTextureMaps()
+        {
         boolean belongs;
         final float ratio = 1.0f/(NUM_FACES+1);
         if( 3*ROTATION_AXIS.length == 2*NUM_FACES ) // Dino
+          {
           final Static4D[] maps = new Static4D[NUM_CUBITS*NUM_CUBIT_FACES];
           final int[] map = {2,4, 4,0, 3,4, 4,1,
 ,2, 0,3, 1,3, 1,2,
 ,5, 5,0, 3,5, 5,1 };
           for(int i=0; i<NUM_CUBITS; i++)
+            {
             maps[NUM_CUBIT_FACES*i    ] = new Static4D( map[2*i  ]*ratio, 0.0f, ratio, 1.0f);
             maps[NUM_CUBIT_FACES*i + 1] = new Static4D( map[2*i+1]*ratio, 0.0f, ratio, 1.0f);
             maps[NUM_CUBIT_FACES*i + 2] = new Static4D( NUM_FACES *ratio, 0.0f, ratio, 1.0f);
             maps[NUM_CUBIT_FACES*i + 3] = new Static4D( NUM_FACES *ratio, 0.0f, ratio, 1.0f);
+            }
           mMesh.setTextureMap(maps,0);
           return;
+          }
         int color;
         for(int cubit=0; cubit<NUM_CUBITS; cubit++)
+          {
           final Static4D[] maps = new Static4D[NUM_CUBIT_FACES];
           if( 2*ROTATION_AXIS.length == NUM_FACES )  // i.e. there are faces on both ends of the axis (cube)
+            {
             for(int i=0; i<NUM_CUBIT_FACES; i++)
+              {
               belongs = isOnFace(cubit, i/2, i%2==0 ? mSize-1:0 );
               maps[i] = new Static4D( (belongs?i:NUM_FACES)*ratio, 0.0f, ratio, 1.0f);
+              }
+            }
           else if( ROTATION_AXIS.length == NUM_FACES )  // just a single face on the right end of an axis (pyraminx)
           for(int cubitface=0; cubitface<NUM_CUBIT_FACES; cubitface++)
+            {
             for(int i=0; i<NUM_CUBIT_FACES; i++)
+              {
               belongs = isOnFace(cubit, i, 0 );
               maps[i] = new Static4D( (belongs?i:NUM_FACES)*ratio, 0.0f, ratio, 1.0f);
+              }
             color = getFaceColor(cubit,cubitface,mSize);
             maps[cubitface] = new Static4D( color*ratio, 0.0f, ratio, 1.0f);
+            }
           mMesh.setTextureMap(maps,NUM_CUBIT_FACES*cubit);
-...
       abstract int getNumCubitFaces();
       abstract MeshBase createCubitMesh(int cubit);
       abstract void createFaceTexture(Canvas canvas, Paint paint, int face, int left, int top, int side);
       abstract int getFaceColor(int cubit, int cubitface, int size);
       public abstract Static3D[] getRotationAxis();
       public abstract int getBasicAngle();
       public abstract float returnMultiplier();

         return 0.82f;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       int getFaceColor(int cubit, int cubitface, int size)
+        {
         boolean belongs = isOnFace(cubit, cubitface, 0 );
         return belongs ? cubitface : NUM_FACES;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       private MeshBase createStaticMesh(int cubit)

Project

General

Profile

Magic Cube

Revision f6d06256

Added by Leszek Koltunski over 3 years ago