/ - Diff - TwistyPuzzleLib - Distorted Android

« Previous | Next »

Revision cadc79fe

Added by Leszek Koltunski 12 months ago

ID cadc79fe31c577beaf53a4623fbce539d7bbda92
Parent 03410dc1
Child a6aa9a47

Progress with Ancient Coin Cube.

       DINO_3 ( TwistyDino6.class          , 10, R.drawable.dino_3, true,     0, new InitData(new int[] {3,3,3,3})),
       DIN4_3 ( TwistyDino4.class          ,  9, R.drawable.din4_3, true,    30, new InitData(new int[] {3,3,3,3})),
       TINS_5 ( TwistyTins.class           , 28, R.drawable.coin_3, true,   60, new InitData(new int[] {5,5,5,5})),
       COIH_3 ( TwistyCoinHexahedron.class , 25, R.drawable.coin_3, true,   50, new InitData(new int[] {3,3,3,3,3,3,3})),
       COIN_3 ( TwistyCoinTetrahedron.class, 15, R.drawable.coin_3, false,   40, new InitData(new int[] {3,3,3,3})),
       TINS_5 ( TwistyTins.class           , 28, R.drawable.coin_3, false,    60, new InitData(new int[] {5,5,5,5})),
+      ;
       public static int NUM_OBJECTS;

     import org.distorted.library.type.Static3D;
     import org.distorted.library.type.Static4D;
     import org.distorted.objectlib.helpers.FactoryCubit;
     import org.distorted.objectlib.helpers.FactorySticker;
     import org.distorted.objectlib.helpers.ObjectFaceShape;
     import org.distorted.objectlib.helpers.ObjectShape;
     import org.distorted.objectlib.helpers.ObjectSignature;
-...
       public TwistyCoinHexahedron(int meshState, int iconMode, Static4D quat, Static3D move, float scale, InitData data, InitAssets asset)
+        {
         super(meshState, iconMode, data.getNumLayers()[0], quat, move, scale, data, asset);
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
-...
         if( mPosition==null )
+          {
           final float A = 1.5f-C;
           final float B = 1.52f;
           final float E = 0.75f*D;
           mPosition = new float[][]
-...
                  {-A,-A, A},
                  {-A,-A,-A},
                  { 0.00f, 0.00f, 1.50f},
                  { 0.00f, 0.00f,-1.50f},
                  { 0.00f, 1.50f, 0.00f},
                  { 0.00f,-1.50f, 0.00f},
                  { 1.50f, 0.00f, 0.00f},
                  {-1.50f, 0.00f, 0.00f},
                  {     E,     E, 1.50f},
                  {     E,    -E, 1.50f},
                  {    -E,     E, 1.50f},
                  {    -E,    -E, 1.50f},
                  {     E,     E,-1.50f},
                  {     E,    -E,-1.50f},
                  {    -E,     E,-1.50f},
                  {    -E,    -E,-1.50f},
                  {     E, 1.50f,     E},
                  {     E, 1.50f,    -E},
                  {    -E, 1.50f,     E},
                  {    -E, 1.50f,    -E},
                  {     E,-1.50f,     E},
                  {     E,-1.50f,    -E},
                  {    -E,-1.50f,     E},
                  {    -E,-1.50f,    -E},
                  { 1.50f,     E,     E},
                  { 1.50f,     E,    -E},
                  { 1.50f,    -E,     E},
                  { 1.50f,    -E,    -E},
                  {-1.50f,     E,     E},
                  {-1.50f,     E,    -E},
                  {-1.50f,    -E,     E},
                  {-1.50f,    -E,    -E},
                  { 0, 0, B },
                  { 0, 0,-B },
                  { 0, B, 0 },
                  { 0,-B, 0 },
                  { B, 0, 0 },
                  {-B, 0, 0 },
                  { E, E, B},
                  { E,-E, B},
                  {-E, E, B},
                  {-E,-E, B},
                  { E, E,-B},
                  { E,-E,-B},
                  {-E, E,-B},
                  {-E,-E,-B},
                  { E, B, E},
                  { E, B,-E},
                  {-E, B, E},
                  {-E, B,-E},
                  { E,-B, E},
                  { E,-B,-E},
                  {-E,-B, E},
                  {-E,-B,-E},
                  { B, E, E},
                  { B, E,-E},
                  { B,-E, E},
                  { B,-E,-E},
                  {-B, E, E},
                  {-B, E,-E},
                  {-B,-E, E},
                  {-B,-E,-E},
              };
+          }
-...
         final int N3 = N2 + N + 1;
         float[][] vertices= new float[3*N+8][3];
         vertices[3*(N+1)+4][0] = -A;
         vertices[3*(N+1)+4][1] = -A;
         vertices[3*(N+1)+4][2] = -A;
         vertices[3*N+7][0] = -A;
         vertices[3*N+7][1] = -A;
         vertices[3*N+7][2] = -A;
         vertices[0][0] = 0;
         vertices[0][1] = 0;
-...
       private int[][] produceCornerShape()
+        {
         int[][] indices = new int[3*N+3][];
         int[][] indices = new int[3*N+9][];
         indices[0] = new int[N+4];
         indices[1] = new int[N+4];
-...
         for(int i=0; i<N; i++)
+          {
           indices[3*i+3] = new int[] { N1+i+1, N1+i, 3*(N+1)+4 };
           indices[3*i+4] = new int[] { N2+i+1, N2+i, 3*(N+1)+4 };
           indices[3*i+5] = new int[] { N3+i+1, N3+i, 3*(N+1)+4 };
           indices[3*i+3] = new int[] { N1+i+1, N1+i, 3*N+7 };
           indices[3*i+4] = new int[] { N2+i+1, N2+i, 3*N+7 };
           indices[3*i+5] = new int[] { N3+i+1, N3+i, 3*N+7 };
+          }
         indices[3*N+3] = new int[] { 2    , 4+  N, 3*N+7 };
         indices[3*N+4] = new int[] { 5  +N, 2    , 3*N+7 };
         indices[3*N+5] = new int[] { 5+2*N, 3    , 3*N+7 };
         indices[3*N+6] = new int[] { 3    , 6+2*N, 3*N+7 };
         indices[3*N+7] = new int[] { 1    , 6+3*N, 3*N+7 };
         indices[3*N+8] = new int[] { 4    , 1    , 3*N+7 };
         return indices;
+        }
-...
           float h1 = isInIconMode() ? 0.0001f : 0.03f;
           float h2 = isInIconMode() ? 0.0001f : 0.01f;
           float[][] bands = { {h1,35,0.2f,0.4f,5,2,1}, {h2,35,0.2f,0.4f,2,0,0} };
           int num = 3*N+3;
           int num = 3*N+9;
           int[] indices = new int[num];
           for(int i=3; i<num; i++) indices[i] = 1;
           float S = 1-SQ2/2 - C;
-...
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     // ditto, manually provide the sticker coordinates.
       @Override
       public void adjustStickerCoords()
+        {
         float L = 0.02f;
         float Z = 0.06422593f - 0.25f*L;
         float X = 0.5f - L;
         float K = 1.45f;
         float A = K*0.50f;
         float B = K*0.25f;
         float C = K*0.43301257f;
         float D = 0.3580885f;
         float E = 0.12022744f;
         float F = 0.32227963f - 0.015f;
         float G = 0.14090173f + 0.01f;
         float A = 0.38f;
         float B = 0.24f;
         mStickerCoords = new float[][]
+              {
                 { -D, E, 0.0f, -0.5f, D, E, F, G, -F, G },
                 { -C, B, C, B, 0.0f, -A },
                 { -X, Z, X, Z }
                 { A,-0.5f, A, A, -0.5f, A, -0.5f, B, B, -0.5f },
                 { 0.5f, 0.0f, 0.0f, 0.5f, -0.5f, 0.0f, 0.0f, -0.5f },
                 { 0.5f, -0.5f, -0.5f, 0.5f }
               };
+        }
-...
       public float[][] getStickerAngles()
+        {
         float D1 = (float)(Math.PI/3);
         float D2 = (float)(Math.PI/6);
         return new float[][] { { 0,0,0,-D1,0 },{-D2,-D2,-D2,-D2},{D2,D2} };
         float D = (float)(Math.PI/4);
         return new float[][] { { 0,0,0,-D,0 },{-D,-D,-D,-D},{D,D} };
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////

Also available in: Unified diff

Project

General

Profile

TwistyPuzzleLib

Revision cadc79fe

Added by Leszek Koltunski 12 months ago