/ - Diff - Magic Cube - Distorted Android

         Static3D center = new Static3D(0.0f,0.0f,-H);
         Static3D[] vertices = new Static3D[1];
         vertices[0] = new Static3D(+G,-G,+0.0f);
         roundCorners(mesh,center,vertices,0.12f,0.15f);
         roundCorners(mesh,center,vertices,0.08f,0.10f);
         mesh.mergeEffComponents();
         mesh.addEmptyTexComponent();
-...
         Static3D[] vertices = new Static3D[2];
         vertices[0] = new Static3D(+0.5f,+0.0f,+0.0f);
         vertices[1] = new Static3D(-0.5f,+0.0f,+0.0f);
         roundCorners(mesh,center,vertices,0.08f,0.15f);
         roundCorners(mesh,center,vertices,0.06f,0.10f);
         mesh.mergeEffComponents();

+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     // TODO
       void drawRexCornerSticker(Canvas canvas, Paint paint, int left, int top, int color, float stroke, float radius)
+        {
-...
         paint.setStyle(Paint.Style.STROKE);
         paint.setStrokeWidth(stroke*TEXTURE_HEIGHT);
         float T  = (0.5f-REX_D)*SQ2*(SQ3-1);
         float H1 = T*(1.0f + 2*SQ3/3);
         float H2 = T*(0.5f +   SQ3/6);
         float F  = (0.5f-REX_D)*SQ2*(SQ3-1);
         float H1 = F*(1.0f + 2*SQ3/3);
         float H2 = F*(0.5f +   SQ3/6);
         float D  = H2*SQ3;
         float cx1 = left+ TEXTURE_HEIGHT*0.5f;
-...
         canvas.drawArc( cx1-R1, cy1-R1, cx1+R1, cy1+R1, 255, 30, false ,paint);
         canvas.drawArc( cx2-R1, cy2-R1, cx2+R1, cy2+R1, 315, 30, false ,paint);
         canvas.drawArc( cx3-R1, cy3-R1, cx3+R1, cy3+R1, 195, 30, false ,paint);
     /*
         float cx   = left+ TEXTURE_HEIGHT*0.5f;
         float cy   = top + TEXTURE_HEIGHT*0.5f;
         float R2   = radius*TEXTURE_HEIGHT;
         float dist = ( (0.5f-REX_D)*(SQ3-1) - (2*SQ3/3)*radius )*TEXTURE_HEIGHT;
         canvas.drawArc( cx+dist-R2, cy-R2, cx+dist+R2, cy+R2, 330, 60, false ,paint);
         canvas.drawArc( cx-R2, cy+dist-R2, cx+R2, cy+dist+R2,  60, 60, false ,paint);
         canvas.drawArc( cx-dist-R2, cy-R2, cx-dist+R2, cy+R2, 150, 60, false ,paint);
         canvas.drawArc( cx-R2, cy-dist-R2, cx+R2, cy-dist+R2, 240, 60, false ,paint);
      */
         float dist = ( (SQ3/3)*F - SQ2*radius )*TEXTURE_HEIGHT;
         float dist2= 1.0f*(SQ3/3)*F*TEXTURE_HEIGHT;
         float tmp  = SQ2*radius*TEXTURE_HEIGHT;
         float distX= (SQ3/2)*dist2 - 1.05f*tmp;
         float distY= (0.5f )*dist2 - 0.90f*tmp;
         canvas.drawArc( cx      -R2, cy-dist -R2, cx      +R2, cy-dist +R2, 225, 90, false ,paint);
         canvas.drawArc( cx-distX-R2, cy+distY-R2, cx-distX+R2, cy+distY+R2,  75,120, false ,paint);
         canvas.drawArc( cx+distX-R2, cy+distY-R2, cx+distX+R2, cy+distY+R2, 345,120, false ,paint);
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
-...
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     // TODO
       void drawRexEdgeSticker(Canvas canvas, Paint paint, int left, int top, int color, float stroke, float radius)
+        {
         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);
         final float D = 0.5f - REX_D;
         final float F = 0.5f*(0.5f - D*(SQ3-1));
         float cx1 = left+ TEXTURE_HEIGHT*REX_D;
         float cy  = top + TEXTURE_HEIGHT*(1-REX_D-F+0.5f);
         float cx2 = left+ TEXTURE_HEIGHT*(1-REX_D);
         float R1  = 1.0f*TEXTURE_HEIGHT*(1-2*REX_D);
         canvas.drawArc( cx1-R1, cy-R1, cx1+R1, cy+R1, 270, 30, false ,paint);
         canvas.drawArc( cx2-R1, cy-R1, cx2+R1, cy+R1, 240, 30, false ,paint);
         float cx = left + TEXTURE_HEIGHT*0.5f;
         float R2 = radius*TEXTURE_HEIGHT;
         cy       = top + TEXTURE_HEIGHT*(0.5f+F-(2*SQ3/3)*radius);
         canvas.drawArc( cx-R2, cy-R2, cx+R2, cy+R2, 60, 60, false ,paint);
         cy = top + (0.5f-F)*TEXTURE_HEIGHT;
         paint.setStrokeWidth(0.6f*stroke*TEXTURE_HEIGHT);
         canvas.drawLine(left, cy, left+TEXTURE_HEIGHT, cy, paint);
+        }
+      }

src/main/java/org/distorted/objects/TwistyRex.java
352	352	{
353	353	int COLORS = FACE_COLORS.length;
354	354	FactorySticker factory = FactorySticker.getInstance();
355		float S = 0.08f;
356		float R = 0.12f;
	355	float S = 0.04f;
	356	float R1 = 0.12f;
	357	float R2 = 0.06f;
357	358
358	359	if( face<COLORS )
359	360	{
360		factory.drawRexCornerSticker(canvas, paint, left, top, FACE_COLORS[face%COLORS], S, R);
	361	factory.drawRexCornerSticker(canvas, paint, left, top, FACE_COLORS[face%COLORS], S, R2);
361	362	}
362	363	else if( face<2*COLORS )
363	364	{
364		factory.drawRexFaceSticker(canvas, paint, left, top, FACE_COLORS[face%COLORS], S, R);
	365	factory.drawRexFaceSticker(canvas, paint, left, top, FACE_COLORS[face%COLORS], S, R1);
365	366	}
366	367	else
367	368	{
368		factory.drawRexEdgeSticker(canvas, paint, left, top, FACE_COLORS[face%COLORS], S, R);
	369	factory.drawRexEdgeSticker(canvas, paint, left, top, FACE_COLORS[face%COLORS], S, R1);
369	370	}
370	371	}
371	372

Project

General

Profile

Magic Cube

Revision 0b8ffe1a

Added by Leszek Koltunski almost 4 years ago