/ - Diff - Magic Cube - Distorted Android

         REX_S = (float)(1/Math.sqrt(1+4*G*G/(F*F)));
+        }
       private float mOX, mOY, mR;
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       private FactorySticker()
-...
         return ret;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       private float getAngle(float[] angles, int index)
+        {
         return angles==null ? 0 : angles[index];
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       private void computeCircleCoords(float lX,float lY, float rX, float rY, float alpha)
+        {
         float ctg= 1.0f/((float)Math.tan(alpha));
         mOX = 0.5f*(lX+rX) + ctg*0.5f*(lY-rY);
         mOY = 0.5f*(lY+rY) - ctg*0.5f*(lX-rX);
         float dx = mOX-lX;
         float dy = mOY-lY;
         mR = (float)Math.sqrt(dx*dx+dy*dy);
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     // circle1: center (x1,y1) radius r1; circle2: center (x2,y2) radius r2.
     // Guaranteed to intersect in two points. Find the intersection. Which one? the one that's closer
     // to (nearx,neary).
       private void findCircleIntersection(float x1,float y1, float r1, float x2, float y2, float r2, float nearx, float neary )
+        {
         float dx = x2-x1;
         float dy = y2-y1;
         float d = (float)Math.sqrt(dx*dx+dy*dy);
         if( d>0 )
+          {
           float Dx = dx/d;
           float Dy = dy/d;
           float cos = (r1*r1+d*d-r2*r2)/(2*r1*d);
           float sin = (float)Math.sqrt(1-cos*cos);
           float ox1 = x1 + r1*cos*Dx + r1*sin*Dy;
           float oy1 = y1 + r1*cos*Dy - r1*sin*Dx;
           float ox2 = x1 + r1*cos*Dx - r1*sin*Dy;
           float oy2 = y1 + r1*cos*Dy + r1*sin*Dx;
           dx = nearx-ox1;
           dy = neary-oy1;
           float d1 = dx*dx+dy*dy;
           dx = nearx-ox2;
           dy = neary-oy2;
           float d2 = dx*dx+dy*dy;
           if( d1<d2 )
+            {
             mOX = ox1;
             mOY = oy1;
+            }
           else
+            {
             mOX = ox2;
             mOY = oy2;
+            }
+          }
         else
+          {
           mOX = x1;
           mOY = y1;
+          }
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       private void drawCurrCurvVertex(Canvas canvas, Paint paint, int left, int top, float r, float stroke, float pX, float pY, float cX, float cY, float nX, float nY, float pA, float cA)
+        {
         pX = (0.5f+pX)*TEXTURE_HEIGHT;
         pY = (0.5f-pY)*TEXTURE_HEIGHT;
         cX = (0.5f+cX)*TEXTURE_HEIGHT;
         cY = (0.5f-cY)*TEXTURE_HEIGHT;
         nX = (0.5f+nX)*TEXTURE_HEIGHT;
         nY = (0.5f-nY)*TEXTURE_HEIGHT;
         computeCircleCoords(pX,pY,cX,cY,pA);
         float o1x = mOX;
         float o1y = mOY;
         float r1  = mR;
         computeCircleCoords(cX,cY,nX,nY,cA);
         float o2x = mOX;
         float o2y = mOY;
         float r2  = mR;
         float dx = o1x-pX;
         float dy = o1y-pY;
         float startA = computeAngle(dy,dx);
         float sweepA = 2*pA;
         startA *= 180/(Math.PI);
         sweepA *= 180/(Math.PI);
     android.util.Log.e("D", "o1x="+o1x+" o1y="+o1y+" r1="+r1+" stA="+startA+" swA="+sweepA);
         canvas.drawArc( left+o1x-r1, top+o1y-r1, left+o1x+r1, top+o1y+r1, startA, sweepA, false, paint);
         float r3  = r*TEXTURE_HEIGHT + stroke/2;
         findCircleIntersection(o1x,o1y,r1-r3,o2x,o2y,r2-r3,cX,cY);
         float o3x = mOX;
         float o3y = mOY;
         dx = o1x-o3x;
         dy = o1y-o3y;
         startA = computeAngle(dy,dx);
         dx = o2x-o3x;
         dy = o2y-o3y;
         float endA = computeAngle(dy,dx);
         sweepA = endA-startA;
         if( sweepA<0 ) sweepA += 2*Math.PI;
         startA *= 180/(Math.PI);
         sweepA *= 180/(Math.PI);
         canvas.drawArc( left+o3x-r3, top+o3y-r3, left+o3x+r3, top+o3y+r3, startA, sweepA, false, paint);
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       private void drawCurrVertex(Canvas canvas, Paint paint, int left, int top, float r, float stroke, float pX, float pY, float cX, float cY, float nX, float nY)
-...
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     // PUBLIC
       public void drawRoundedPolygon(Canvas canvas, Paint paint, int left, int top, float[] vertices, float stroke, int color, float radius)
       public void drawRoundedPolygon(Canvas canvas, Paint paint, int left, int top, float[] vertices, float[] angles, float stroke, int color, float radius)
+        {
         stroke *= TEXTURE_HEIGHT;
-...
         float nextX = vertices[2];
         float nextY = vertices[3];
         float prevA = getAngle(angles,numVertices-1);
         float currA = getAngle(angles,0);
         for(int vert=0; vert<numVertices; vert++)
+          {
           drawCurrVertex(canvas, paint, left, top, radius, stroke, prevX,prevY,currX,currY,nextX,nextY);
           if( prevA==0 )
+            {
             drawCurrVertex(canvas, paint, left, top, radius, stroke, prevX,prevY,currX,currY,nextX,nextY);
+            }
           else
+            {
             drawCurrCurvVertex(canvas, paint, left, top, radius, stroke, prevX,prevY,currX,currY,nextX,nextY,prevA,currA);
+            }
           prevX = currX;
           prevY = currY;
           currX = nextX;
           currY = nextY;
           prevA = currA;
           currA = getAngle(angles, vert==numVertices-1 ? 0 : vert+1);
           if( 2*(vert+2)+1 < length )
+            {
             nextX = vertices[2*(vert+2)  ];
-...
+          }
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       public void drawIvyCornerSticker(Canvas canvas, Paint paint, int left, int top, int color, float stroke, float radius)
+        {
         paint.setAntiAlias(true);
         paint.setColor(color);
         paint.setStyle(Paint.Style.FILL);
         canvas.drawRect(left,top,left+TEXTURE_HEIGHT,top+TEXTURE_HEIGHT,paint);
         paint.setColor(COLOR_BLACK);
         paint.setStyle(Paint.Style.STROKE);
         paint.setStrokeWidth(IVY_C*stroke*TEXTURE_HEIGHT);
         float tmp1 = ((IVY_D-0.5f)-IVY_M)*IVY_C;
         float cx1 = TEXTURE_HEIGHT*(tmp1 + 0.5f);
         float cy1 = TEXTURE_HEIGHT*(0.5f - tmp1);
         float halfL1 = IVY_C*TEXTURE_HEIGHT*(1.0f-2*IVY_D);
         canvas.drawArc( left+cx1-halfL1, top+cy1-halfL1, left+cx1+halfL1, top+cy1+halfL1, 270, 90, false, paint);
         float tmp2 = (+0.5f-IVY_M)*IVY_C;
         float tmp3 = (-0.5f-IVY_M)*IVY_C;
         float x0 = TEXTURE_HEIGHT*(+tmp2 + 0.5f);
         float y0 = TEXTURE_HEIGHT*(-tmp3 + 0.5f);
         float x1 = TEXTURE_HEIGHT*(+tmp2 + 0.5f);
         float y1 = TEXTURE_HEIGHT*(-tmp2 + 0.5f);
         float x2 = TEXTURE_HEIGHT*(+tmp3 + 0.5f);
         float y2 = TEXTURE_HEIGHT*(-tmp2 + 0.5f);
         canvas.drawLine(left+x0,top+y0,left+x1,top+y1,paint);
         canvas.drawLine(left+x1,top+y1,left+x2,top+y2,paint);
         float tmp4 = ((0.5f-stroke/2-radius/2)-IVY_M)*IVY_C;
         float cx2 = TEXTURE_HEIGHT*(tmp4 + 0.5f);
         float cy2 = TEXTURE_HEIGHT*(0.5f - tmp4);
         float halfL2 = IVY_C*TEXTURE_HEIGHT*radius;
         paint.setStrokeWidth(IVY_C*radius*TEXTURE_HEIGHT);
         canvas.drawArc( left+cx2-halfL2, top+cy2-halfL2, left+cx2+halfL2, top+cy2+halfL2, 270, 90, false, paint);
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       public void drawIvyCenterSticker(Canvas canvas, Paint paint, int left, int top, int color, float stroke, float radius)
+        {
         paint.setAntiAlias(true);
         paint.setColor(color);
         paint.setStyle(Paint.Style.FILL);
         canvas.drawRect(left,top,left+TEXTURE_HEIGHT,top+TEXTURE_HEIGHT,paint);
         paint.setColor(COLOR_BLACK);
         paint.setStyle(Paint.Style.STROKE);
         paint.setStrokeWidth(stroke*TEXTURE_HEIGHT);
         float cx1 = TEXTURE_HEIGHT*IVY_D;
         float cy1 = TEXTURE_HEIGHT*(1-IVY_D);
         float cx2 = TEXTURE_HEIGHT*(1.0f-IVY_D);
         float cy2 = TEXTURE_HEIGHT*IVY_D;
         float halfL = TEXTURE_HEIGHT*(1.0f - 2*IVY_D);
         canvas.drawArc( left+cx1-halfL, top+cy1-halfL, left+cx1+halfL, top+cy1+halfL, 270, 90, false, paint);
         canvas.drawArc( left+cx2-halfL, top+cy2-halfL, left+cx2+halfL, top+cy2+halfL,  90, 90, false, paint);
         float tmp = TEXTURE_HEIGHT*(IVY_D+stroke*0.5f+radius*0.5f);
         float cx3 = tmp;
         float cy3 = tmp;
         float cx4 = TEXTURE_HEIGHT - cx3;
         float cy4 = TEXTURE_HEIGHT - cy3;
         float halfR = TEXTURE_HEIGHT*radius;
         paint.setStrokeWidth(radius*TEXTURE_HEIGHT);
         canvas.drawArc( left+cx3-halfR, top+cy3-halfR, left+cx3+halfR, top+cy3+halfR, 180, 90, false, paint);
         canvas.drawArc( left+cx4-halfR, top+cy4-halfR, left+cx4+halfR, top+cy4+halfR,   0, 90, false, paint);
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       public void drawRexCornerSticker(Canvas canvas, Paint paint, int left, int top, int color, float stroke, float radius1, float radius2)

         float[] vertices = { -X,-Y, +X,-Y, +X,+Y, -X,+Y};
         FactorySticker factory = FactorySticker.getInstance();
         factory.drawRoundedPolygon(canvas, paint, left, top, vertices, S, FACE_COLORS[color], R);
         factory.drawRoundedPolygon(canvas, paint, left, top, vertices, null, S, FACE_COLORS[color], R);
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////

         float S = 0.08f;
         FactorySticker factory = FactorySticker.getInstance();
         factory.drawRoundedPolygon(canvas, paint, left, top, STICKERS[0], S, FACE_COLORS[face], R);
         factory.drawRoundedPolygon(canvas, paint, left, top, STICKERS[0], null, S, FACE_COLORS[face], R);
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////

         float S = 0.07f;
         FactorySticker factory = FactorySticker.getInstance();
         factory.drawRoundedPolygon(canvas, paint, left, top, STICKERS[0], S, FACE_COLORS[face], R);
         factory.drawRoundedPolygon(canvas, paint, left, top, STICKERS[0], null, S, FACE_COLORS[face], R);
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////

         float S = 0.05f;
         FactorySticker factory = FactorySticker.getInstance();
         factory.drawRoundedPolygon(canvas, paint, left, top, STICKERS[0], S, FACE_COLORS[face], R);
         factory.drawRoundedPolygon(canvas, paint, left, top, STICKERS[0], null, S, FACE_COLORS[face], R);
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////

         float S = 0.05f;
         FactorySticker factory = FactorySticker.getInstance();
         factory.drawRoundedPolygon(canvas, paint, left, top, STICKERS[0], S, FACE_COLORS[face], R);
         factory.drawRoundedPolygon(canvas, paint, left, top, STICKERS[0], null, S, FACE_COLORS[face], R);
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////

src/main/java/org/distorted/objects/TwistyIvy.java
396	396	{
397	397	int COLORS = FACE_COLORS.length;
398	398	FactorySticker factory = FactorySticker.getInstance();
399		float S = 0.08f;
400		float R = 0.12f;
401	399
402	400	if( face<COLORS )
403	401	{
404		factory.drawIvyCornerSticker(canvas, paint, left, top, FACE_COLORS[face%COLORS], S, R);
	402	float S = 0.03f;
	403	float R = 0.02f;
	404
	405	float ANGLE = (float)(Math.PI/4);
	406
	407	float A = (+0.5f-IVY_M)*IVY_C;
	408	float B = (-0.5f-IVY_M)*IVY_C;
	409
	410	float[] vertices = new float[] { A, B, A, A, B, A };
	411	float[] angles = new float[] { 0, 0, ANGLE };
	412
	413	factory.drawRoundedPolygon(canvas, paint, left, top, vertices, angles, S, FACE_COLORS[face%COLORS], R);
405	414	}
406	415	else
407	416	{
408		factory.drawIvyCenterSticker(canvas, paint, left, top, FACE_COLORS[face%COLORS], S, R);
	417	float S = 0.08f;
	418	float R = 0.06f;
	419
	420	float ANGLE = (float)(Math.PI/4);
	421	float A = 0.50f-IVY_D;
	422
	423	float[] vertices = new float[] { -A, A, A, -A };
	424	float[] angles = new float[] { ANGLE, ANGLE };
	425
	426	factory.drawRoundedPolygon(canvas, paint, left, top, vertices, angles, S, FACE_COLORS[face%COLORS], R);
409	427	}
410	428	}
411	429

src/main/java/org/distorted/objects/TwistyJing.java
384	384	}
385	385
386	386	FactorySticker factory = FactorySticker.getInstance();
387		factory.drawRoundedPolygon(canvas, paint, left, top, STICKERS[stickerType], S, FACE_COLORS[face%COLORS], R);
	387	factory.drawRoundedPolygon(canvas, paint, left, top, STICKERS[stickerType], null, S, FACE_COLORS[face%COLORS], R);
388	388	}
389	389
390	390	///////////////////////////////////////////////////////////////////////////////////////////////////

src/main/java/org/distorted/objects/TwistyKilominx.java
646	646	float cy = STICKERS[0][3]/CENTER_CORR;
647	647
648	648	FactorySticker factory = FactorySticker.getInstance();
649		factory.drawRoundedPolygon(canvas, paint, left, top, STICKERS[0], S, FACE_COLORS[face%NUM_FACES], R);
	649	factory.drawRoundedPolygon(canvas, paint, left, top, STICKERS[0], null, S, FACE_COLORS[face%NUM_FACES], R);
650	650	canvas.drawCircle(left+(0.5f+cx)TEXTURE_HEIGHT, top+(0.5f-cy)TEXTURE_HEIGHT, 0.05f*TEXTURE_HEIGHT, paint);
651	651	}
652	652	else if( variant==0 ) // corner
...	...
654	654	float R = 0.10f;
655	655	float S = 0.11f;
656	656	FactorySticker factory = FactorySticker.getInstance();
657		factory.drawRoundedPolygon(canvas, paint, left, top, STICKERS[1], S, FACE_COLORS[face%COLORS], R);
	657	factory.drawRoundedPolygon(canvas, paint, left, top, STICKERS[1], null, S, FACE_COLORS[face%COLORS], R);
658	658	}
659	659	else // edge
660	660	{
661	661	float R = 0.10f;
662	662	float S = 0.10f;
663	663	FactorySticker factory = FactorySticker.getInstance();
664		factory.drawRoundedPolygon(canvas, paint, left, top, STICKERS[2], S, FACE_COLORS[face%COLORS], R);
	664	factory.drawRoundedPolygon(canvas, paint, left, top, STICKERS[2], null, S, FACE_COLORS[face%COLORS], R);
665	665	}
666	666	}
667	667

src/main/java/org/distorted/objects/TwistyMegaminx.java
555	555	}
556	556
557	557	FactorySticker factory = FactorySticker.getInstance();
558		factory.drawRoundedPolygon(canvas, paint, left, top, STICKERS[index], S, FACE_COLORS[face%COLORS], R);
	558	factory.drawRoundedPolygon(canvas, paint, left, top, STICKERS[index], null, S, FACE_COLORS[face%COLORS], R);
559	559	}
560	560
561	561	///////////////////////////////////////////////////////////////////////////////////////////////////

         float S = 0.08f;
         FactorySticker factory = FactorySticker.getInstance();
         factory.drawRoundedPolygon(canvas, paint, left, top, STICKERS[0], S, FACE_COLORS[face], R);
         factory.drawRoundedPolygon(canvas, paint, left, top, STICKERS[0], null, S, FACE_COLORS[face], R);
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////

src/main/java/org/distorted/objects/TwistyRedi.java
386	386	}
387	387
388	388	FactorySticker factory = FactorySticker.getInstance();
389		factory.drawRoundedPolygon(canvas, paint, left, top, STICKERS[stickerType], S, FACE_COLORS[face%COLORS], R);
	389	factory.drawRoundedPolygon(canvas, paint, left, top, STICKERS[stickerType], null, S, FACE_COLORS[face%COLORS], R);
390	390	}
391	391
392	392	///////////////////////////////////////////////////////////////////////////////////////////////////

src/main/java/org/distorted/objects/TwistyRex.java
567	567	else if( face<2*COLORS )
568	568	{
569	569	float[] vertices = { -REX_D,0.0f, 0.0f, -REX_D, +REX_D, 0.0f, 0.0f, +REX_D};
570		factory.drawRoundedPolygon(canvas, paint, left, top, vertices, S1, FACE_COLORS[face%COLORS], R4);
	570	factory.drawRoundedPolygon(canvas, paint, left, top, vertices, null, S1, FACE_COLORS[face%COLORS], R4);
571	571	}
572	572	else
573	573	{

src/main/java/org/distorted/objects/TwistySkewb.java
586	586	}
587	587
588	588	FactorySticker factory = FactorySticker.getInstance();
589		factory.drawRoundedPolygon(canvas, paint, left, top, STICKERS[index], S, FACE_COLORS[face%COLORS], R);
	589	factory.drawRoundedPolygon(canvas, paint, left, top, STICKERS[index], null, S, FACE_COLORS[face%COLORS], R);
590	590	}
591	591
592	592	///////////////////////////////////////////////////////////////////////////////////////////////////

src/main/java/org/distorted/objects/TwistySquare1.java
239	239	}
240	240
241	241	FactorySticker factory = FactorySticker.getInstance();
242		factory.drawRoundedPolygon(canvas, paint, left, top, STICKERS[stickerType], S, FACE_COLORS[face%COLORS], R);
	242	factory.drawRoundedPolygon(canvas, paint, left, top, STICKERS[stickerType], null, S, FACE_COLORS[face%COLORS], R);
243	243	}
244	244
245	245	///////////////////////////////////////////////////////////////////////////////////////////////////

src/main/java/org/distorted/objects/TwistySquare2.java
244	244	}
245	245
246	246	FactorySticker factory = FactorySticker.getInstance();
247		factory.drawRoundedPolygon(canvas, paint, left, top, STICKERS[stickerType], S, FACE_COLORS[face%COLORS], R);
	247	factory.drawRoundedPolygon(canvas, paint, left, top, STICKERS[stickerType], null, S, FACE_COLORS[face%COLORS], R);
248	248	}
249	249
250	250	///////////////////////////////////////////////////////////////////////////////////////////////////

src/main/java/org/distorted/objects/TwistyUltimate.java
357	357	}
358	358
359	359	FactorySticker factory = FactorySticker.getInstance();
360		factory.drawRoundedPolygon(canvas, paint, left, top, STICKERS[stickerType], S, FACE_COLORS[face%COLORS], R);
	360	factory.drawRoundedPolygon(canvas, paint, left, top, STICKERS[stickerType], null, S, FACE_COLORS[face%COLORS], R);
361	361	}
362	362
363	363	///////////////////////////////////////////////////////////////////////////////////////////////////

Project

General

Profile

Magic Cube

Revision 9ce78850

Added by Leszek Koltunski over 3 years ago