/ - Diff - Magic Cube - Distorted Android

+        {
         float X = NODE_FBO_SIZE /3;
         mCubeEffectPosition[0] = new int[] {3,4};
         mCubeEffectPosition[0] = new int[] {2,3};
         mCubeEffects[0]        = new Effect[mCubeEffectPosition[0].length];
         Dynamic3D d0 = new Dynamic3D(duration/2, 0.5f);
-...
+        {
         float X = NODE_FBO_SIZE /3;
         mCubeEffectPosition[1] = new int[] {3,4};
         mCubeEffectPosition[1] = new int[] {2,3};
         mCubeEffects[1]        = new Effect[mCubeEffectPosition[1].length];
         Dynamic3D d0 = new Dynamic3D(duration/2, 0.5f);

src/main/java/org/distorted/effects/objectchange/ObjectChangeEffectScale.java
30	30	{
31	31	public int createEffectsPhase0(int duration)
32	32	{
33		mCubeEffectPosition[0] = new int[] {3};
	33	mCubeEffectPosition[0] = new int[] {2};
34	34	mCubeEffects[0] = new Effect[mCubeEffectPosition[0].length];
35	35
36	36	Dynamic3D d0 = new Dynamic3D(duration/2, 0.5f);
...	...
45	45
46	46	public int createEffectsPhase1(int duration)
47	47	{
48		mCubeEffectPosition[1] = new int[] {3};
	48	mCubeEffectPosition[1] = new int[] {2};
49	49	mCubeEffects[1] = new Effect[mCubeEffectPosition[1].length];
50	50
51	51	Dynamic3D d0 = new Dynamic3D(duration/2, 0.5f);

+        {
         mCubeEffectNumber   = 2;
         mNodeEffectNumber   = 0;
         mCubeEffectPosition = new int[] {3,4};
         mCubeEffectPosition = new int[] {2,3};
         mCubeEffects        = new Effect[mCubeEffectPosition.length];
         mRnd.setSeed(System.currentTimeMillis());

     public class RubikSurfaceView extends GLSurfaceView
+    {
         private static final int NUM_SPEED_PROBES = 10;
         private static final int INVALID_POINTER_ID = -1;
         public static final int MODE_ROTATE  = 0;
         public static final int MODE_DRAG    = 1;
-...
         private boolean mDragging, mBeginningRotation, mContinuingRotation;
         private int mScreenWidth, mScreenHeight, mScreenMin;
         private int mPtrID1, mPtrID2;
         private int mNumFingersDown;
         private float mX, mY;
         private float mStartRotX, mStartRotY;
-...
         private void actionMove(MotionEvent event)
+          {
           float x = (event.getX() - mScreenWidth*0.5f)/mScreenMin;
           float y = (mScreenHeight*0.5f -event.getY())/mScreenMin;
           int pointer = event.findPointerIndex(mPtrID1 != INVALID_POINTER_ID ? mPtrID1:mPtrID2);
           //android.util.Log.e("view", "num fingers: "+mNumFingersDown+" x="+event.getX()+" y="+event.getY());
           float pX = event.getX(pointer);
           float pY = event.getY(pointer);
           float x = (pX - mScreenWidth*0.5f)/mScreenMin;
           float y = (mScreenHeight*0.5f -pY)/mScreenMin;
           if( mBeginningRotation )
+            {
-...
         private void actionDown(MotionEvent event)
+          {
           mNumFingersDown++;
           mPtrID1 = event.getPointerId(0);
           int index = event.getActionIndex();
           float x = event.getX();
           float y = event.getY();
           android.util.Log.e("view", "down1 num fingers: "+mNumFingersDown+" index="+index+" x="+x+" y="+y);
           mX = (x - mScreenWidth*0.5f)/mScreenMin;
           mY = (mScreenHeight*0.5f -y)/mScreenMin;
-...
+          {
           mNumFingersDown--;
           int index = event.getActionIndex();
           float x = event.getX();
           float y = event.getY();
           android.util.Log.e("view", "up1 num fingers: "+mNumFingersDown+" index="+index+" x="+x+" y="+y);
           mPtrID1 = INVALID_POINTER_ID;
           mPtrID2 = INVALID_POINTER_ID;
           if( mContinuingRotation )
+            {
-...
+          {
           mNumFingersDown++;
           int index = event.getActionIndex();
           if( mPtrID1==INVALID_POINTER_ID )
+            {
             mPtrID1 = event.getPointerId(index);
             float x = event.getX(index);
             float y = event.getY(index);
             mX = (x - mScreenWidth*0.5f)/mScreenMin;
             mY = (mScreenHeight*0.5f -y)/mScreenMin;
+            }
           else if( mPtrID2==INVALID_POINTER_ID )
+            {
             mPtrID2 = event.getPointerId(index);
             if( mBeginningRotation || mContinuingRotation )
+              {
               float x = event.getX();
               float y = event.getY();
               mX = (x - mScreenWidth*0.5f)/mScreenMin;
               mY = (mScreenHeight*0.5f -y)/mScreenMin;
+              }
+            }
           if( mBeginningRotation )
+            {
             mContinuingRotation = false;
-...
+            {
             finishRotation();
+            }
           int index = event.getActionIndex();
           float x = event.getX();
           float y = event.getY();
           android.util.Log.e("view", "down2 num fingers: "+mNumFingersDown+" index="+index+" x="+x+" y="+y);
+          }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
-...
           mNumFingersDown--;
           int index = event.getActionIndex();
           float x = event.getX();
           float y = event.getY();
           android.util.Log.e("view", "up2 num fingers: "+mNumFingersDown+" index="+index+" x="+x+" y="+y);
           if( index==0 )
+            {
             mPtrID1 = INVALID_POINTER_ID;
             int pointer = event.findPointerIndex(mPtrID2);
             float x1 = event.getX(pointer);
             float y1 = event.getY(pointer);
             mX = (x1 - mScreenWidth*0.5f)/mScreenMin;
             mY = (mScreenHeight*0.5f -y1)/mScreenMin;
+            }
           else
+            {
             mPtrID2 = INVALID_POINTER_ID;
+            }
+          }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
-...
             mFirstIndex =0;
             mLastIndex  =0;
             mPtrID1 = INVALID_POINTER_ID;
             mPtrID2 = INVALID_POINTER_ID;
             mNumFingersDown = 0;
             mRenderer  = new RubikRenderer(this);

         if( tmp!=0 ) return NEAREST*tmp;
         return speed> 1.5f ? NEAREST*(angle>0 ? 1:-1) : 0;
         return speed> 1.3f ? NEAREST*(angle>0 ? 1:-1) : 0;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////

Project

General

Profile

Magic Cube

Revision a4472437

Added by Leszek Koltunski almost 4 years ago