/src/main/java/org/distorted/objects/FactoryCubit.java - Diff - Magic Cube - Distorted Android

« Previous | Next »

Revision 16f34a98

Added by Leszek Koltunski about 3 years ago

ID 16f34a980a599bd8e121b4cdfc16a5dc7cee6711
Parent b5347187
Child 7a606778

Progress with any size Kilominx.

     ///////////////////////////////////////////////////////////////////////////////////////////////////
       MeshBase createFacesMegaminxCorner(int numLayers)
       MeshBase createFacesMinxCorner(int numLayers)
+        {
         MeshBase[] meshes = new MeshPolygon[6];
-...
         return new MeshJoined(meshes);
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       MeshBase createFacesKilominxEdge(int numLayers, float width, float height)
+        {
          MeshBase[] meshes = new MeshPolygon[6];
         float D = height/COS18;
         float W = D*SIN18;
         float X1 = height/2;
         float Y1 = width/2;
         float Y2 = (width+W)/2;
         float X3 = D*SIN54;
         float Y3 = D*COS54;
         float X4 = height*SIN_HALFD;
         float Y4 = height*COS_HALFD;
         float[] vertices0 = { -X1,-Y1, X1, -Y1, X1, Y1+W,-X1, Y1 };
         float[] vertices1 = { -X1,-Y2, X1, -Y2, X1, Y2+W,-X1, Y2 };
         float[] vertices2 = { -X3, 0.0f, 0.0f, -Y3, X3, 0.0f, 0.0f, Y3 };
         float[] vertices3 = { -X4, 0.0f, 0.0f, -Y4, X4, 0.0f, 0.0f, Y4 };
         int numBands0 = numLayers<=5 ? 5 : 3;
         int numBands1 = numLayers<=5 ? 3 : 2;
         float h       = numLayers<=5 ? 0.03f : 0.03f;
         float[] bands0 = computeBands(h    ,34,0.2f,0.2f,numBands0);
         float[] bands1 = computeBands(0.01f,34,0.3f,0.2f,numBands1);
         meshes[0] = new MeshPolygon(vertices0, bands0, 1, 1);
         meshes[0].setEffectAssociation(0, 1,0);
         meshes[1] = meshes[0].copy(true);
         meshes[1].setEffectAssociation(0, 2,0);
         meshes[2] = new MeshPolygon(vertices1, bands1, 0, 0);
         meshes[2].setEffectAssociation(0, 4,0);
         meshes[3] = meshes[2].copy(true);
         meshes[3].setEffectAssociation(0, 8,0);
         meshes[4] = new MeshPolygon(vertices2, bands1, 1, 2);
         meshes[4].setEffectAssociation(0,16,0);
         meshes[5] = new MeshPolygon(vertices3, bands1, 1, 2);
         meshes[5].setEffectAssociation(0,32,0);
         return new MeshJoined(meshes);
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       MeshBase createFacesMegaminxEdge(int numLayers, float width, float height)
-...
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       VertexEffect[] createVertexEffectsMegaminxCorner(int numLayers)
       VertexEffect[] createVertexEffectsMinxCorner(float width)
+        {
         VertexEffect[] effect = new VertexEffect[9];
-...
         float sinA = (2*SIN54*SIN54-1)/COS54;
         float cosA = (float)Math.sqrt(1-sinA*sinA);
         float LEN  = 0.5f/SIN54;
         float scale= (numLayers/3.0f)*(0.5f-MEGA_D)/(LEN*0.5f*(numLayers-1));
         float scale= width/LEN;
         Static3D axisA = new Static3D( SIN54, COS54, 0.0f);
         Static3D axisB = new Static3D(-SIN54, COS54, 0.0f);
-...
         return effect;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       VertexEffect[] createVertexEffectsKilominxEdge(float width, float height, boolean left)
+        {
         VertexEffect[] effect = new VertexEffect[11 + (left ? 0:1)];
         float D = height/COS18;
         float W = D*SIN18;
         float X1 = height/2;
         float Y1 = width/2;
         float Y2 = (width+W)/2;
         float Y3 = D*COS54;
         float Y4 = height*COS_HALFD;
         float Z = 2*height*COS_HALFD;
         float alpha = 90-DIHEDRAL1/2;
         Static1D angle1 = new Static1D(alpha);
         Static1D angle2 = new Static1D(180-alpha);
         Static1D angle3 = new Static1D(DIHEDRAL2);
         Static1D angle4 = new Static1D(90);
         Static3D move1 = new Static3D(+X1,-Y1,0);
         Static3D move2 = new Static3D(-X1,-Y2+W,-Z);
         Static3D move3 = new Static3D(0,+Y3,0);
         Static3D move4 = new Static3D(0,-Y4-width,0);
         Static3D scale = new Static3D(+1,+1,-1);
         Static3D axisXplus = new Static3D(+1, 0, 0);
         Static3D axisYplus = new Static3D( 0,+1, 0);
         Static3D center1= new Static3D( 0, 0, 0);
         Static3D center2= new Static3D( 0, 0,-Z);
         Static3D center3= new Static3D( 0,-width, 0);
         effect[ 0] = new VertexEffectMove(move1);
         effect[ 1] = new VertexEffectMove(move2);
         effect[ 2] = new VertexEffectMove(move3);
         effect[ 3] = new VertexEffectMove(move4);
         effect[ 4] = new VertexEffectScale(scale);
         effect[ 5] = new VertexEffectRotate(angle1, axisYplus , center1);
         effect[ 6] = new VertexEffectRotate(angle2, axisYplus , center1);
         effect[ 7] = new VertexEffectRotate(angle1, axisYplus , center2);
         effect[ 8] = new VertexEffectRotate(angle2, axisYplus , center2);
         effect[ 9] = new VertexEffectRotate(angle3, axisXplus , center1);
         effect[10] = new VertexEffectRotate(angle4, axisXplus , center3);
         if( !left )
+          {
           Static3D scale1 = new Static3D(+1,-1,+1);
           effect[11] = new VertexEffectScale(scale1);
+          }
         effect[ 0].setMeshAssociation( 3,-1);  // meshes 0,1
         effect[ 1].setMeshAssociation(12,-1);  // meshes 2,3
         effect[ 2].setMeshAssociation(16,-1);  // mesh 4
         effect[ 3].setMeshAssociation(32,-1);  // mesh 5
         effect[ 4].setMeshAssociation( 2,-1);  // mesh 1
         effect[ 5].setMeshAssociation( 1,-1);  // mesh 0
         effect[ 6].setMeshAssociation( 2,-1);  // mesh 1
         effect[ 7].setMeshAssociation( 4,-1);  // mesh 2
         effect[ 8].setMeshAssociation( 8,-1);  // mesh 3
         effect[ 9].setMeshAssociation(16,-1);  // mesh 4
         effect[10].setMeshAssociation(32,-1);  // mesh 5
         return effect;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       VertexEffect[] createVertexEffectsMegaminxEdge(float width, float height)
-...
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     // numLayers==3 --> index=0; numLayers=5 --> index=1 ...
     // type: 0,1,... 0 --> edge, 1 --> 1 layer deeper, etc
     // TODO
       MeshBase createKilominxEdgeMesh(int numLayers, float width, float height)
       MeshBase createKilominxEdgeMesh(int numLayers, float width, float height, boolean left)
+        {
         MeshBase mesh = createFacesMegaminxEdge(numLayers,width,height);
         VertexEffect[] effects = createVertexEffectsMegaminxEdge(width,height);
         MeshBase mesh = createFacesKilominxEdge(numLayers,width,height);
         VertexEffect[] effects = createVertexEffectsKilominxEdge(width,height,left);
         for( VertexEffect effect : effects ) mesh.apply(effect);
     // round...
         mesh.mergeEffComponents();
         return mesh;
-...
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       MeshBase createMinxCornerMesh(ObjectList object, int numLayers)
       MeshBase createMinxCornerMesh(int numLayers, float width)
+        {
         MeshBase mesh = createFacesMegaminxCorner(numLayers);
         VertexEffect[] effects = createVertexEffectsMegaminxCorner(numLayers);
         MeshBase mesh = createFacesMinxCorner(numLayers);
         VertexEffect[] effects = createVertexEffectsMinxCorner(width);
         for( VertexEffect effect : effects ) mesh.apply(effect);
         float A = (2*SQ3/3)* SIN54;
         float B = 0.4f;
     /*
         float X = SIN_HALFD* SIN54 * COS54;
         float Y = SIN54 * SIN54 - 0.5f;
         float Z = COS_HALFD* SIN54 * COS54;
         float S = 2*SIN54*(0.5f-MEGA_D)/(0.5f*(numLayers-1));
         float S = 2*width;
     */
         Static3D center = new Static3D(0.0f, -(float)Math.sqrt(1-A*A)*B,-A*B);
         Static3D[] vertices = new Static3D[4];
         Static3D[] vertices = new Static3D[1];
         vertices[0] = new Static3D( 0.0f, 0.0f  , 0.0f);
     /*
         vertices[1] = new Static3D( 0.0f,-0.5f*S, 0.0f);
         vertices[2] = new Static3D(-X*S , Y*S   ,-Z*S );
         vertices[3] = new Static3D(+X*S , Y*S   ,-Z*S );
     */
         roundCorners(mesh,center,vertices,0.04f,0.10f);
         mesh.mergeEffComponents();

Also available in: Unified diff

Project

General

Profile

Magic Cube

Revision 16f34a98

Added by Leszek Koltunski about 3 years ago