/ - Diff - TwistyPuzzleLib - Distorted Android

« Previous | Next »

Revision a0ccffb4

Added by Leszek Koltunski about 2 years ago

ID a0ccffb497c803571a65ba15cdc59995f6703bb3
Parent 6ddadae2
Child e7587264

FactorySticker: further improvements.

     ///////////////////////////////////////////////////////////////////////////////////////////////////
       private void drawCurrSide(Canvas canvas, Paint paint, int left, int top, float stroke,
       private void drawCurrSide(Canvas canvas, Paint paint, int left, int bottom, float stroke,
                                 float pX, float pY, float cX, float cY, float pAngle)
+        {
         pX = (0.5f+pX)*TEXTURE_HEIGHT;
-...
           // draw a little more - stroke*(aX,aY) more - so
           // that we draw over the rounded corners (Kilominx!)
           canvas.drawLine(left+pX,top+pY,left+cX-stroke*aX,top+cY-stroke*aY,paint);
           canvas.drawLine(left+pX,bottom-pY,left+cX-stroke*aX,bottom-cY+stroke*aY,paint);
+          }
         else
+          {
-...
           float dx = ox-pX;
           float dy = oy-pY;
           float startA = computeAngle(dy,dx);
           float sweepA = -2*pAngle;
           float startA = computeAngle(-dy,dx);
           float sweepA = 2*pAngle;
           startA *= 180/PI;
           sweepA *= 180/PI;
           canvas.drawArc( left+ox-r, top+oy-r, left+ox+r, top+oy+r, startA, sweepA, false, paint);
           canvas.drawArc( left+ox-r, bottom-oy-r, left+ox+r, bottom-oy+r, startA, sweepA, false, paint);
+          }
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     // quotient in (0,1).
     // quotient==0 --> ret=curvature; quotient==1 --> ret=0.
       private float computeSideAngle(float vX, float vY, float curvature)
       private float computeQuotientOfCurvature(float quotient, float curvature)
+        {
         float ret = computeAngle(vX,vY)+curvature;
         if( curvature!=0 )
+          {
           double sinC = Math.sin(curvature);
           float arcsin = (float)Math.asin(quotient*sinC);
           return curvature-arcsin;
+          }
         return curvature;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       private float computeSideAngle(float vX, float vY, float radius, float curvature)
+        {
         float quotient = radius/(float)Math.sqrt(vX*vX + vY*vY);
         float ret = computeAngle(vX,-vY)-computeQuotientOfCurvature(quotient,curvature);
         if( ret>=2*PI ) ret -= 2*PI;
         if( ret<0     ) ret += 2*PI;
-...
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       private void drawRoundCorner(Canvas canvas, Paint paint,int color, int left, int top, float stroke,
                                   float radius, float currX, float currY, float pA, float cA)
       private void drawRoundCorner(Canvas canvas, Paint paint,int color, int left, int bottom, float stroke,
                                   float radius, float cX, float cY, float pA, float cA)
+        {
         currX = (0.5f+currX)*TEXTURE_HEIGHT;
         currY = (0.5f-currY)*TEXTURE_HEIGHT;
         cX = (0.5f+cX)*TEXTURE_HEIGHT;
         cY = (0.5f-cY)*TEXTURE_HEIGHT;
         float R = radius*TEXTURE_HEIGHT + stroke/2;
         boolean isConvex = (!(pA<cA && cA<pA+PI) && !(pA<cA+2*PI && cA+2*PI<pA+PI));
         boolean isConvex = ((pA<cA && cA<pA+PI) || (pA<cA+2*PI && cA+2*PI<pA+PI));
         float startA, stopA, centerA, alpha, D;
         if( isConvex )
+          {
           startA = cA + PI;
           stopA  = pA + PI;
           startA = cA;
           stopA  = pA;
           if( startA>2*PI ) startA -= 2*PI;
           if( stopA >2*PI ) stopA  -= 2*PI;
           centerA= angleMidpoint(pA,cA) - PI/2;
-...
+          }
         else
+          {
           startA = pA;
           stopA  = cA;
           startA = pA + PI;
           stopA  = cA + PI;
           centerA= angleMidpoint(pA,cA) + PI/2;
           if( centerA>=2*PI ) centerA -= 2*PI;
           float diff = centerA-cA;
-...
           D = (float)((R-stroke)/Math.sin(alpha));
+          }
         float sweepA = stopA-startA;
         float sweepA = startA-stopA;
         if( sweepA<0 ) sweepA += 2*PI;
         sweepA = -sweepA;
         float sinA = (float)(Math.sin(centerA));
         float cosA = (float)(Math.cos(centerA));
         float oX= currX - D*sinA;
         float oY= currY + D*cosA;
         float oX= cX + D*sinA;
         float oY= cY + D*cosA;
         startA *= 180/PI;
         sweepA *= 180/PI;
         if( !isConvex ) paint.setColor(color);
         canvas.drawArc( left+oX-R, top+oY-R, left+oX+R, top+oY+R, startA, sweepA, false, paint);
         canvas.drawArc( left+oX-R, bottom-oY-R, left+oX+R, bottom-oY+R, startA, sweepA, false, paint);
         if( !isConvex ) paint.setColor(COLOR_STROKE);
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     // PUBLIC
       public void drawRoundedPolygon(Canvas canvas, Paint paint, int left, int top, int color, ObjectSticker sticker)
       public void drawRoundedPolygon(Canvas canvas, Paint paint, int left, int bottom, int color, ObjectSticker sticker)
+        {
         float stroke = sticker.getStroke();
         float[] vertices = sticker.getCoords();
-...
         paint.setStyle(Paint.Style.FILL);
         canvas.save();
         canvas.clipRect(left,top,left+TEXTURE_HEIGHT,top+TEXTURE_HEIGHT);
         canvas.drawRect(left,top,left+TEXTURE_HEIGHT,top+TEXTURE_HEIGHT,paint);
         canvas.clipRect(left,bottom-TEXTURE_HEIGHT,left+TEXTURE_HEIGHT,bottom);
         canvas.drawRect(left,bottom-TEXTURE_HEIGHT,left+TEXTURE_HEIGHT,bottom,paint);
         paint.setColor(COLOR_STROKE);
         paint.setStyle(Paint.Style.STROKE);
-...
         for(int vert=0; vert<numVertices; vert++)
+          {
           drawCurrSide(canvas,paint,left,top,stroke,prevX,prevY,currX,currY,prevA);
           drawCurrSide(canvas,paint,left,bottom,stroke,prevX,prevY,currX,currY,prevA);
           prevX = currX;
           prevY = currY;
-...
         for(int vert=0; vert<numVertices; vert++)
+          {
           float prevAngle = computeSideAngle(currX-prevX,currY-prevY,-prevA);
           float currAngle = computeSideAngle(nextX-currX,nextY-currY,+currA);
           drawRoundCorner(canvas,paint,color,left,top,stroke,radii[vert],currX,currY,prevAngle,currAngle);
           int prev = vert==0 ? numVertices-1 : vert-1;
           float prevAngle = computeSideAngle(currX-prevX,currY-prevY,radii[prev],-prevA);
           float currAngle = computeSideAngle(nextX-currX,nextY-currY,radii[vert],+currA);
           drawRoundCorner(canvas,paint,color,left,bottom,stroke,radii[vert],currX,currY,prevAngle,currAngle);
           prevX = currX;
           prevY = currY;

src/main/java/org/distorted/objectlib/main/TwistyObject.java
1336	1336	if( texture>=mNumTextures ) break;
1337	1337	ObjectSticker sticker = retSticker(texture/mNumFaceColors);
1338	1338	int color = getColor(texture% mNumFaceColors);
1339		factory.drawRoundedPolygon(canvas, paint, colTEXTURE_HEIGHT, rowTEXTURE_HEIGHT, color, sticker);
	1339	factory.drawRoundedPolygon(canvas, paint, colTEXTURE_HEIGHT, (mNumTexRows-row)TEXTURE_HEIGHT, color, sticker);
1340	1340	texture++;
1341	1341	}
1342	1342	}
...	...
1347	1347	{
1348	1348	if( mBitmap==null ) createTexture();
1349	1349
1350		if( !mTexture.setTexture(mBitmap) )
	1350	if( !mTexture.setTextureAlreadyInverted(mBitmap) )
1351	1351	{
1352	1352	int max = DistortedLibrary.getMaxTextureSize();
1353	1353	mInterface.reportProblem("failed to set texture of size "+mBitmap.getWidth()+"x"+mBitmap.getHeight()+" max is "+max, true);

src/main/java/org/distorted/objectlib/objects/TwistyVoid.java
364	364
365	365	public float getStickerRadius()
366	366	{
367		return 0.02f;
	367	return 0.05f;
368	368	}
369	369
370	370	///////////////////////////////////////////////////////////////////////////////////////////////////

Also available in: Unified diff

Project

General

Profile

TwistyPuzzleLib

Revision a0ccffb4

Added by Leszek Koltunski about 2 years ago