/ - Diff - Magic Cube - Distorted Android

« Previous | Next »

Revision 5da517d3

Added by Leszek Koltunski about 3 years ago

ID 5da517d3a2b7e10b2971ce73c45cbfeaa44230f2
Parent da178c88
Child e782e026

Minor

                COLOR_GREEN , COLOR_GREY
              };
       private static final float DIST = 0.50f;
       private static final int FACES_PER_CUBIT =8;
       private ScrambleState[] mStates;
-...
         else
+          {
           float[][] cuts = new float[4][numLayers-1];
           float dist = SQ6*0.666f*DIST;
           float dist = SQ6/3;
           float cut  = 0.5f*dist*(2-numLayers);
           for(int i=0; i<numLayers-1; i++)
-...
       private int createOctaPositions(float[][] centers, int index, int layers, float height)
+        {
         float x = DIST*(layers-1);
         float z = DIST*(layers+1);
         float x = (layers-1)*0.5f;
         float z = (layers+1)*0.5f;
         for(int i=0; i<layers; i++, index++)
+          {
           z -= 2*DIST;
           z -= 1;
           centers[index][0] = x;
           centers[index][1] = height;
           centers[index][2] = z;
-...
         for(int i=0; i<layers-1; i++, index++)
+          {
           x -= 2*DIST;
           x -= 1;
           centers[index][0] = x;
           centers[index][1] = height;
           centers[index][2] = z;
-...
         for(int i=0; i<layers-1; i++, index++)
+          {
           z += 2*DIST;
           z += 1;
           centers[index][0] = x;
           centers[index][1] = height;
           centers[index][2] = z;
-...
         for(int i=0; i<layers-2; i++, index++)
+          {
           x += 2*DIST;
           x += 1;
           centers[index][0] = x;
           centers[index][1] = height;
           centers[index][2] = z;
-...
       private int createTetraPositions(float[][] centers, int index, int layers, float height)
+        {
         float x = DIST*(layers-1);
         float z = DIST*layers;
         float x = (layers-1)*0.5f;
         float z =  layers*0.5f;
         for(int i=0; i<layers-1; i++, index++)
+          {
           z -= 2*DIST;
           z -= 1;
           centers[index][0] = x;
           centers[index][1] = height;
           centers[index][2] = z;
+          }
         x += DIST;
         z -= DIST;
         x += 0.5f;
         z -= 0.5f;
         for(int i=0; i<layers-1; i++, index++)
+          {
           x -= 2*DIST;
           x -= 1;
           centers[index][0] = x;
           centers[index][1] = height;
           centers[index][2] = z;
+          }
         x -= DIST;
         z -= DIST;
         x -= 0.5f;
         z -= 0.5f;
         for(int i=0; i<layers-1; i++, index++)
+          {
           z += 2*DIST;
           z += 1;
           centers[index][0] = x;
           centers[index][1] = height;
           centers[index][2] = z;
+          }
         x -= DIST;
         z += DIST;
         x -= 0.5f;
         z += 0.5f;
         for(int i=0; i<layers-1; i++, index++)
+          {
           x += 2*DIST;
           x += 1;
           centers[index][0] = x;
           centers[index][1] = height;
           centers[index][2] = z;
-...
         for(int i=layers-1; i>0; i--)
+          {
           height += SQ2*DIST;
           height += SQ2/2;
           index = createOctaPositions(CENTERS,index,i,+height);
           index = createOctaPositions(CENTERS,index,i,-height);
+          }
         height = DIST*SQ2/2;
         height = SQ2/4;
         for(int i=layers; i>1; i--)
+          {
           index = createTetraPositions(CENTERS,index,i,+height);
           index = createTetraPositions(CENTERS,index,i,-height);
           height += SQ2*DIST;
           height += SQ2/2;
+          }
         return CENTERS;

     ///////////////////////////////////////////////////////////////////////////////////////////////////
       float[][] getCuts(int size)
       float[][] getCuts(int numLayers)
+        {
         float[][] cuts = new float[4][size-1];
         float[][] cuts = new float[4][numLayers-1];
         for(int i=0; i<size-1; i++)
         for(int i=0; i<numLayers-1; i++)
+          {
           float cut = (1.0f-0.25f*size+i)*(SQ6/3);
           float cut = (1.0f+i-numLayers/3.0f)*(SQ6/3);
           cuts[0][i] = cut;
           cuts[1][i] = cut;
           cuts[2][i] = cut;

Also available in: Unified diff

Project

General

Profile

Magic Cube

Revision 5da517d3

Added by Leszek Koltunski about 3 years ago