Project

General

Profile

« Previous | Next » 

Revision 74c9af0d

Added by Leszek Koltunski over 2 years ago

Next step on the way to completely do away with object Movement classes.

View differences:

src/main/java/org/distorted/objects/MovementPyraminx.java
23 23

  
24 24
class MovementPyraminx extends Movement4
25 25
{
26
  private static final int[] NUM_ENABLED = {3,3,3,3};
27

  
28
  private static final int[][][] ENABLED = new int[][][]
29
      {
30
          {{1,2,3}},{{0,2,3}},{{0,1,3}},{{0,1,2}}
31
      };
32

  
33
///////////////////////////////////////////////////////////////////////////////////////////////////
34

  
26 35
  MovementPyraminx(float[][] cuts, boolean[][] rotatable, int size)
27 36
    {
28 37
    super(TwistyPyraminx.ROT_AXIS,cuts,rotatable,size);
......
32 41

  
33 42
  void computeEnabledAxis(int face, float[] touchPoint, int[] enabled)
34 43
    {
35
    enabled[0] = 3;
36

  
37
    switch(face)
38
      {
39
      case 0: enabled[1]=1; enabled[2]=2; enabled[3]=3; break;
40
      case 1: enabled[1]=0; enabled[2]=2; enabled[3]=3; break;
41
      case 2: enabled[1]=0; enabled[2]=1; enabled[3]=3; break;
42
      case 3: enabled[1]=0; enabled[2]=1; enabled[3]=2; break;
43
      }
44
    int num = NUM_ENABLED[face];
45
    enabled[0] = num;
46
    System.arraycopy(ENABLED[face][0], 0, enabled, 1, num);
44 47
    }
45 48
}

Also available in: Unified diff