Project

General

Profile

« Previous | Next » 

Revision 673d7b24

Added by Leszek Koltunski almost 4 years ago

Progress with Megaminx - icons.

View differences:

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

  
142 142
  MEGA (
143 143
         new int[][] {
144
                       {3 , 21, R.raw.kilo3, R.drawable.ui_small_kilo3, R.drawable.ui_medium_kilo3, R.drawable.ui_big_kilo3, R.drawable.ui_huge_kilo3} ,
145
                       {5 , 25, R.raw.kilo3, R.drawable.ui_small_kilo3, R.drawable.ui_medium_kilo3, R.drawable.ui_big_kilo3, R.drawable.ui_huge_kilo3} ,
144
                       {3 , 21, R.raw.kilo3, R.drawable.ui_small_mega3, R.drawable.ui_medium_mega3, R.drawable.ui_big_mega3, R.drawable.ui_huge_mega3} ,
145
                       {5 , 25, R.raw.kilo3, R.drawable.ui_small_mega5, R.drawable.ui_medium_mega5, R.drawable.ui_big_mega5, R.drawable.ui_huge_mega5} ,
146 146
                     },
147 147
         TwistyMegaminx.class,
148 148
         new MovementMinx(),
src/main/java/org/distorted/objects/TwistyMegaminx.java
522 522
      {
523 523
      float Y = COS54/(2*SIN54);
524 524
      R = 0.070f;
525
      S = 0.065f;
525
      S = 0.08f;
526 526
      vertices = new float[] { -0.5f, 0.0f, 0.0f, -Y, 0.5f, 0.0f, 0.0f, Y };
527 527
      }
528 528
    else
......
539 539
        float Y2 = 0.5f*width + W;
540 540

  
541 541
        R = 0.05f;
542
        S = 0.05f;
542
        S = 0.07f;
543 543
        vertices = new float[] { -X1, Y1, -X1, -Y1, X1, -Y2, X1, Y2 };
544 544
        }
545 545
      else
......
551 551
        float Y2 = Z*SIN18;
552 552

  
553 553
        R = 0.10f;
554
        S = 0.06f;
554
        S = 0.08f;
555 555
        vertices = new float[] { -X1,+Y1, -X2,-Y2, 0.0f,-Z, +X2,-Y2, +X1,+Y1 };
556 556
        }
557 557
      }

Also available in: Unified diff