Project

General

Profile

« Previous | Next » 

Revision bc39861d

Added by Leszek Koltunski over 3 years ago

Trajber's Octahedron: add object to the system.

View differences:

src/main/java/org/distorted/objectlib/main/ObjectConstants.java
31 31 
  public static final int CUBE_7 = ObjectType.CUBE_7.ordinal();
32 32 
  public static final int MIRR_2 = ObjectType.MIRR_2.ordinal();
33 33 
  public static final int MIRR_3 = ObjectType.MIRR_3.ordinal();
34 
  public static final int JING_2 = ObjectType.JING_2.ordinal();
35 
  public static final int PYRA_3 = ObjectType.PYRA_3.ordinal();
36 
  public static final int PYRA_4 = ObjectType.PYRA_4.ordinal();
37 
  public static final int PYRA_5 = ObjectType.PYRA_5.ordinal();
34 
  public static final int CU_323 = ObjectType.CU_323.ordinal();
35 
  public static final int CU_232 = ObjectType.CU_232.ordinal();
36 
  public static final int CU_343 = ObjectType.CU_343.ordinal();
37 
  public static final int ULTI_2 = ObjectType.ULTI_2.ordinal();
38 38 
  public static final int KILO_3 = ObjectType.KILO_3.ordinal();
39 39 
  public static final int KILO_5 = ObjectType.KILO_5.ordinal();
40 40 
  public static final int MEGA_3 = ObjectType.MEGA_3.ordinal();
41 41 
  public static final int MEGA_5 = ObjectType.MEGA_5.ordinal();
42 
  public static final int ULTI_2 = ObjectType.ULTI_2.ordinal();
42 
  public static final int JING_2 = ObjectType.JING_2.ordinal();
43 
  public static final int PYRA_3 = ObjectType.PYRA_3.ordinal();
44 
  public static final int PYRA_4 = ObjectType.PYRA_4.ordinal();
45 
  public static final int PYRA_5 = ObjectType.PYRA_5.ordinal();
46 
  public static final int TRAJ_3 = ObjectType.TRAJ_3.ordinal();
43 47 
  public static final int DIAM_2 = ObjectType.DIAM_2.ordinal();
44 48 
  public static final int DIAM_3 = ObjectType.DIAM_3.ordinal();
45 49 
  public static final int DIAM_4 = ObjectType.DIAM_4.ordinal();
......
57 61 
  public static final int BAN4_3 = ObjectType.BAN4_3.ordinal();
58 62 
  public static final int SQU1_3 = ObjectType.SQU1_3.ordinal();
59 63 
  public static final int SQU2_3 = ObjectType.SQU2_3.ordinal();
60 
  public static final int CU_323 = ObjectType.CU_323.ordinal();
61 
  public static final int CU_232 = ObjectType.CU_232.ordinal();
62 
  public static final int CU_343 = ObjectType.CU_343.ordinal();
63 64 
  }
src/main/java/org/distorted/objectlib/main/ObjectType.java
53 53 
  PYRA_3 ( TwistyPyraminx.class      , new int[] {3,3,3,3}    , 10, R.drawable.pyra_3s, R.drawable.pyra_3m, R.drawable.pyra_3b, R.drawable.pyra_3h),
54 54 
  PYRA_4 ( TwistyPyraminx.class      , new int[] {4,4,4,4}    , 17, R.drawable.pyra_4s, R.drawable.pyra_4m, R.drawable.pyra_4b, R.drawable.pyra_4h),
55 55 
  PYRA_5 ( TwistyPyraminx.class      , new int[] {5,5,5,5}    , 23, R.drawable.pyra_5s, R.drawable.pyra_5m, R.drawable.pyra_5b, R.drawable.pyra_5h),
56 
  TRAJ_3 ( TwistyTrajber.class       , new int[] {3,3,3}      , 17, R.drawable.diam_2s, R.drawable.diam_2m, R.drawable.diam_2b, R.drawable.diam_2h),
56 
  TRAJ_3 ( TwistyTrajber.class       , new int[] {3,3,3}      , 17, R.drawable.traj_3s, R.drawable.traj_3m, R.drawable.traj_3b, R.drawable.traj_3h),
57 57 
  DIAM_2 ( TwistyDiamond.class       , new int[] {2,2,2,2}    , 12, R.drawable.diam_2s, R.drawable.diam_2m, R.drawable.diam_2b, R.drawable.diam_2h),
58 58 
  DIAM_3 ( TwistyDiamond.class       , new int[] {3,3,3,3}    , 24, R.drawable.diam_3s, R.drawable.diam_3m, R.drawable.diam_3b, R.drawable.diam_3h),
59 59 
  DIAM_4 ( TwistyDiamond.class       , new int[] {4,4,4,4}    , 32, R.drawable.diam_4s, R.drawable.diam_4m, R.drawable.diam_4b, R.drawable.diam_4h),
src/main/java/org/distorted/objectlib/main/ShapeOctahedron.java
28 28 

  		




  29
  29
  
    
public abstract class ShapeOctahedron extends TwistyObject


  		




  30
  30
  
    
{


  		




  31
  
  
    
  public static final Static4D DEFAULT_ROT = new Static4D(-0.23377287f, 0.39656782f, 0.029073188f, 0.88726600f);


  		




  
  31
  
    
  public static final Static4D DEFAULT_ROT = new Static4D(-0.31521368f, 0.36868167f, -0.6488994f, 0.5862124f);


  		




  32
  32
  
    

  		




  33
  33
  
    
  static final int[] FACE_COLORS = new int[]


  		




  34
  34
  
    
         {


  		












Also available in:  Unified diff