Project

General

Profile

« Previous | Next » 

Revision 33ba467a

Added by Leszek Koltunski about 2 months ago

Color unification complete: 24 standard colors.

View differences:

src/main/java/org/distorted/objectlib/objects/TwistyMirror.java
38 38 
           new Static3D(0,0,1)
39 39 
         };
40 40 

  		




  41
  
  
    
  private static final int[] FACE_COLORS = new int[] { ShapeColors.COLOR_ICO_WHITE };


  		




  
  41
  
    
  private static final int[] FACE_COLORS = new int[] { ShapeColors.COLOR_WHITE};


  		




  42
  42
  
    
  private static final float[] MIRROR_VEC = { 0.10f, 0.25f, 0.40f };


  		




  43
  43
  
    

  		




  44
  44
  
    
  private int[][] mEdges;


  		












  

    
      src/main/java/org/distorted/objectlib/objects/TwistyMirrorJing.java
    
  





  41
  41
  
    

  		




  42
  42
  
    
  private static final float JING_F = 0.48f;


  		




  43
  43
  
    

  		




  44
  
  
    
  private static final int[] FACE_COLORS = new int[] { ShapeColors.COLOR_ICO_WHITE };


  		




  
  44
  
    
  private static final int[] FACE_COLORS = new int[] { ShapeColors.COLOR_WHITE};


  		




  45
  45
  
    
  private static final float[] MIRROR_VEC = { 0.06f, 0.07f, 0.08f };


  		




  46
  46
  
    

  		




  47
  47
  
    
  private int[][] mEdges;


  		












  

    
      src/main/java/org/distorted/objectlib/objects/TwistyMirrorPyraminx.java
    
  





  38
  38
  
    
      new Static3D(-SQ6/3, SQ3/3,     0),


  		




  39
  39
  
    
    };


  		




  40
  40
  
    

  		




  41
  
  
    
  private static final int[] FACE_COLORS = new int[] { ShapeColors.COLOR_ICO_WHITE };


  		




  
  41
  
    
  private static final int[] FACE_COLORS = new int[] { ShapeColors.COLOR_WHITE};


  		




  42
  42
  
    
  private static final float[] MIRROR_VEC = { 0.06f, 0.15f, 0.02f };


  		




  43
  43
  
    

  		




  44
  44
  
    
  private int[][] mEdges;


  		












  

    
      src/main/java/org/distorted/objectlib/objects/TwistyMirrorSkewb.java
    
  





  39
  39
  
    
           new Static3D( SQ3/3,-SQ3/3,-SQ3/3)


  		




  40
  40
  
    
         };


  		




  41
  41
  
    

  		




  42
  
  
    
  private static final int[] FACE_COLORS = new int[] { ShapeColors.COLOR_ICO_WHITE };


  		




  
  42
  
    
  private static final int[] FACE_COLORS = new int[] { ShapeColors.COLOR_WHITE};


  		




  43
  43
  
    
  private static final float[] MIRROR_VEC = { 0.10f, 0.15f, 0.20f };


  		




  44
  44
  
    

  		




  45
  45
  
    
  private int[][] mEdges;


  		












  

    
      src/main/java/org/distorted/objectlib/shape/ShapeColors.java
    
  





  13
  13
  
    

  		




  14
  14
  
    
public class ShapeColors


  		




  15
  15
  
    
{


  		




  16
  
  
    
  public static final int COLOR_BALL_1 = 0xffcc0000;


  		




  17
  
  
    
  public static final int COLOR_BALL_2 = 0xffcb2d6a;


  		




  18
  
  
    
  public static final int COLOR_BALL_3 = 0xff4ec9d0;


  		




  19
  
  
    
  public static final int COLOR_BALL_4 = 0xff4678ab;


  		




  20
  
  
    
  public static final int COLOR_BALL_5 = 0xff057350;


  		




  21
  
  
    
  public static final int COLOR_BALL_6 = 0xff48ad62;


  		




  22
  
  
    
  public static final int COLOR_BALL_7 = 0xffedca54;


  		




  23
  
  
    
  public static final int COLOR_BALL_8 = 0xfffe5740;


  		




  24
  
  
    

  		




  25
  
  
    
  public static final int COLOR_ICO_LPINK  = 0xffe191b4;


  		




  26
  
  
    
  public static final int COLOR_ICO_VIOLET = 0xff7700bb; //604c94


  		




  27
  
  
    
  public static final int COLOR_ICO_PURPLE = 0xff472258;


  		




  28
  
  
    
  public static final int COLOR_ICO_BURGUN = 0xff591218;


  		




  29
  
  
    
  public static final int COLOR_ICO_DPINK  = 0xffba365b;


  		




  30
  
  
    
  public static final int COLOR_ICO_YELLOW = 0xffffff00; // ffff77


  		




  31
  
  
    
  public static final int COLOR_ICO_LGREEN = 0xff00bb00; // 53aa00


  		




  32
  
  
    
  public static final int COLOR_ICO_BLUE   = 0xff0000ff; // 0e28a3


  		




  33
  
  
    
  public static final int COLOR_ICO_GREY   = 0xff727c7b; // 566069


  		




  34
  
  
    
  public static final int COLOR_ICO_ORANGE = 0xffff6200; // d7660a


  		




  35
  
  
    
  public static final int COLOR_ICO_DGREEN = 0xff092d2b;


  		




  36
  
  
    
  public static final int COLOR_ICO_SELEDY = 0xff034d3e; //


  		




  37
  
  
    
  public static final int COLOR_ICO_GREEN  = 0xff1a7516;


  		




  38
  
  
    
  public static final int COLOR_ICO_BLUEISH= 0xff58b6be;


  		




  39
  
  
    
  public static final int COLOR_ICO_SANDY  = 0xffd3c49b;


  		




  40
  
  
    
  public static final int COLOR_ICO_DBLUE  = 0xff0a1662;


  		




  41
  
  
    
  public static final int COLOR_ICO_RED    = 0xff990000; // a21a1c


  		




  42
  
  
    
  public static final int COLOR_ICO_DYELLO = 0xffe1b410; //


  		




  43
  
  
    
  public static final int COLOR_ICO_DWHITE = 0xffdadeea;


  		




  44
  
  
    
  public static final int COLOR_ICO_LBLUE  = 0xff0157da;


  		




  45
  
  
    

  		




  46
  
  
    
  public static final int COLOR_ICO_BLACK = 0xff050505;


  		




  47
  
  
    
  public static final int COLOR_ICO_DGREY = 0xff222222;


  		




  48
  
  
    
  public static final int COLOR_ICO_LGREY = 0xff555555;


  		




  49
  
  
    
  public static final int COLOR_ICO_WHITE = 0xffffffff;


  		




  
  16
  
    
  public static final int COLOR_LPINK  = 0xffe191b4;


  		




  
  17
  
    
  public static final int COLOR_VIOLET = 0xff7700bb;


  		




  
  18
  
    
  public static final int COLOR_PURPLE = 0xff472258;


  		




  
  19
  
    
  public static final int COLOR_BURGUN = 0xff591218;


  		




  
  20
  
    
  public static final int COLOR_DPINK  = 0xffba365b;


  		




  
  21
  
    
  public static final int COLOR_YELLOW = 0xffffff00;


  		




  
  22
  
    
  public static final int COLOR_LGREEN = 0xff00bb00;


  		




  
  23
  
    
  public static final int COLOR_BLUE   = 0xff0000ff;


  		




  
  24
  
    
  public static final int COLOR_GREY   = 0xff727c7b;


  		




  
  25
  
    
  public static final int COLOR_ORANGE = 0xffff6200;


  		




  
  26
  
    
  public static final int COLOR_DGREEN = 0xff092d2b;


  		




  
  27
  
    
  public static final int COLOR_SELEDY = 0xff034d3e;


  		




  
  28
  
    
  public static final int COLOR_GREEN  = 0xff1a7516;


  		




  
  29
  
    
  public static final int COLOR_BLUEISH= 0xff58b6be;


  		




  
  30
  
    
  public static final int COLOR_SANDY  = 0xffd3c49b;


  		




  
  31
  
    
  public static final int COLOR_DBLUE  = 0xff0a1662;


  		




  
  32
  
    
  public static final int COLOR_RED    = 0xffaa0000;


  		




  
  33
  
    
  public static final int COLOR_DYELLO = 0xffe1b410;


  		




  
  34
  
    
  public static final int COLOR_BROWN  = 0xff902a2a;


  		




  
  35
  
    
  public static final int COLOR_LBLUE  = 0xff0157da;


  		




  
  36
  
    
  public static final int COLOR_BLACK  = 0xff050505;


  		




  
  37
  
    
  public static final int COLOR_DGREY  = 0xff222222;


  		




  
  38
  
    
  public static final int COLOR_LGREY  = 0xff555555;


  		




  
  39
  
    
  public static final int COLOR_WHITE  = 0xffffffff;


  		




  50
  40
  
    
}


  		












  

    
      src/main/java/org/distorted/objectlib/shape/ShapeDiamond.java
    
  





  25
  25
  
    

  		




  26
  26
  
    
  public static final int[] FACE_COLORS = new int[]


  		




  27
  27
  
    
         {


  		




  28
  
  
    
           COLOR_BALL_1, COLOR_BALL_1,


  		




  29
  
  
    
           COLOR_BALL_2, COLOR_BALL_2,


  		




  30
  
  
    
           COLOR_BALL_3, COLOR_BALL_3,


  		




  31
  
  
    
           COLOR_BALL_4, COLOR_BALL_4,


  		




  32
  
  
    
           COLOR_BALL_5, COLOR_BALL_5,


  		




  33
  
  
    
           COLOR_BALL_6, COLOR_BALL_6,


  		




  34
  
  
    
           COLOR_BALL_7, COLOR_BALL_7,


  		




  35
  
  
    
           COLOR_BALL_8, COLOR_BALL_8,


  		




  
  28
  
    
                 COLOR_RED, COLOR_RED,


  		




  
  29
  
    
                 COLOR_DPINK, COLOR_DPINK,


  		




  
  30
  
    
                 COLOR_BLUEISH, COLOR_BLUEISH,


  		




  
  31
  
    
                 COLOR_LBLUE, COLOR_LBLUE,


  		




  
  32
  
    
                 COLOR_SELEDY, COLOR_SELEDY,


  		




  
  33
  
    
                 COLOR_LGREEN, COLOR_LGREEN,


  		




  
  34
  
    
                 COLOR_DYELLO, COLOR_DYELLO,


  		




  
  35
  
    
                 COLOR_ORANGE, COLOR_ORANGE,


  		




  36
  36
  
    
         };


  		




  37
  37
  
    

  		




  38
  38
  
    
  public static final int NUM_FACES = 16;


  		












  

    
      src/main/java/org/distorted/objectlib/shape/ShapeDodecahedron.java
    
  





  25
  25
  
    

  		




  26
  26
  
    
  public static final int[] FACE_COLORS = new int[]


  		




  27
  27
  
    
         {


  		




  28
  
  
    
           COLOR_ICO_DYELLO, COLOR_ICO_ORANGE, COLOR_ICO_RED  , COLOR_ICO_SANDY,


  		




  29
  
  
    
           COLOR_ICO_DBLUE , COLOR_ICO_WHITE , COLOR_ICO_GREY , COLOR_ICO_LBLUE,


  		




  30
  
  
    
           COLOR_ICO_LGREEN, COLOR_ICO_VIOLET, COLOR_ICO_LPINK, COLOR_ICO_DGREEN


  		




  
  28
  
    
                 COLOR_DYELLO, COLOR_ORANGE, COLOR_RED, COLOR_SANDY,


  		




  
  29
  
    
                 COLOR_DBLUE, COLOR_WHITE, COLOR_GREY, COLOR_LBLUE,


  		




  
  30
  
    
                 COLOR_LGREEN, COLOR_VIOLET, COLOR_LPINK, COLOR_DGREEN


  		




  31
  31
  
    
         };


  		




  32
  32
  
    

  		




  33
  33
  
    
  public static final int NUM_FACES = 12;


  		












  

    
      src/main/java/org/distorted/objectlib/shape/ShapeHexahedron.java
    
  





  25
  25
  
    

  		




  26
  26
  
    
  public static final int[] FACE_COLORS = new int[]


  		




  27
  27
  
    
         {


  		




  28
  
  
    
           COLOR_ICO_YELLOW, COLOR_ICO_WHITE,


  		




  29
  
  
    
           COLOR_ICO_BLUE  , COLOR_ICO_LGREEN,


  		




  30
  
  
    
           COLOR_ICO_RED   , COLOR_ICO_ORANGE


  		




  
  28
  
    
                 COLOR_YELLOW, COLOR_WHITE,


  		




  
  29
  
    
                 COLOR_BLUE, COLOR_LGREEN,


  		




  
  30
  
    
                 COLOR_RED, COLOR_ORANGE


  		




  31
  31
  
    
         };


  		




  32
  32
  
    

  		




  33
  33
  
    
  public static final int NUM_FACES = 6;


  		












  

    
      src/main/java/org/distorted/objectlib/shape/ShapeIcosahedron.java
    
  





  25
  25
  
    

  		




  26
  26
  
    
  public static final int[] FACE_COLORS = new int[]


  		




  27
  27
  
    
         {


  		




  28
  
  
    
           COLOR_ICO_LPINK , COLOR_ICO_VIOLET, COLOR_ICO_PURPLE, COLOR_ICO_BURGUN , COLOR_ICO_DPINK ,


  		




  29
  
  
    
           COLOR_ICO_YELLOW, COLOR_ICO_LGREEN, COLOR_ICO_BLUE  , COLOR_ICO_GREY   , COLOR_ICO_ORANGE,


  		




  30
  
  
    
           COLOR_ICO_DGREEN, COLOR_ICO_SELEDY, COLOR_ICO_GREEN , COLOR_ICO_BLUEISH, COLOR_ICO_SANDY ,


  		




  31
  
  
    
           COLOR_ICO_DBLUE , COLOR_ICO_RED   , COLOR_ICO_DYELLO, COLOR_ICO_WHITE  , COLOR_ICO_LBLUE,


  		




  
  28
  
    
                 COLOR_LPINK, COLOR_VIOLET, COLOR_PURPLE, COLOR_BURGUN, COLOR_DPINK,


  		




  
  29
  
    
                 COLOR_YELLOW, COLOR_LGREEN, COLOR_BLUE, COLOR_GREY, COLOR_ORANGE,


  		




  
  30
  
    
                 COLOR_DGREEN, COLOR_SELEDY, COLOR_GREEN, COLOR_BLUEISH, COLOR_SANDY,


  		




  
  31
  
    
                 COLOR_DBLUE, COLOR_RED, COLOR_DYELLO, COLOR_WHITE, COLOR_LBLUE,


  		




  32
  32
  
    
         };


  		




  33
  33
  
    

  		




  34
  34
  
    
  public static final int NUM_FACES = 20;


  		












  

    
      src/main/java/org/distorted/objectlib/shape/ShapeOctahedron.java
    
  





  25
  25
  
    

  		




  26
  26
  
    
  public static final int[] FACE_COLORS = new int[]


  		




  27
  27
  
    
         {


  		




  28
  
  
    
           COLOR_ICO_VIOLET, COLOR_ICO_GREY  ,


  		




  29
  
  
    
           COLOR_ICO_BLUE  , COLOR_ICO_RED   ,


  		




  30
  
  
    
           COLOR_ICO_ORANGE, COLOR_ICO_LGREEN,


  		




  31
  
  
    
           COLOR_ICO_WHITE , COLOR_ICO_YELLOW


  		




  
  28
  
    
                 COLOR_VIOLET, COLOR_GREY,


  		




  
  29
  
    
                 COLOR_BLUE, COLOR_RED,


  		




  
  30
  
    
                 COLOR_ORANGE, COLOR_LGREEN,


  		




  
  31
  
    
                 COLOR_WHITE, COLOR_YELLOW


  		




  32
  32
  
    
         };


  		




  33
  33
  
    

  		




  34
  34
  
    
  public static final int NUM_FACES = 8;


  		












  

    
      src/main/java/org/distorted/objectlib/shape/ShapeTetrahedron.java
    
  





  25
  25
  
    

  		




  26
  26
  
    
  public static final int[] FACE_COLORS = new int[]


  		




  27
  27
  
    
         {


  		




  28
  
  
    
           COLOR_ICO_LGREEN, COLOR_ICO_YELLOW,


  		




  29
  
  
    
           COLOR_ICO_BLUE  , COLOR_ICO_RED


  		




  
  28
  
    
                 COLOR_LGREEN, COLOR_YELLOW,


  		




  
  29
  
    
                 COLOR_BLUE, COLOR_RED


  		




  30
  30
  
    
         };


  		




  31
  31
  
    

  		




  32
  32
  
    
  public static final int NUM_FACES = 4;


  		












Also available in:  Unified diff