Project

General

Profile

« Previous | Next » 

Revision 69d985ae

Added by Leszek Koltunski 2 months ago

Beginnings of color unification

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_WHITE };


  		




  
  41
  
    
  private static final int[] FACE_COLORS = new int[] { ShapeColors.COLOR_ICO_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_WHITE };


  		




  
  44
  
    
  private static final int[] FACE_COLORS = new int[] { ShapeColors.COLOR_ICO_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_WHITE };


  		




  
  41
  
    
  private static final int[] FACE_COLORS = new int[] { ShapeColors.COLOR_ICO_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_WHITE };


  		




  
  42
  
    
  private static final int[] FACE_COLORS = new int[] { ShapeColors.COLOR_ICO_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
    
  





  11
  11
  
    

  		




  12
  12
  
    
///////////////////////////////////////////////////////////////////////////////////////////////////


  		




  13
  13
  
    

  		




  14
  
  
    
public class ShapeColors {


  		




  15
  
  
    
  public static final int COLOR_YELLOW   = 0xffffff00;


  		




  16
  
  
    
  public static final int COLOR_WHITE    = 0xffffffff;


  		




  17
  
  
    
  public static final int COLOR_BLUE     = 0xff0000ff;


  		




  18
  
  
    
  public static final int COLOR_GREEN    = 0xff00bb00;


  		




  19
  
  
    
  public static final int COLOR_RED      = 0xff990000;


  		




  20
  
  
    
  public static final int COLOR_ORANGE   = 0xffff6200;


  		




  21
  
  
    
  public static final int COLOR_GREY     = 0xff727c7b;


  		




  22
  
  
    
  public static final int COLOR_VIOLET   = 0xff7700bb;


  		




  23
  
  
    

  		




  
  14
  
    
public class ShapeColors


  		




  
  15
  
    
{


  		




  24
  16
  
    
  public static final int COLOR_BALL_1 = 0xffcc0000;


  		




  25
  17
  
    
  public static final int COLOR_BALL_2 = 0xffcb2d6a;


  		




  26
  18
  
    
  public static final int COLOR_BALL_3 = 0xff4ec9d0;


  		




  ......




  30
  22
  
    
  public static final int COLOR_BALL_7 = 0xffedca54;


  		




  31
  23
  
    
  public static final int COLOR_BALL_8 = 0xfffe5740;


  		




  32
  24
  
    

  		




  33
  
  
    
  public static final int MINX_LGREEN = 0xff53aa00;


  		




  34
  
  
    
  public static final int MINX_PINK   = 0xfffd7ab7;


  		




  35
  
  
    
  public static final int MINX_SANDY  = 0xffefd48b;


  		




  36
  
  
    
  public static final int MINX_LBLUE  = 0xff00a2d7;


  		




  37
  
  
    
  public static final int MINX_ORANGE = 0xffff6200;


  		




  38
  
  
    
  public static final int MINX_VIOLET = 0xff7d59a4;


  		




  39
  
  
    
  public static final int MINX_DGREEN = 0xff007a47;


  		




  40
  
  
    
  public static final int MINX_DRED   = 0xffbd0000;


  		




  41
  
  
    
  public static final int MINX_DBLUE  = 0xff1a29b2;


  		




  42
  
  
    
  public static final int MINX_DYELLOW= 0xffffc400;


  		




  43
  
  
    
  public static final int MINX_WHITE  = 0xffffffff;


  		




  44
  
  
    
  public static final int MINX_GREY   = 0xff727c7b;


  		




  
  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
  45
  
    

  		




  46
  
  
    
  public static final int COLOR_ICO_1 = 0xffe191b4;


  		




  47
  
  
    
  public static final int COLOR_ICO_2 = 0xff604c94;


  		




  48
  
  
    
  public static final int COLOR_ICO_3 = 0xff472258;


  		




  49
  
  
    
  public static final int COLOR_ICO_4 = 0xff591218;


  		




  50
  
  
    
  public static final int COLOR_ICO_5 = 0xffba365b;


  		




  51
  
  
    
  public static final int COLOR_ICO_6 = 0xffe4d031;


  		




  52
  
  
    
  public static final int COLOR_ICO_7 = 0xff4a90d5;


  		




  53
  
  
    
  public static final int COLOR_ICO_8 = 0xff0e28a3;


  		




  54
  
  
    
  public static final int COLOR_ICO_9 = 0xff566069;


  		




  55
  
  
    
  public static final int COLOR_ICO_10= 0xffd7660a;


  		




  56
  
  
    
  public static final int COLOR_ICO_11= 0xff092d2b;


  		




  57
  
  
    
  public static final int COLOR_ICO_12= 0xff034d3e;


  		




  58
  
  
    
  public static final int COLOR_ICO_13= 0xff1a7516;


  		




  59
  
  
    
  public static final int COLOR_ICO_14= 0xff58b6be;


  		




  60
  
  
    
  public static final int COLOR_ICO_15= 0xffd3c49b;


  		




  61
  
  
    
  public static final int COLOR_ICO_16= 0xff0a1662;


  		




  62
  
  
    
  public static final int COLOR_ICO_17= 0xffa21a1c;


  		




  63
  
  
    
  public static final int COLOR_ICO_18= 0xffe1b410;


  		




  64
  
  
    
  public static final int COLOR_ICO_19= 0xffdadeea;


  		




  65
  
  
    
  public static final int COLOR_ICO_20= 0xff0157ba;


  		




  
  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;


  		




  66
  50
  
    
}


  		












  

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





  25
  25
  
    

  		




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


  		




  27
  27
  
    
         {


  		




  28
  
  
    
           MINX_DYELLOW, MINX_ORANGE , MINX_DRED  , MINX_SANDY,


  		




  29
  
  
    
           MINX_DBLUE  , MINX_WHITE  , MINX_GREY  , MINX_LBLUE,


  		




  30
  
  
    
           MINX_LGREEN , MINX_VIOLET , MINX_PINK  , MINX_DGREEN


  		




  
  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


  		




  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_YELLOW, COLOR_WHITE,


  		




  29
  
  
    
           COLOR_BLUE  , COLOR_GREEN,


  		




  30
  
  
    
           COLOR_RED   , COLOR_ORANGE


  		




  
  28
  
    
           COLOR_ICO_YELLOW, COLOR_ICO_WHITE,


  		




  
  29
  
    
           COLOR_ICO_BLUE  , COLOR_ICO_LGREEN,


  		




  
  30
  
    
           COLOR_ICO_RED   , COLOR_ICO_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_1 , COLOR_ICO_2 , COLOR_ICO_3 , COLOR_ICO_4 , COLOR_ICO_5 ,


  		




  29
  
  
    
           COLOR_ICO_6 , COLOR_ICO_7 , COLOR_ICO_8 , COLOR_ICO_9 , COLOR_ICO_10,


  		




  30
  
  
    
           COLOR_ICO_11, COLOR_ICO_12, COLOR_ICO_13, COLOR_ICO_14, COLOR_ICO_15,


  		




  31
  
  
    
           COLOR_ICO_16, COLOR_ICO_17, COLOR_ICO_18, COLOR_ICO_19, COLOR_ICO_20,


  		




  
  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,


  		




  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_VIOLET, COLOR_GREY  ,


  		




  29
  
  
    
           COLOR_BLUE  , COLOR_RED   ,


  		




  30
  
  
    
           COLOR_ORANGE, COLOR_GREEN ,


  		




  31
  
  
    
           COLOR_WHITE , COLOR_YELLOW


  		




  
  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


  		




  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_GREEN, COLOR_YELLOW,


  		




  29
  
  
    
           COLOR_BLUE , COLOR_RED


  		




  
  28
  
    
           COLOR_ICO_LGREEN, COLOR_ICO_YELLOW,


  		




  
  29
  
    
           COLOR_ICO_BLUE  , COLOR_ICO_RED


  		




  30
  30
  
    
         };


  		




  31
  31
  
    

  		




  32
  32
  
    
  public static final int NUM_FACES = 4;


  		












Also available in:  Unified diff