Project

General

Profile

« Previous | Next » 

Revision 8216df90

Added by Leszek Koltunski almost 2 years ago

Crazy 3x3: adjust stickers.

View differences:

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;
26 27
import org.distorted.objectlib.helpers.ObjectFaceShape;
27 28
import org.distorted.objectlib.helpers.ObjectShape;
28 29
import org.distorted.objectlib.helpers.ObjectSignature;
......
60 61
  public TwistyCrazy(int[] numL, int meshState, int iconMode, Static4D quat, Static3D move, float scale, InputStream stream)
61 62
    {
62 63
    super(numL, meshState, iconMode, numL[0], quat, move, scale, stream);
64

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

  
65 69
///////////////////////////////////////////////////////////////////////////////////////////////////
66
/*
70

  
67 71
  @Override
68 72
  public void adjustStickerCoords()
69 73
    {
70
    final float A = 0.497f;
71
    final float B = 0.38950402f;
72
    final float C = 0.25900806f;
73
    final float D = 0.51f;
74
    final float A = 0.3645522f;
75
    final float B = 0.0744520f;
76
    final float C = 0.1823852f;
77
    final float D = 0.3098326f;
78
    final float E = 0.1033291f;
79
    final float F = 0.4044531f;
80
    final float G = 0.4103489f;
74 81

  
75 82
    mStickerCoords = new float[][]
76
          {
77
             { -0.5f, -0.5f, A, -0.5f, -0.5f, A },
78
             { -C, -B, D, -B, D, B, -C, B }
79
          };
83
      {
84
         { A, 0.5f, -0.5f, 0.5f, -0.5f, -A, -B, -A, A, B },
85
         { 0.5f, -C, 0.5f, D, -0.5f, D, -0.5f, -C },
86
         { -0.5f, -0.5f, 0.5f, -0.5f, 0.5f, 0.5f, -0.5f, 0.5f },
87
         { -0.5f, E, -0.5f, -F, 0.5f, -F, 0.5f, E },
88
         { -G, 0.5f, -G, -G, 0.5f, -G }
89
      };
80 90
    }
81
*/
82 91

  
83 92
///////////////////////////////////////////////////////////////////////////////////////////////////
84 93
// Normal 3x3
......
798 807
    }
799 808

  
800 809
///////////////////////////////////////////////////////////////////////////////////////////////////
801
// TODO
802 810

  
803 811
  public float[][] getStickerAngles()
804 812
    {
805
    return null;
806

  
807
    //float D = (float)(Math.PI/6);
808
    //return new float[][] { { 0,D,0 },{ 0,0,0,-D } };
813
    float D = (float)(Math.PI/8);
814
    return new float[][] { { 0,0,0,-D,0 },{ 0,0,0,-D },{0,0,0,0},{ 0,0,0,D },{ 0,0,D } };
809 815
    }
810 816

  
811 817
///////////////////////////////////////////////////////////////////////////////////////////////////

Also available in: Unified diff