Project

General

Profile

« Previous | Next » 

Revision 67b2d57b

Added by Leszek Koltunski over 3 years ago

Create new meshes.

View differences:

src/main/java/org/distorted/objects/ObjectList.java
61 61

  
62 62
  DIAM (
63 63
         new int[][] {
64
                       {2 , 10, R.raw.diamond, R.drawable.ui_small_diam, R.drawable.ui_medium_diam, R.drawable.ui_big_diam, R.drawable.ui_huge_diam} ,
64
                       {2 , 10, R.raw.diam2, R.drawable.ui_small_diam, R.drawable.ui_medium_diam, R.drawable.ui_big_diam, R.drawable.ui_huge_diam} ,
65 65
                     },
66 66
         TwistyDiamond.class,
67 67
         new MovementDiamond(),
......
111 111

  
112 112
  SKEW (
113 113
         new int[][] {
114
                       {2 , 11, R.raw.skewb, R.drawable.ui_small_skewb, R.drawable.ui_medium_skewb, R.drawable.ui_big_skewb, R.drawable.ui_huge_skewb} ,
115
                       {3 , 17, R.raw.skewm, R.drawable.ui_small_skewm, R.drawable.ui_medium_skewm, R.drawable.ui_big_skewm, R.drawable.ui_huge_skewm} ,
114
                       {2 , 11, R.raw.skew2, R.drawable.ui_small_skewb, R.drawable.ui_medium_skewb, R.drawable.ui_big_skewb, R.drawable.ui_huge_skewb} ,
115
                       {3 , 17, R.raw.skew3, R.drawable.ui_small_skewm, R.drawable.ui_medium_skewm, R.drawable.ui_big_skewm, R.drawable.ui_huge_skewm} ,
116 116
                     },
117 117
         TwistySkewb.class,
118 118
         new MovementSkewb(),
src/main/java/org/distorted/objects/TwistyCube.java
145 145
    if( mMeshes[index]==null )
146 146
      {
147 147
      int extraI, extraV, num;
148
      float height;
148 149

  
149 150
      switch(numLayers)
150 151
        {
151
        case 2 : num = 6; extraI = 2; extraV = 2; break;
152
        case 3 : num = 5; extraI = 2; extraV = 2; break;
153
        case 4 : num = 5; extraI = 1; extraV = 2; break;
154
        default: num = 5; extraI = 1; extraV = 0; break;
152
        case 2 : num = 6; extraI = 2; extraV = 2; height = 0.045f; break;
153
        case 3 : num = 5; extraI = 2; extraV = 2; height = 0.045f; break;
154
        case 4 : num = 5; extraI = 1; extraV = 1; height = 0.045f; break;
155
        default: num = 5; extraI = 0; extraV = 0; height = 0.045f; break;
155 156
        }
156 157

  
157
      float[][] bands     = new float[][] { {0.038f,35,0.5f,0.7f,num,extraI,extraV} };
158
      float[][] bands     = new float[][] { {height,35,0.5f,0.7f,num,extraI,extraV} };
158 159
      int[] bandIndexes   = new int[] { 0,0,0,0,0,0};
159 160
      float[][] corners   = new float[][] { {0.036f,0.12f} };
160 161
      int[] cornerIndexes = new int[] { 0,0,0,0,0,0,0,0 };
src/main/java/org/distorted/objects/TwistyMinx.java
389 389
    float A = (2*SQ3/3)*SIN54;
390 390
    float B = 0.4f;
391 391
    int   N = numLayers==3 ? 5 : 3;
392
    int   E = numLayers==3 ? 4 : 1;
392
    int   E1= numLayers==3 ? 1 : 0;
393
    int   E2= numLayers==3 ? 3 : 0;
393 394

  
394 395
    double X = width*COS18*SIN_HALFD;
395 396
    double Y = width*SIN18;
......
419 420

  
420 421
    float[][] bands     = new float[][]
421 422
      {
422
         {0.04f,34,0.3f,0.2f, N, 1, 1},
423
         {0.00f, 0,0.0f,0.0f, 2, 1, E}
423
         {0.04f,34,0.3f,0.2f, N, 1, E1},
424
         {0.00f, 0,0.0f,0.0f, 2, 1, E2}
424 425
      };
425 426
    int[] bandIndexes   = new int[] { 0,0,0,1,1,1};
426 427
    float[][] corners   = new float[][] { {0.04f,0.10f} };
src/main/java/org/distorted/objects/TwistyObject.java
81 81
  private static final float MAX_SIZE_CHANGE = 1.35f;
82 82
  private static final float MIN_SIZE_CHANGE = 0.75f;
83 83

  
84
  private static final boolean mCreateFromDMesh = false;
84
  private static final boolean mCreateFromDMesh = true;
85 85

  
86 86
  private static final Static3D CENTER = new Static3D(0,0,0);
87 87
  private static final int POST_ROTATION_MILLISEC = 500;

Also available in: Unified diff