/src/main/java/org/distorted/magic/RubikSurfaceView.java - Diff - Magic Cube - Distorted Android

« Previous | Next »

Revision beb325a0

Added by Leszek Koltunski over 4 years ago

ID beb325a0c0f7afd856d31e5c6f6e45aaf1b53450
Parent 4918f19c
Child c896c0b3

Major restructuring - separate the Manipulated Objects (i.e. at the time being - Cubes of various sizes) and the class holding knowledge how those Objects move ( RubikCubeMovement ) into a separate package; remove all knowledge of Objects and the way they move from the main package.

     import android.app.ActivityManager;
     import android.content.Context;
     import android.content.pm.ConfigurationInfo;
     import android.graphics.PorterDuff;
     import android.graphics.drawable.Drawable;
     import android.opengl.GLSurfaceView;
     import android.support.v4.content.ContextCompat;
     import android.util.AttributeSet;
     import android.util.DisplayMetrics;
     import android.view.MotionEvent;
     import android.view.ViewGroup;
     import android.widget.Button;
     import android.widget.ImageButton;
     import android.widget.LinearLayout;
     import org.distorted.library.type.Static4D;
     import org.distorted.object.RubikCubeMovement;
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     class RubikSurfaceView extends GLSurfaceView
     public class RubikSurfaceView extends GLSurfaceView
+    {
         // Moving the finger from the middle of the vertical screen to the right edge will rotate a
         // given face by SWIPING_SENSITIVITY/2 degrees.
         private final static int SWIPING_SENSITIVITY  = 240;
         // Moving the finger by 1/12 the distance of min(scrWidth,scrHeight) will start a Rotation.
         private final static int ROTATION_SENSITIVITY =  12;
         // Every 1/12 the distance of min(scrWidth,scrHeight) the direction of cube rotation will reset.
         private final static int DIRECTION_SENSITIVITY=  12;
         private final static int NONE   =-1;
         private final static int FRONT  = 0;  // has to be 6 consecutive ints
         private final static int BACK   = 1;  // FRONT ... BOTTOM
         private final static int LEFT   = 2;  //
         private final static int RIGHT  = 3;  //
         private final static int TOP    = 4;  //
         private final static int BOTTOM = 5;  //
         private RubikRenderer mRenderer;
         private RubikCubeMovement mMovement;
         private static final int[] VECT = {RubikCube.VECTX,RubikCube.VECTY,RubikCube.VECTZ};
         private boolean mInScrambleMode;
         private int mButton = RubikSize.SIZE3.ordinal();
         private boolean mDragging, mBeginningRotation, mContinuingRotation;
         private int mX, mY;
         private int mRotationVect;
         private RubikRenderer mRenderer;
         private float[] mPoint, mCamera, mTouchPointCastOntoFace, mDiff, mTouchPoint; // all in screen space
         private int mLastTouchedFace;
         private int mScreenWidth, mScreenHeight, mScreenMin;
         private float mCameraDistance;
         private int mScreenWidth, mScreenHeight, mScreenMin;
         private static Static4D mQuatCurrent    = new Static4D(0,0,0,1);
         private static Static4D mQuatAccumulated= new Static4D(-0.25189602f,0.3546389f,0.009657208f,0.90038127f);
-...
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     // return quat1*quat2
         static Static4D quatMultiply( Static4D quat1, Static4D quat2 )
         public static Static4D quatMultiply( Static4D quat1, Static4D quat2 )
+          {
           float qx = quat1.get1();
           float qy = quat1.get2();
-...
+          }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     // rotate 'vector' by quat^(-1)  ( i.e. return (quat^-1)*vector*quat )
     // rotate 'vector' by quat  ( i.e. return quat*vector*(quat^-1) )
         static Static4D rotateVectorByInvertedQuat(Static4D vector, Static4D quat)
         public static Static4D rotateVectorByQuat(Static4D vector, Static4D quat)
+          {
           float qx = quat.get1();
           float qy = quat.get2();
-...
           float qw = quat.get4();
           Static4D quatInverted= new Static4D(-qx,-qy,-qz,qw);
           Static4D tmp = quatMultiply(quatInverted,vector);
           Static4D tmp = quatMultiply(quat,vector);
           return quatMultiply(tmp,quat);
           return quatMultiply(tmp,quatInverted);
+          }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     // rotate 'vector' by quat  ( i.e. return quat*vector*(quat^-1) )
     // rotate 'vector' by quat^(-1)  ( i.e. return (quat^-1)*vector*quat )
         static Static4D rotateVectorByQuat(Static4D vector, Static4D quat)
         public static Static4D rotateVectorByInvertedQuat(Static4D vector, Static4D quat)
+          {
           float qx = quat.get1();
           float qy = quat.get2();
-...
           float qw = quat.get4();
           Static4D quatInverted= new Static4D(-qx,-qy,-qz,qw);
           Static4D tmp = quatMultiply(quat,vector);
           return quatMultiply(tmp,quatInverted);
+          }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
         private int faceTouched(int xTouch, int yTouch)
+          {
           float cubeHalfSize= mRenderer.returnCubeSizeInScreenSpace()*0.5f;
           convertTouchPointToScreenSpace(xTouch,yTouch);
           convertCameraPointToScreenSpace();
           for(int face=FRONT; face<=BOTTOM; face++)
+            {
             if( faceIsVisible(face,cubeHalfSize) )
+              {
               castTouchPointOntoFace(face,cubeHalfSize, mTouchPointCastOntoFace);
               float qX= (mTouchPointCastOntoFace[0]+cubeHalfSize) / (2*cubeHalfSize);
               float qY= (mTouchPointCastOntoFace[1]+cubeHalfSize) / (2*cubeHalfSize);
               float qZ= (mTouchPointCastOntoFace[2]+cubeHalfSize) / (2*cubeHalfSize);
               if( qX<=1 && qX>=0 && qY<=1 && qY>=0 && qZ<=1 && qZ>=0 ) return face;
+              }
+            }
           Static4D tmp = quatMultiply(quatInverted,vector);
           return NONE;
           return quatMultiply(tmp,quat);
+          }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
         private void addNewRotation(int x, int y)
         void setScreenSize(int width, int height)
+          {
           float cubeHalfSize= mRenderer.returnCubeSizeInScreenSpace()*0.5f;
           convertTouchPointToScreenSpace(x,y);
           castTouchPointOntoFace(mLastTouchedFace,cubeHalfSize,mDiff);
           mDiff[0] -= mTouchPointCastOntoFace[0];
           mDiff[1] -= mTouchPointCastOntoFace[1];
           mDiff[2] -= mTouchPointCastOntoFace[2];
           int xAxis = retFaceXaxis(mLastTouchedFace);
           int yAxis = retFaceYaxis(mLastTouchedFace);
           mRotationVect = (isVertical( mDiff[xAxis], mDiff[yAxis]) ? VECT[xAxis]:VECT[yAxis]);
           float offset= (mTouchPointCastOntoFace[mRotationVect]+cubeHalfSize)/(2*cubeHalfSize);
           mTouchPoint[0] = mPoint[0];
           mTouchPoint[1] = mPoint[1];
           mTouchPoint[2] = mPoint[2];
           mScreenWidth = width;
           mScreenHeight= height;
           RubikCube cube = mRenderer.getCube();
           cube.addNewRotation(mRotationVect, (int)(cube.getSize()*offset) );
           mScreenMin = width<height ? width:height;
+          }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
         private boolean isVertical(float x, float y)
         void setCameraDist(float distance)
+          {
           return (y>x) ? (y>=-x) : (y< -x);
           mCameraDistance = distance;
+          }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
         private void continueRotation(int x, int y)
         RubikRenderer getRenderer()
+          {
           convertTouchPointToScreenSpace(x,y);
           mDiff[0] = mPoint[0]-mTouchPoint[0];
           mDiff[1] = mPoint[1]-mTouchPoint[1];
           mDiff[2] = mPoint[2]-mTouchPoint[2];
           int xAxis= retFaceXaxis(mLastTouchedFace);
           int yAxis= retFaceYaxis(mLastTouchedFace);
           int sign = retFaceRotationSign(mLastTouchedFace);
           float angle = (mRotationVect==xAxis ? mDiff[yAxis] : -mDiff[xAxis]);
           mRenderer.getCube().continueRotation(SWIPING_SENSITIVITY*sign*angle/mScreenMin);
           return mRenderer;
+          }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
         private void finishRotation()
         int getRedButton()
+          {
           mRenderer.finishRotation();
           return mButton;
+          }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
         private Static4D quatFromDrag(float dragX, float dragY)
         void markButton(int button)
+          {
           float axisX = dragY;  // inverted X and Y - rotation axis is perpendicular to (dragX,dragY)
           float axisY = dragX;  // Why not (-dragY, dragX) ? because Y axis is also inverted!
           float axisZ = 0;
           float axisL = (float)Math.sqrt(axisX*axisX + axisY*axisY + axisZ*axisZ);
           mButton = button;
           RubikActivity act = (RubikActivity)getContext();
           if( axisL>0 )
           for(int b=0; b<RubikSize.LENGTH; b++)
+            {
             axisX /= axisL;
             axisY /= axisL;
             axisZ /= axisL;
             Drawable d = act.findViewById(b).getBackground();
             float ratio = axisL/mScreenMin;
             ratio = ratio - (int)ratio;     // the cos() is only valid in (0,Pi)
             float cosA = (float)Math.cos(Math.PI*ratio);
             float sinA = (float)Math.sqrt(1-cosA*cosA);
             return new Static4D(axisX*sinA, axisY*sinA, axisZ*sinA, cosA);
             if( b==button )
+              {
               d.setColorFilter(ContextCompat.getColor(act,R.color.red), PorterDuff.Mode.MULTIPLY);
+              }
             else
+              {
               d.clearColorFilter();
+              }
+            }
           return new Static4D(0f, 0f, 0f, 1f);
+          }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
         private boolean faceIsVisible(int face, float cubeHalfSize)
         void addSizeButtons(RubikActivity act)
+          {
           int sign = retFaceSign(face);
           int zAxis= retFaceZaxis(face);
           return sign*mCamera[zAxis] > cubeHalfSize;
+          }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
         private void convertTouchPointToScreenSpace(int x, int y)
+          {
           float halfScrWidth  = mScreenWidth *0.5f;
           float halfScrHeight = mScreenHeight*0.5f;
           Static4D touchPoint = new Static4D(x-halfScrWidth, halfScrHeight-y, 0, 0);
           Static4D rotatedTouchPoint= rotateVectorByInvertedQuat(touchPoint, mQuatAccumulated);
           mPoint[0] = rotatedTouchPoint.get1();
           mPoint[1] = rotatedTouchPoint.get2();
           mPoint[2] = rotatedTouchPoint.get3();
           LinearLayout layout = act.findViewById(R.id.sizeLayout);
           DisplayMetrics metrics = getResources().getDisplayMetrics();
           float scale = metrics.density;
           int size = (int)(64*scale +0.5f);
           int padding = (int)(3*scale + 0.5f);
           ViewGroup.LayoutParams params = new ViewGroup.LayoutParams(size,size);
           for(int i=0; i<RubikSize.LENGTH; i++)
+            {
             ImageButton button = new ImageButton(act);
             button.setLayoutParams(params);
             button.setId(i);
             button.setPadding(padding,0,padding,0);
             int iconID = RubikSize.getSize(i).getIconID();
             button.setImageResource(iconID);
             button.setOnClickListener(act);
             layout.addView(button);
+            }
+          }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
         private void convertCameraPointToScreenSpace()
         void enterScrambleMode()
+          {
           Static4D cameraPoint = new Static4D(0, 0, mCameraDistance, 0);
           Static4D rotatedCamera= rotateVectorByInvertedQuat(cameraPoint, mQuatAccumulated);
           mCamera[0] = rotatedCamera.get1();
           mCamera[1] = rotatedCamera.get2();
           mCamera[2] = rotatedCamera.get3();
+          }
           if( !mInScrambleMode )
+            {
             mInScrambleMode = true;
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     // given precomputed mCamera and mPoint, respectively camera and touch point positions in ScreenSpace,
     // cast this touch point onto the surface defined by the 'face' and write the cast coords to 'output'.
     // Center of the 'face' = (0,0), third coord always +- cubeHalfSize.
             android.util.Log.e("view", "entering scramble mode");
         private void castTouchPointOntoFace(int face, float cubeHalfSize, float[] output)
+          {
           int sign = retFaceSign(face);
           int zAxis= retFaceZaxis(face);
           float diff = mPoint[zAxis]-mCamera[zAxis];
             RubikActivity act = (RubikActivity)getContext();
           float ratio =  diff!=0.0f ? (sign*cubeHalfSize-mCamera[zAxis])/diff : 0.0f;
             Button scrambleButt = act.findViewById(R.id.rubikScramble);
           output[0] = (mPoint[0]-mCamera[0])*ratio + mCamera[0];
           output[1] = (mPoint[1]-mCamera[1])*ratio + mCamera[1];
           output[2] = (mPoint[2]-mCamera[2])*ratio + mCamera[2];
             if( scrambleButt!=null )
+              {
               scrambleButt.setClickable(false);
               scrambleButt.setVisibility(INVISIBLE);
+              }
             else
+              {
               android.util.Log.e("view", "button null!");
+              }
+            }
+          }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
         private int retFaceSign(int face)
         void leaveScrambleMode()
+          {
           return (face==FRONT || face==RIGHT || face==TOP) ? 1:-1;
+          }
           if( mInScrambleMode )
+            {
             mInScrambleMode = false;
     ///////////////////////////////////////////////////////////////////////////////////////////////////
             android.util.Log.e("view", "leaving scramble mode");
         private int retFaceRotationSign(int face)
+          {
           return (face==BACK || face==RIGHT || face==TOP) ? 1:-1;
+          }
             RubikActivity act = (RubikActivity)getContext();
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     // retFace{X,Y,Z}axis: 3 functions which return which real AXIS gets mapped to which when we look
     // directly at a given face. For example, when we look at the RIGHT face of the cube (with TOP still
     // in the top) then the 'real' X axis becomes the 'Z' axis, thus retFaceZaxis(RIGHT) = VECTX.
             Button scrambleButt = act.findViewById(R.id.rubikScramble);
         private int retFaceXaxis(int face)
+          {
           switch(face)
+            {
             case FRONT :
             case BACK  : return RubikCube.VECTX;
             case LEFT  :
             case RIGHT : return RubikCube.VECTZ;
             case TOP   :
             case BOTTOM: return RubikCube.VECTX;
             if( scrambleButt!=null )
+              {
               scrambleButt.setClickable(true);
               scrambleButt.setVisibility(VISIBLE);
+              }
             else
+              {
               android.util.Log.e("view", "button null!");
+              }
+            }
           return -1;
+          }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
         private int retFaceYaxis(int face)
         void leaveScrambleModeNonUI()
+          {
           switch(face)
+            {
             case FRONT :
             case BACK  : return RubikCube.VECTY;
             case LEFT  :
             case RIGHT : return RubikCube.VECTY;
             case TOP   :
             case BOTTOM: return RubikCube.VECTZ;
+            }
           RubikActivity act = (RubikActivity)getContext();
           return -1;
+          }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
         private int retFaceZaxis(int face)
+          {
           switch(face)
           act.runOnUiThread(new Runnable()
+            {
             case FRONT :
             case BACK  : return RubikCube.VECTZ;
             case LEFT  :
             case RIGHT : return RubikCube.VECTX;
             case TOP   :
             case BOTTOM: return RubikCube.VECTY;
+            }
           return -1;
             @Override
             public void run()
+              {
               leaveScrambleMode();
+              }
             });
+          }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
-...
     ///////////////////////////////////////////////////////////////////////////////////////////////////
         RubikRenderer getRenderer()
         private Static4D quatFromDrag(float dragX, float dragY)
+          {
           return mRenderer;
+          }
           float axisX = dragY;  // inverted X and Y - rotation axis is perpendicular to (dragX,dragY)
           float axisY = dragX;  // Why not (-dragY, dragX) ? because Y axis is also inverted!
           float axisZ = 0;
           float axisL = (float)Math.sqrt(axisX*axisX + axisY*axisY + axisZ*axisZ);
     ///////////////////////////////////////////////////////////////////////////////////////////////////
           if( axisL>0 )
+            {
             axisX /= axisL;
             axisY /= axisL;
             axisZ /= axisL;
         void setScreenSize(int width, int height)
+          {
           mScreenWidth = width;
           mScreenHeight= height;
             float ratio = axisL/mScreenMin;
             ratio = ratio - (int)ratio;     // the cos() is only valid in (0,Pi)
           mScreenMin = width<height ? width:height;
             float cosA = (float)Math.cos(Math.PI*ratio);
             float sinA = (float)Math.sqrt(1-cosA*cosA);
             return new Static4D(axisX*sinA, axisY*sinA, axisZ*sinA, cosA);
+            }
           return new Static4D(0f, 0f, 0f, 1f);
+          }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
         void setCameraDist(float distance)
         void setMovement(RubikCubeMovement movement)
+          {
           mCameraDistance = distance;
           mMovement = movement;
+          }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
-...
           if(!isInEditMode())
+            {
             mRotationVect = VECT[0];
             mPoint = new float[3];
             mCamera= new float[3];
             mDiff  = new float[3];
             mTouchPoint = new float[3];
             mTouchPointCastOntoFace = new float[3];
             mScreenWidth = mScreenHeight = mScreenMin = 0;
             mInScrambleMode = false;
             mRenderer = new RubikRenderer(this);
             final ActivityManager activityManager     = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
-...
+             {
              case MotionEvent.ACTION_DOWN: mX = x;
                                            mY = y;
                                            mLastTouchedFace = faceTouched(x,y);
                                            mLastTouchedFace = mMovement.faceTouched(mQuatAccumulated,mCameraDistance, x,y, mScreenWidth, mScreenHeight);
                                            if( mLastTouchedFace != NONE )
                                            if( mLastTouchedFace != RubikCubeMovement.NONE )
+                                             {
                                              mDragging           = false;
                                              mBeginningRotation  = mRenderer.canRotate();
-...
                                              if( (mX-x)*(mX-x)+(mY-y)*(mY-y) > minimumDistToStartRotating )
+                                               {
                                                addNewRotation(x,y);
                                                mMovement.addNewRotation(mQuatAccumulated,mLastTouchedFace, x,y, mScreenWidth, mScreenHeight);
                                                mBeginningRotation = false;
                                                mContinuingRotation= true;
+                                               }
+                                             }
                                            else if( mContinuingRotation )
+                                             {
                                              continueRotation(x,y);
                                              mMovement.continueRotation(mQuatAccumulated,mLastTouchedFace, x,y, mScreenWidth, mScreenHeight);
+                                             }
                                            break;
              case MotionEvent.ACTION_UP  : if( mDragging )
-...
                                            if( mContinuingRotation )
+                                             {
                                              finishRotation();
                                              mRenderer.finishRotation();
+                                             }
                                            break;
+             }

Also available in: Unified diff

Project

General

Profile

Magic Cube

Revision beb325a0

Added by Leszek Koltunski over 4 years ago