Project

General

Profile

« Previous | Next » 

Revision 97d1e3d7

Added by Leszek Koltunski almost 2 years ago

Crazy 3x3: icon, jsons, mesh.

View differences:

src/main/java/org/distorted/objectlib/main/ObjectType.java
79 79
  SKEW_3 ( TwistySkewb.class         , new int[] {3,3,3,3}    , 21, R.drawable.skew_3, true),
80 80
  CONT_2 ( TwistyContainer.class     , new int[] {2,2,2,2}    , 12, R.drawable.cont_2, true),
81 81

  
82
  CRA1_3 ( TwistyCrazy.class         , new int[] {3,3,3}      , 22, R.drawable.mixp_3, true),
82
  CRA1_3 ( TwistyCrazy.class         , new int[] {3,3,3}      , 22, R.drawable.cra1_3, true),
83 83

  
84 84
  VOID_3 ( TwistyVoid.class          , new int[] {3,3,3}      , 17, R.drawable.void_3, false),  // wasDownloadableButNowIsBuiltIn()
85 85
  CRYS_3 ( TwistyCrystal.class       , new int[] {3,3,3,3,3,3}, 27, R.drawable.crys_3, false),  // function!
src/main/java/org/distorted/objectlib/objects/TwistyCrazy.java
23 23

  
24 24
import org.distorted.library.type.Static3D;
25 25
import org.distorted.library.type.Static4D;
26
import org.distorted.objectlib.helpers.FactoryCubit;
27 26
import org.distorted.objectlib.helpers.ObjectFaceShape;
28 27
import org.distorted.objectlib.helpers.ObjectShape;
29 28
import org.distorted.objectlib.helpers.ObjectSignature;
......
61 60
  public TwistyCrazy(int[] numL, int meshState, int iconMode, Static4D quat, Static3D move, float scale, InputStream stream)
62 61
    {
63 62
    super(numL, meshState, iconMode, numL[0], quat, move, scale, stream);
64

  
65
    FactoryCubit f = FactoryCubit.getInstance();
66
    f.printStickerCoords();
67 63
    }
68 64

  
69 65
///////////////////////////////////////////////////////////////////////////////////////////////////
......
693 689
      {
694 690
      float h1 = isInIconMode() ? 0.001f : 0.04f;
695 691
      float h2 = 0.001f;
696
      float[][] bands   = { {h1,45,0.3f,0.7f,5,1,0}, {h2,5,0.3f,0.2f,2,0,0} };
692
      float[][] bands   = { {h1,45,0.3f,0.7f,5,0,0}, {h2,5,0.3f,0.2f,2,0,0} };
697 693
      final int NUM_BANDS = 6+3*NUMBER_CORNER_SEGMENTS;
698 694
      int[] bandIndices = new int[NUM_BANDS];
699 695
      bandIndices[0] = bandIndices[1] = bandIndices[2] = 0;
......
711 707
    if( variant==1 )
712 708
      {
713 709
      float h1 = isInIconMode() ? 0.001f : 0.03f;
714
      float[][] bands   = { {h1,45,0.2f,0.4f,5,1,0}, {0.001f,1,0.3f,0.5f,5,0,0}, {0.001f,1,0.3f,0.5f,2,0,0} };
710
      float[][] bands   = { {h1,45,0.2f,0.4f,5,0,0}, {0.001f,1,0.3f,0.5f,3,0,0}, {0.001f,1,0.3f,0.5f,2,0,0} };
715 711
      final int NUM_BANDS = 4 + 2*NUMBER_EDGE_SEGMENTS;
716 712
      int[] bandIndices = new int[NUM_BANDS];
717 713
      bandIndices[0] = bandIndices[1] = 0;
......
728 724
    if( variant==2 )
729 725
      {
730 726
      float h1 = isInIconMode() ? 0.001f : 0.05f;
731
      float[][] bands   = { {h1,45,0.2f,0.4f,5,1,0}, {0.001f,1,0.3f,0.5f,5,0,0} };
727
      float[][] bands   = { {h1,45,0.2f,0.4f,5,0,0}, {0.001f,1,0.3f,0.5f,2,0,0} };
732 728
      int[] bandIndices = new int[] {0,1,1,1,1,1};
733 729
      float[][] corners = { {0.02f,0.09f} };
734 730
      float[][] centers = { { 0.0f, 0.0f, 1.0f } };
......
738 734
    if( variant==3 )
739 735
      {
740 736
      float h1 = isInIconMode() ? 0.001f : 0.03f;
741
      float[][] bands   = { {h1,45,0.2f,0.4f,5,1,0}, {0.001f,1,0.3f,0.5f,5,0,0}, {0.001f,1,0.3f,0.5f,2,0,0} };
737
      float[][] bands   = { {h1,45,0.2f,0.4f,5,0,0}, {0.001f,1,0.3f,0.5f,3,0,0}, {0.001f,1,0.3f,0.5f,2,0,0} };
742 738
      final int NUM_BANDS = 5 + NUMBER_EDGE_SEGMENTS;
743 739
      int[] bandIndices = new int[NUM_BANDS];
744 740
      bandIndices[0] = 0;
......
756 752
    else
757 753
      {
758 754
      float h1 = isInIconMode() ? 0.001f : 0.02f;
759
      float[][] bands   = { {h1,45,0.2f,0.4f,5,1,0}, {0.001f,1,0.3f,0.5f,5,0,0}, {0.001f,1,0.3f,0.5f,2,0,0} };
755
      float[][] bands   = { {h1,45,0.2f,0.4f,5,0,0}, {0.001f,1,0.3f,0.5f,3,0,0}, {0.001f,1,0.3f,0.5f,2,0,0} };
760 756
      final int NUM_BANDS = 4 + NUMBER_CORNER_SEGMENTS;
761 757
      int[] bandIndices = new int[NUM_BANDS];
762 758
      bandIndices[0] = 0;

Also available in: Unified diff