/ - Diff - Magic Cube - Distorted Android

« Previous | Next »

Revision ffd48105

Added by Leszek Koltunski almost 5 years ago

ID ffd481052a7b4a34f06941fb013e23148a29fcf6
Parent 30b68322
Child e8764a49

RubikCube: make finishingRotation more flexible (can now finish any rotation which did finish interpolating (nearly) to the end - and not only the single-static 'manual' rotation)

     ///////////////////////////////////////////////////////////////////////////////////////////////////
         void addNewRotation(int vector, float offset )
         void addNewRotation(int vector, int row )
+          {
           Static3D axis = VectX;
-...
+            }
           mRotAxis = vector;
           mRotRow  = (int)(mSize*offset);
           mRotRow  = row;
           mRotationAngleStatic.set1(0.0f);
-...
         long finishRotationNow(EffectListener listener)
+          {
           boolean first = true;
           float startingAngle = mRotationAngleStatic.get1();
           int nearestAngleInDegrees = computeNearestAngle(startingAngle);
           long effectID=0;
           mRotationAngleFinal.set1(nearestAngleInDegrees);
           mRotationAngleMiddle.set1( nearestAngleInDegrees + (nearestAngleInDegrees-startingAngle)*0.2f );
           for(int x=0; x<mSize; x++)
             for(int y=0; y<mSize; y++)
               for(int z=0; z<mSize; z++)
-...
+                  {
                   if( belongsToRotation(x,y,z,mRotAxis,mRotRow) )
+                    {
                     mRotationAngle[x][y][z].setDuration(POST_ROTATION_MILLISEC);
                     mRotationAngle[x][y][z].resetToBeginning();
                     mRotationAngle[x][y][z].add(mRotationAngleMiddle);
                     mRotationAngle[x][y][z].add(mRotationAngleFinal);
                     if( first )
+                      {
                       first = false;
                       mRotateEffect[x][y][z].notifyWhenFinished(listener);
                       effectID = mRotateEffect[x][y][z].getID();
                       int pointNum = mRotationAngle[x][y][z].getNumPoints();
                       if( pointNum>=1 )
+                        {
                         float startingAngle = mRotationAngle[x][y][z].getPoint(pointNum-1).get1();
                         int nearestAngleInDegrees = computeNearestAngle(startingAngle);
                         mRotationAngleStatic.set1(startingAngle);
                         mRotationAngleFinal.set1(nearestAngleInDegrees);
                         mRotationAngleMiddle.set1( nearestAngleInDegrees + (nearestAngleInDegrees-startingAngle)*0.2f );
+                        }
                       else
+                        {
                         android.util.Log.e("cube", "ERROR finishing rotation!");
                         return 0;
+                        }
+                      }
                     mRotationAngle[x][y][z].setDuration(POST_ROTATION_MILLISEC);
                     mRotationAngle[x][y][z].resetToBeginning();
                     mRotationAngle[x][y][z].removeAll();
                     mRotationAngle[x][y][z].add(mRotationAngleStatic);
                     mRotationAngle[x][y][z].add(mRotationAngleMiddle);
                     mRotationAngle[x][y][z].add(mRotationAngleFinal);
+                    }
+                  }

           mTouchPoint[1] = mPoint[1];
           mTouchPoint[2] = mPoint[2];
           mRenderer.getCube().addNewRotation(mRotationVect,offset);
           RubikCube cube = mRenderer.getCube();
           cube.addNewRotation(mRotationVect, (int)(cube.getSize()*offset) );
+          }
     ///////////////////////////////////////////////////////////////////////////////////////////////////

Also available in: Unified diff

Project

General

Profile

Magic Cube

Revision ffd48105

Added by Leszek Koltunski almost 5 years ago