commit f18e8faed91ab14ca8abd237861d4d1b3eb9b7fc Author: Leszek Koltunski Date: Tue Sep 29 21:33:26 2020 +0100 Simplify drawing textures. diff --git a/src/main/java/org/distorted/main/RubikPreRender.java b/src/main/java/org/distorted/main/RubikPreRender.java index 38cbed91..ffa3caa5 100644 --- a/src/main/java/org/distorted/main/RubikPreRender.java +++ b/src/main/java/org/distorted/main/RubikPreRender.java @@ -121,7 +121,7 @@ public class RubikPreRender implements EffectListener if( mScreenWidth!=0 ) { - mNewObject.recomputeScaleFactor(mScreenWidth, mScreenHeight); + mNewObject.recomputeScaleFactor(mScreenWidth); } mIsSolved = mNewObject.isSolved(); @@ -361,7 +361,7 @@ public class RubikPreRender implements EffectListener if( mNewObject!=null ) { mNewObject.createTexture(); - mNewObject.recomputeScaleFactor(width,height); + mNewObject.recomputeScaleFactor(width); } mScreenHeight = height; diff --git a/src/main/java/org/distorted/objects/TwistyCube.java b/src/main/java/org/distorted/objects/TwistyCube.java index 58b082b5..9ffeb221 100644 --- a/src/main/java/org/distorted/objects/TwistyCube.java +++ b/src/main/java/org/distorted/objects/TwistyCube.java @@ -127,13 +127,13 @@ class TwistyCube extends TwistyObject // paint the square with upper-right corner at (left,top) and side length 'side' with texture // for face 'face'. - void createFaceTexture(Canvas canvas, Paint paint, int face, int left, int top, int side) + void createFaceTexture(Canvas canvas, Paint paint, int face, int left) { - final float R = side*0.10f; - final float M = side*0.05f; + final float R = TEXTURE_HEIGHT*0.10f; + final float M = TEXTURE_HEIGHT*0.05f; paint.setColor(FACE_COLORS[face]); - canvas.drawRoundRect( left+M, top+M, left+side-M, top+side-M, R, R, paint); + canvas.drawRoundRect( left+M, M, left+TEXTURE_HEIGHT-M, TEXTURE_HEIGHT-M, R, R, paint); } /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -210,8 +210,8 @@ class TwistyCube extends TwistyObject int getFaceColor(int cubit, int cubitface, int size) { - boolean belongs = isOnFace(cubit, cubitface/2, cubitface%2==0 ? size-1:0 ); - return belongs ? cubitface : NUM_FACES; + float diff = CUBITS[cubit].mRotationRow[cubitface/2] - (cubitface%2==0 ? size-1:0); + return diff*diff < 0.0001f ? cubitface : NUM_FACES; } /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/objects/TwistyDiamond.java b/src/main/java/org/distorted/objects/TwistyDiamond.java index 66cec4b0..db472e93 100644 --- a/src/main/java/org/distorted/objects/TwistyDiamond.java +++ b/src/main/java/org/distorted/objects/TwistyDiamond.java @@ -246,35 +246,35 @@ public class TwistyDiamond extends TwistyObject /////////////////////////////////////////////////////////////////////////////////////////////////// - void createFaceTexture(Canvas canvas, Paint paint, int face, int left, int top, int side) + void createFaceTexture(Canvas canvas, Paint paint, int face, int left) { - float STROKE = 0.044f*side; + float STROKE = 0.044f*TEXTURE_HEIGHT; float OFF = STROKE/2 -1; - float OFF2 = 0.5f*side + OFF; - float HEIGHT = side - OFF; - float RADIUS = side/12.0f; - float ARC1_H = 0.2f*side; - float ARC1_W = side*0.5f; - float ARC2_W = 0.153f*side; - float ARC2_H = 0.905f*side; - float ARC3_W = side-ARC2_W; + float OFF2 = 0.5f*TEXTURE_HEIGHT + OFF; + float HEIGHT = TEXTURE_HEIGHT - OFF; + float RADIUS = TEXTURE_HEIGHT/12.0f; + float ARC1_H = 0.2f*TEXTURE_HEIGHT; + float ARC1_W = TEXTURE_HEIGHT*0.5f; + float ARC2_W = 0.153f*TEXTURE_HEIGHT; + float ARC2_H = 0.905f*TEXTURE_HEIGHT; + float ARC3_W = TEXTURE_HEIGHT-ARC2_W; float M = SQ3/2; - float D = (M/2 - 0.51f)*side; + float D = (M/2 - 0.51f)*TEXTURE_HEIGHT; paint.setAntiAlias(true); paint.setStrokeWidth(STROKE); paint.setColor(FACE_COLORS[face]); paint.setStyle(Paint.Style.FILL); - canvas.drawRect(left,top,left+side,top+side,paint); + canvas.drawRect(left,0,left+TEXTURE_HEIGHT,TEXTURE_HEIGHT,paint); paint.setColor(INTERIOR_COLOR); paint.setStyle(Paint.Style.STROKE); - canvas.drawLine( left, M*HEIGHT+D, side +left, M*HEIGHT+D, paint); - canvas.drawLine( OFF +left, M*side +D, OFF2 +left, D, paint); - canvas.drawLine((side-OFF)+left, M*side +D, (side-OFF2) +left, D, paint); + canvas.drawLine( left, M*HEIGHT+D, TEXTURE_HEIGHT +left, M*HEIGHT+D, paint); + canvas.drawLine( OFF +left, M*TEXTURE_HEIGHT+D, OFF2 +left, D, paint); + canvas.drawLine((TEXTURE_HEIGHT-OFF)+left, M*TEXTURE_HEIGHT+D, (TEXTURE_HEIGHT-OFF2) +left, D, paint); canvas.drawArc( ARC1_W-RADIUS+left, M*(ARC1_H-RADIUS)+D, ARC1_W+RADIUS+left, M*(ARC1_H+RADIUS)+D, 225, 90, false, paint); canvas.drawArc( ARC2_W-RADIUS+left, M*(ARC2_H-RADIUS)+D, ARC2_W+RADIUS+left, M*(ARC2_H+RADIUS)+D, 105, 90, false, paint); diff --git a/src/main/java/org/distorted/objects/TwistyDino.java b/src/main/java/org/distorted/objects/TwistyDino.java index 5eb09de1..032acc6e 100644 --- a/src/main/java/org/distorted/objects/TwistyDino.java +++ b/src/main/java/org/distorted/objects/TwistyDino.java @@ -206,19 +206,19 @@ public abstract class TwistyDino extends TwistyObject /////////////////////////////////////////////////////////////////////////////////////////////////// - void createFaceTexture(Canvas canvas, Paint paint, int face, int left, int top, int side) + void createFaceTexture(Canvas canvas, Paint paint, int face, int left) { - float STROKE = 0.04f*side; + float STROKE = 0.04f*TEXTURE_HEIGHT; float L= left; - float H= 0.333f*side; - float LEN = 0.5f*side; + float H= 0.333f*TEXTURE_HEIGHT; + float LEN = 0.5f*TEXTURE_HEIGHT; paint.setAntiAlias(true); paint.setStrokeWidth(STROKE); paint.setColor(FACE_COLORS[face]); paint.setStyle(Paint.Style.FILL); - canvas.drawRect(left,top,left+side,top+side,paint); + canvas.drawRect(left,0,left+TEXTURE_HEIGHT,TEXTURE_HEIGHT,paint); paint.setColor(INTERIOR_COLOR); paint.setStyle(Paint.Style.STROKE); @@ -227,19 +227,19 @@ public abstract class TwistyDino extends TwistyObject canvas.drawLine( L , H, L+ LEN, H+LEN, paint); canvas.drawLine( L+2*LEN, H, L+ LEN, H+LEN, paint); - float S1 = 0.150f*side; - float S2 = 0.090f*side; + float S1 = 0.150f*TEXTURE_HEIGHT; + float S2 = 0.090f*TEXTURE_HEIGHT; float X = 0.7f*S2; float Y = 0.2f*S1; - float LA = left+0.500f*side; + float LA = left+0.500f*TEXTURE_HEIGHT; float RA = left; - float TA = 0.333f*side; - float BA = 0.833f*side; + float TA = 0.333f*TEXTURE_HEIGHT; + float BA = 0.833f*TEXTURE_HEIGHT; - canvas.drawArc( RA+X , TA , RA+X+S2 , TA+S2, 135,135, false, paint); - canvas.drawArc( RA+side-S2-X, TA , RA+side-X, TA+S2, 270,135, false, paint); - canvas.drawArc( LA-S1/2 , BA-S1-Y, LA+S1/2 , BA-Y , 45, 90, false, paint); + canvas.drawArc( RA+X , TA , RA+X+S2 , TA+S2, 135,135, false, paint); + canvas.drawArc( RA+TEXTURE_HEIGHT-S2-X, TA , RA+TEXTURE_HEIGHT-X, TA+S2, 270,135, false, paint); + canvas.drawArc( LA-S1/2 , BA-S1-Y, LA+S1/2 , BA-Y , 45, 90, false, paint); } /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/objects/TwistyHelicopter.java b/src/main/java/org/distorted/objects/TwistyHelicopter.java index 89aae476..bb31a605 100644 --- a/src/main/java/org/distorted/objects/TwistyHelicopter.java +++ b/src/main/java/org/distorted/objects/TwistyHelicopter.java @@ -285,19 +285,19 @@ public class TwistyHelicopter extends TwistyObject /////////////////////////////////////////////////////////////////////////////////////////////////// - void createFaceTexture(Canvas canvas, Paint paint, int face, int left, int top, int side) + void createFaceTexture(Canvas canvas, Paint paint, int face, int left) { - float STROKE = 0.035f*side; - float L= left+0.125f*side; - float H= 0.375f*side; - float LEN = 0.5f*side; + float STROKE = 0.035f*TEXTURE_HEIGHT; + float L= left+0.125f*TEXTURE_HEIGHT; + float H= 0.375f*TEXTURE_HEIGHT; + float LEN = 0.5f*TEXTURE_HEIGHT; paint.setAntiAlias(true); paint.setStrokeWidth(STROKE); paint.setColor(FACE_COLORS[face]); paint.setStyle(Paint.Style.FILL); - canvas.drawRect(left,top,left+side,top+side,paint); + canvas.drawRect(left,0,left+TEXTURE_HEIGHT,TEXTURE_HEIGHT,paint); paint.setColor(INTERIOR_COLOR); paint.setStyle(Paint.Style.STROKE); @@ -306,14 +306,14 @@ public class TwistyHelicopter extends TwistyObject canvas.drawLine( L , H, L+LEN, H+LEN, paint); canvas.drawLine( L+LEN, H, L+LEN, H+LEN, paint); - float S1 = 0.125f*side; - float S2 = 0.070f*side; + float S1 = 0.125f*TEXTURE_HEIGHT; + float S2 = 0.070f*TEXTURE_HEIGHT; float X = 0.7f*S2; - float LA = left+0.625f*side; - float RA = left+0.125f*side; - float TA = 0.375f*side; - float BA = 0.875f*side; + float LA = left+0.625f*TEXTURE_HEIGHT; + float RA = left+0.125f*TEXTURE_HEIGHT; + float TA = 0.375f*TEXTURE_HEIGHT; + float BA = 0.875f*TEXTURE_HEIGHT; canvas.drawArc( LA-S1, TA , LA , TA+S1, 270, 90, false, paint); canvas.drawArc( RA+X , TA , RA+X+S2, TA+S2, 135,135, false, paint); diff --git a/src/main/java/org/distorted/objects/TwistyObject.java b/src/main/java/org/distorted/objects/TwistyObject.java index fdb20cfb..bbda57ea 100644 --- a/src/main/java/org/distorted/objects/TwistyObject.java +++ b/src/main/java/org/distorted/objects/TwistyObject.java @@ -73,7 +73,7 @@ public abstract class TwistyObject extends DistortedNode private static final Static3D CENTER = new Static3D(0,0,0); static final int INTERIOR_COLOR = 0xff000000; private static final int POST_ROTATION_MILLISEC = 500; - private static final int TEXTURE_HEIGHT = 256; + static final int TEXTURE_HEIGHT = 256; final Static3D[] ROTATION_AXIS; final Static4D[] QUATS; @@ -340,15 +340,10 @@ public abstract class TwistyObject extends DistortedNode } /////////////////////////////////////////////////////////////////////////////////////////////////// -// we cannot use belongsToRotation for deciding if to texture a face. Counterexample: the 'rotated' -// tetrahedrons of Pyraminx nearby the edge: they belong to rotation but their face which is rotated -// away from the face of the Pyraminx shouldn't be textured. - boolean isOnFace( int cubit, int axis, int row) + void drawRoundedPolygon() { - final float MAX_ERROR = 0.0001f; - float diff = CUBITS[cubit].mRotationRow[axis] - row; - return diff*diff < MAX_ERROR; + } /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -409,7 +404,7 @@ public abstract class TwistyObject extends DistortedNode for(int i=0; i