commit eae4b3b2996f3595e6ade716956dfb6ddba973fe Author: Leszek Koltunski Date: Sun Aug 8 22:45:52 2021 +0200 Convert bandaged Cubes to the standard mesh creation code. diff --git a/src/main/java/org/distorted/objects/TwistyBandaged3Plate.java b/src/main/java/org/distorted/objects/TwistyBandaged3Plate.java index afe4ad02..e3f5d349 100644 --- a/src/main/java/org/distorted/objects/TwistyBandaged3Plate.java +++ b/src/main/java/org/distorted/objects/TwistyBandaged3Plate.java @@ -43,7 +43,7 @@ class TwistyBandaged3Plate extends TwistyBandagedAbstract // One State means one arrangement of the three 2x2 'plates'. Such State precisely defines which // rotations of the Cube are possible. // There are 27 such states in total, but 2 of them are unreachable from the initial State, and - // 9 more and 'insignificant' - i.e. States which only permit rotation along a single axis. + // 9 more are 'insignificant' - i.e. States which only permit rotation along a single axis. // When doing an automatic scramble, we never want to enter such 'insignificant' states because // that would mean we'd have to do two rotations in a row along the same axis. // @@ -148,8 +148,6 @@ class TwistyBandaged3Plate extends TwistyBandagedAbstract case 1: mUseX = true ; mUseY = false; mUseZ = true ; break; case 2: mUseX = true ; mUseY = true ; mUseZ = false; break; } - - //android.util.Log.e("D", (info[0]==0 ? "X" : (info[0]==1 ? "Y" : "Z")) + info[2] +" --> "+info[3]); } /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/objects/TwistyBandagedAbstract.java b/src/main/java/org/distorted/objects/TwistyBandagedAbstract.java index 7eb65632..13cd64b5 100644 --- a/src/main/java/org/distorted/objects/TwistyBandagedAbstract.java +++ b/src/main/java/org/distorted/objects/TwistyBandagedAbstract.java @@ -24,17 +24,10 @@ import android.content.res.Resources; import org.distorted.helpers.FactoryCubit; import org.distorted.helpers.ObjectSticker; import org.distorted.library.effect.MatrixEffectQuaternion; -import org.distorted.library.effect.VertexEffect; -import org.distorted.library.effect.VertexEffectMove; -import org.distorted.library.effect.VertexEffectRotate; -import org.distorted.library.effect.VertexEffectScale; import org.distorted.library.main.DistortedEffects; import org.distorted.library.main.DistortedTexture; import org.distorted.library.mesh.MeshBase; -import org.distorted.library.mesh.MeshJoined; -import org.distorted.library.mesh.MeshPolygon; import org.distorted.library.mesh.MeshSquare; -import org.distorted.library.type.Static1D; import org.distorted.library.type.Static3D; import org.distorted.library.type.Static4D; @@ -178,7 +171,7 @@ abstract class TwistyBandagedAbstract extends TwistyObject { float[][] pos = getPositions(); - if( cubit>=0 && cubit< pos.length ) + if( cubit>=0 && cubit=0 && cubit< indices.length ) ? indices[cubit] : 0; } -/////////////////////////////////////////////////////////////////////////////////////////////////// - - private float[] createVertices(int A, int B) - { - float E = 0.5f / Math.max(A,B); - return new float[] { -A*E,-B*E, +A*E,-B*E, +A*E,+B*E, -A*E,+B*E }; - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - private MeshBase createCuboid(int[] dimensions) - { - FactoryCubit factory = FactoryCubit.getInstance(); - - int X = dimensions[0]; - int Y = dimensions[1]; - int Z = dimensions[2]; - - float[] verticesXY = createVertices(X,Y); - float[] verticesXZ = createVertices(X,Z); - float[] verticesYZ = createVertices(Z,Y); - - float defHeight = 0.048f; - - float[] bandsX = factory.computeBands( defHeight/X,65,0.25f,0.5f,5); - float[] bandsY = factory.computeBands( defHeight/Y,65,0.25f,0.5f,5); - float[] bandsZ = factory.computeBands( defHeight/Z,65,0.25f,0.5f,5); - - MeshBase[] meshes = new MeshPolygon[6]; - - meshes[0] = new MeshPolygon(verticesYZ,bandsX,1,2); - meshes[0].setEffectAssociation(0,1,0); - meshes[1] = meshes[0].copy(true); - meshes[1].setEffectAssociation(0,2,0); - meshes[2] = new MeshPolygon(verticesXZ,bandsY,1,2); - meshes[2].setEffectAssociation(0,4,0); - meshes[3] = meshes[2].copy(true); - meshes[3].setEffectAssociation(0,8,0); - meshes[4] = new MeshPolygon(verticesXY,bandsZ,1,2); - meshes[4].setEffectAssociation(0,16,0); - meshes[5] = meshes[4].copy(true); - meshes[5].setEffectAssociation(0,32,0); - - return new MeshJoined(meshes); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - private VertexEffect[] createCuboidEffects(int[] dimensions) - { - float X = dimensions[0]; - float Y = dimensions[1]; - float Z = dimensions[2]; - - float MAX_XY = Math.max(X,Y); - float MAX_XZ = Math.max(X,Z); - float MAX_YZ = Math.max(Z,Y); - - Static1D angle = new Static1D(90); - Static3D move = new Static3D( 0.0f, 0.0f, 0.5f); - Static3D axisX = new Static3D( 1.0f, 0.0f, 0.0f); - Static3D axisY = new Static3D( 0.0f, 1.0f, 0.0f); - Static3D center= new Static3D( 0.0f, 0.0f, 0.0f); - - Static3D scale3 = new Static3D(MAX_XY,MAX_XY,+Z); - Static3D scale4 = new Static3D(MAX_XY,MAX_XY,-Z); - Static3D scale5 = new Static3D(MAX_XZ,+Y,MAX_XZ); - Static3D scale6 = new Static3D(MAX_XZ,-Y,MAX_XZ); - Static3D scale7 = new Static3D(+X,MAX_YZ,MAX_YZ); - Static3D scale8 = new Static3D(-X,MAX_YZ,MAX_YZ); - - VertexEffect[] effect = new VertexEffect[9]; - - effect[0] = new VertexEffectMove(move); - effect[1] = new VertexEffectRotate(angle, axisX, center); - effect[2] = new VertexEffectRotate(angle, axisY, center); - effect[3] = new VertexEffectScale(scale3); - effect[4] = new VertexEffectScale(scale4); - effect[5] = new VertexEffectScale(scale5); - effect[6] = new VertexEffectScale(scale6); - effect[7] = new VertexEffectScale(scale7); - effect[8] = new VertexEffectScale(scale8); - - effect[1].setMeshAssociation(12,-1); // meshes 2,3 - effect[2].setMeshAssociation( 3,-1); // meshes 0,1 - effect[3].setMeshAssociation(16,-1); // mesh 4 - effect[4].setMeshAssociation(32,-1); // mesh 5 - effect[5].setMeshAssociation( 8,-1); // mesh 3 - effect[6].setMeshAssociation( 4,-1); // mesh 2 - effect[7].setMeshAssociation( 1,-1); // mesh 0 - effect[8].setMeshAssociation( 2,-1); // mesh 1 - - return effect; - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - private MeshBase createCuboidMesh(int[] dimensions) - { - MeshBase mesh = createCuboid(dimensions); - VertexEffect[] effects = createCuboidEffects(dimensions); - for( VertexEffect effect : effects ) mesh.apply(effect); - - int X = dimensions[0]; - int Y = dimensions[1]; - int Z = dimensions[2]; - - float strength = 0.04f; - float radius = 0.15f; - - Static3D[] vertices = new Static3D[1]; - Static3D center; - FactoryCubit factory = FactoryCubit.getInstance(); - - vertices[0] = new Static3D(+0.5f*X,+0.5f*Y,+0.5f*Z); - center = new Static3D(+0.5f*(X-1),+0.5f*(Y-1),+0.5f*(Z-1)); - factory.roundCorners(mesh, center, vertices, strength, radius); - - vertices[0] = new Static3D(+0.5f*X,+0.5f*Y,-0.5f*Z); - center = new Static3D(+0.5f*(X-1),+0.5f*(Y-1),-0.5f*(Z-1)); - factory.roundCorners(mesh, center, vertices, strength, radius); - - vertices[0] = new Static3D(+0.5f*X,-0.5f*Y,+0.5f*Z); - center = new Static3D(+0.5f*(X-1),-0.5f*(Y-1),+0.5f*(Z-1)); - factory.roundCorners(mesh, center, vertices, strength, radius); - - vertices[0] = new Static3D(+0.5f*X,-0.5f*Y,-0.5f*Z); - center = new Static3D(+0.5f*(X-1),-0.5f*(Y-1),-0.5f*(Z-1)); - factory.roundCorners(mesh, center, vertices, strength, radius); - - vertices[0] = new Static3D(-0.5f*X,+0.5f*Y,+0.5f*Z); - center = new Static3D(-0.5f*(X-1),+0.5f*(Y-1),+0.5f*(Z-1)); - factory.roundCorners(mesh, center, vertices, strength, radius); - - vertices[0] = new Static3D(-0.5f*X,+0.5f*Y,-0.5f*Z); - center = new Static3D(-0.5f*(X-1),+0.5f*(Y-1),-0.5f*(Z-1)); - factory.roundCorners(mesh, center, vertices, strength, radius); - - vertices[0] = new Static3D(-0.5f*X,-0.5f*Y,+0.5f*Z); - center = new Static3D(-0.5f*(X-1),-0.5f*(Y-1),+0.5f*(Z-1)); - factory.roundCorners(mesh, center, vertices, strength, radius); - - vertices[0] = new Static3D(-0.5f*X,-0.5f*Y,-0.5f*Z); - center = new Static3D(-0.5f*(X-1),-0.5f*(Y-1),-0.5f*(Z-1)); - factory.roundCorners(mesh, center, vertices, strength, radius); - - mesh.mergeEffComponents(); - - return mesh; - } - /////////////////////////////////////////////////////////////////////////////////////////////////// MeshBase createCubitMesh(int cubit, int numLayers) @@ -372,9 +214,66 @@ abstract class TwistyBandagedAbstract extends TwistyObject int LEN = mDimensions.length; mMeshes = new MeshBase[LEN]; + final int[][] vert_indices = + { + {2,3,1,0}, + {7,6,4,5}, + {6,2,0,4}, + {3,7,5,1}, + {4,0,1,5}, + {7,3,2,6}, + }; + + float defHeight = 0.048f; + int[] bandIndexes = new int[] { 0,0,1,1,2,2 }; + float[][] corners = new float[][] { {0.04f,0.15f} }; + int[] cornerIndexes = new int[] { 0,0,0,0,0,0,0,0 }; + int[] centerIndexes = new int[] { 0,1,2,3,4,5,6,7 }; + for(int i=0; i