/ - Diff - Magic Cube - Distorted Android

     public class BandagedCreatorActivity extends AppCompatActivity
+    {
         private static final int ACTIVITY_NUMBER = 3;
         static final float RATIO_BAR   = 0.10f;
         static final float RATIO_SCROLL= 0.30f;
         private static final float RATIO_BAR   = 0.10f;
         private static final float RATIO_SCROLL= 0.30f;
         public static final float DIALOG_BUTTON_SIZE  = 0.06f;
         public static final float MENU_BIG_TEXT_SIZE  = 0.05f;
-...
+          {
           int barHeight    = (int)(mScreenHeight*RATIO_BAR);
           int viewHeight   = (int)(mScreenHeight*RATIO_SCROLL);
           int objectHeight = (int)(mScreenHeight*(1-RATIO_SCROLL));
           int objectHeight = (int)(mScreenHeight*(1-RATIO_SCROLL-RATIO_BAR));
           mHeightBar = barHeight;
           LinearLayout layout = findViewById(R.id.lowerBar);

        private final BandagedCreatorView mView;
        private final DistortedScreen mScreen;
        private final Static3D mScale;
        private final Static3D mMoveY;
        private final BandagedCubit[] mCubits;
        private float mScaleValue;
-...
          mScreen = new DistortedScreen();
          mScreen.glClearColor(BRIGHTNESS, BRIGHTNESS, BRIGHTNESS, 1.0f);
          mScale = new Static3D(1,1,1);
          mMoveY = new Static3D(0,0,0);
          mCubits= createCubits();
+         }
-...
          for(int c=0; c<len; c++)
+           {
            cubits[c] = new BandagedCubit(POSITIONS[c],mQuat1,mQuat2,mMoveY,mScale,COLOR_DEFAULT);
            cubits[c] = new BandagedCubit(POSITIONS[c],mQuat1,mQuat2,mScale,COLOR_DEFAULT);
+           }
          return cubits;
-...
           int len = POSITIONS.length;
           for(int i=0; i<len; i++)
+            {
             mCubits[i].scaleMove(mScaleValue);
             mCubits[i].setTexture(COLOR_DEFAULT);
             DistortedNode node = mCubits[i].getNode();
             mScreen.attach(node);
+            }
           float RB = BandagedCreatorActivity.RATIO_BAR;
           float RS = BandagedCreatorActivity.RATIO_SCROLL;
           float yOffset = (0.5f*RB/(1-RS))*height;
           mMoveY.set1(yOffset);
             if( mCubits[i].isAttached() )
+              {
               mCubits[i].scaleMove(mScaleValue);
               mCubits[i].setTexture(COLOR_DEFAULT);
               DistortedNode node = mCubits[i].getNode();
               mScreen.attach(node);
+              }
           mScale.set( mScaleValue,mScaleValue,mScaleValue );
           mScreenMin = Math.min(width, height);
           mView.setScreenSize(width,height, (int)yOffset);
           mView.setScreenSize(width,height);
           mScreen.resize(width,height);
+          }
-...
            if( isAdjacent(pos1,pos2) )
+             {
              mCubits[index2].prepareJoin(pos1);
              mCubits[index2].join(pos1,mScaleValue);
              mCubits[index1].detach();
              DistortedNode node1 = mCubits[index1].getNode();
              mScreen.detach(node1);
              DistortedNode node2 = mCubits[index2].getNode();
              mScreen.detach(node2);
              mCubits[index2].swapNodes(mScaleValue);
              DistortedNode node3 = mCubits[index2].getNode();
              mScreen.attach(node3);
              mScreen.detach(mCubits[index1].getNode());
+             }
+           }
+         }

src/main/java/org/distorted/bandaged/BandagedCreatorView.java
41	41	private BandagedCreatorRenderer mRenderer;
42	42	private BandagedTouchControl mTouchControl;
43	43	private int mScreenWidth, mScreenHeight;
44		private int mYoffset;
45	44
46	45	///////////////////////////////////////////////////////////////////////////////////////////////////
47	46	// PUBLIC API
...	...
118	117
119	118	///////////////////////////////////////////////////////////////////////////////////////////////////
120	119
121		public void setScreenSize(int width, int height, int yOffset)
	120	public void setScreenSize(int width, int height)
122	121	{
123	122	mScreenWidth = width;
124	123	mScreenHeight= height;
125		mYoffset = yOffset;
126	124	}
127	125
128	126	///////////////////////////////////////////////////////////////////////////////////////////////////
...	...
132	130	{
133	131	int action = event.getAction();
134	132	int x = (int)event.getX();
135		int y = (int)event.getY() + mYoffset;
	133	int y = (int)event.getY();
136	134
137	135	switch(action)
138	136	{
...	...
156	154	mTouchedIndex1 = index;
157	155	mTouchControl.markCubit(mTouchedIndex1, BandagedCreatorRenderer.COLOR_MARKED);
158	156	}
159		else if( mTouchedIndex1 != index )
	157	else
160	158	{
161	159	mTouchedIndex2 = index;
162		mTouchControl.markCubit(mTouchedIndex2, BandagedCreatorRenderer.COLOR_MARKED);
	160
	161	if( mTouchedIndex1 != index )
	162	{
	163	mTouchControl.markCubit(mTouchedIndex2, BandagedCreatorRenderer.COLOR_MARKED);
	164	}
163	165	}
164	166	}
165	167

+    {
         private static final Static3D CENTER = new Static3D(0,0,0);
         private DistortedNode mNode, mNewNode;
         private final DistortedNode mNode;
         private final DistortedTexture mTexture;
         private final DistortedEffects mEffects;
         private final Static3D mMove;
         private float mUnscaledX, mUnscaledY, mUnscaledZ;
         private float[] mPosition, mNewPosition;
         private float[] mPosition;
         private boolean mIsAttached;
     ///////////////////////////////////////////////////////////////////////////////////////////////////
-...
     // PUBLIC API
     ///////////////////////////////////////////////////////////////////////////////////////////////////
         public BandagedCubit(float[] position, Static4D quat1, Static4D quat2, Static3D moveY, Static3D scale, int color)
         public BandagedCubit(float[] position, Static4D quat1, Static4D quat2, Static3D scale, int color)
+          {
           mPosition = position;
           mIsAttached = true;
-...
           MatrixEffectScale scaleEffect = new MatrixEffectScale(scale);
           MatrixEffectQuaternion quat1Effect = new MatrixEffectQuaternion(quat1, CENTER);
           MatrixEffectQuaternion quat2Effect = new MatrixEffectQuaternion(quat2, CENTER);
           MatrixEffectMove moveSEffect = new MatrixEffectMove(mMove);
           MatrixEffectMove moveYEffect = new MatrixEffectMove(moveY);
           MatrixEffectMove moveEffect = new MatrixEffectMove(mMove);
           mEffects = new DistortedEffects();
           mEffects.apply(scaleEffect);
           mEffects.apply(moveSEffect);
           mEffects.apply(moveEffect);
           mEffects.apply(quat2Effect);
           mEffects.apply(quat1Effect);
           mEffects.apply(moveYEffect);
           mNode = new DistortedNode(mTexture,mEffects,mesh);
+          }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
         public void prepareJoin(float[] position)
         public void join(float[] position, float scale)
+          {
           int len1 = mPosition.length;
           int len2 = position.length;
           mNewPosition = new float[len1+len2];
           float[] tmpPosition = new float[len1+len2];
           System.arraycopy(mPosition, 0, mNewPosition,    0, len1);
           System.arraycopy(position , 0, mNewPosition, len1, len2);
           System.arraycopy(mPosition, 0, tmpPosition,    0, len1);
           System.arraycopy(position , 0, tmpPosition, len1, len2);
     /*
     int l= mPosition.length/3;
     String s="";
     for(int i=0; i<l; i++) s += (mPosition[3*i]+" "+mPosition[3*i+1]+" "+mPosition[3*i+2]+"\n");
     android.util.Log.e("D", "pos after joining: \n"+s);
     */
           FactoryBandaged3x3Cubit factory = FactoryBandaged3x3Cubit.getInstance();
           MeshBase mesh = factory.createMesh(mNewPosition);
           mNewNode = new DistortedNode(mTexture,mEffects,mesh);
           computeMove(mNewPosition);
+          }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
           computeMove(tmpPosition);
           mPosition = tmpPosition;
         public void swapNodes(float scale)
+          {
           mPosition = mNewPosition;
           mNode = mNewNode;
           FactoryBandaged3x3Cubit factory = FactoryBandaged3x3Cubit.getInstance();
           MeshBase mesh = factory.createMesh(mPosition);
           mNode.setMesh(mesh);
           mMove.set( scale*mUnscaledX, scale*mUnscaledY, scale*mUnscaledZ);
+          }

         <LinearLayout
             android:id="@+id/lowerBar"
             android:layout_below="@+id/bandagedCreatorObjectView"
             android:layout_alignParentBottom="true"
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:orientation="horizontal"
             android:background="@android:color/transparent">
             android:background="@color/light_grey">
         </LinearLayout>
     </RelativeLayout>

Project

General

Profile

Magic Cube

Revision 28cb1607

Added by Leszek Koltunski over 2 years ago