Revision ef018c1b
Added by Leszek Koltunski over 2 years ago
| src/main/java/org/distorted/objects/MovementCornerTwisting.java | ||
|---|---|---|
| 23 | 23 |
|
| 24 | 24 |
class MovementCornerTwisting extends Movement6 |
| 25 | 25 |
{
|
| 26 |
MovementCornerTwisting() |
|
| 27 |
{
|
|
| 28 |
super(TwistySkewb.ROT_AXIS); |
|
| 29 |
} |
|
| 26 |
private static final int[][][] ENABLED = new int[][][] |
|
| 27 |
{
|
|
| 28 |
{{2,0,1},{2,3,1},{2,2,3},{2,0,2}},
|
|
| 29 |
{{2,2,3},{2,3,1},{2,0,1},{2,0,2}},
|
|
| 30 |
{{2,1,2},{2,0,1},{2,0,3},{2,2,3}},
|
|
| 31 |
{{2,1,2},{2,2,3},{2,0,3},{2,0,1}},
|
|
| 32 |
{{2,0,3},{2,0,2},{2,1,2},{2,1,3}},
|
|
| 33 |
{{2,1,2},{2,0,2},{2,0,3},{2,1,3}},
|
|
| 34 |
}; |
|
| 30 | 35 |
|
| 31 | 36 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 32 | 37 |
|
| 33 |
int computeRowFromOffset(int face, int axisIndex, int numLayers, float offset)
|
|
| 38 |
MovementCornerTwisting(float[][] cuts, boolean[][] rotatable, int numLayers)
|
|
| 34 | 39 |
{
|
| 35 |
return offset<0 ? 0 : numLayers-1;
|
|
| 40 |
super(TwistySkewb.ROT_AXIS,cuts,rotatable,numLayers);
|
|
| 36 | 41 |
} |
| 37 | 42 |
|
| 38 | 43 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| ... | ... | |
| 44 | 49 |
// | / 2 \ | |
| 45 | 50 |
// ------------- |
| 46 | 51 |
|
| 47 |
private int getQuarter(float[] touchPoint)
|
|
| 52 |
void computeEnabledAxis(int face, float[] touchPoint, int[] enabled)
|
|
| 48 | 53 |
{
|
| 49 | 54 |
boolean p0 = touchPoint[1] >= touchPoint[0]; |
| 50 | 55 |
boolean p1 = touchPoint[1] >=-touchPoint[0]; |
| 56 |
int quarter = p0 ? (p1 ? 0:3) : (p1 ? 1:2); |
|
| 51 | 57 |
|
| 52 |
if( p0 ) return p1 ? 0:3; |
|
| 53 |
else return p1 ? 1:2; |
|
| 54 |
} |
|
| 55 |
|
|
| 56 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 57 |
|
|
| 58 |
void computeEnabledAxis(int face, float[] touchPoint, int[] enabled) |
|
| 59 |
{
|
|
| 60 |
enabled[0] = 2; |
|
| 61 |
|
|
| 62 |
int quarter = getQuarter(touchPoint); |
|
| 63 |
|
|
| 64 |
switch(face) |
|
| 65 |
{
|
|
| 66 |
case 0: switch(quarter) |
|
| 67 |
{
|
|
| 68 |
case 0: enabled[1]=0; enabled[2]=1; break; |
|
| 69 |
case 1: enabled[1]=3; enabled[2]=1; break; |
|
| 70 |
case 2: enabled[1]=2; enabled[2]=3; break; |
|
| 71 |
case 3: enabled[1]=0; enabled[2]=2; break; |
|
| 72 |
} |
|
| 73 |
break; |
|
| 74 |
case 1: switch(quarter) |
|
| 75 |
{
|
|
| 76 |
case 0: enabled[1]=2; enabled[2]=3; break; |
|
| 77 |
case 1: enabled[1]=3; enabled[2]=1; break; |
|
| 78 |
case 2: enabled[1]=0; enabled[2]=1; break; |
|
| 79 |
case 3: enabled[1]=0; enabled[2]=2; break; |
|
| 80 |
} |
|
| 81 |
break; |
|
| 82 |
case 2: switch(quarter) |
|
| 83 |
{
|
|
| 84 |
case 0: enabled[1]=1; enabled[2]=2; break; |
|
| 85 |
case 1: enabled[1]=0; enabled[2]=1; break; |
|
| 86 |
case 2: enabled[1]=0; enabled[2]=3; break; |
|
| 87 |
case 3: enabled[1]=2; enabled[2]=3; break; |
|
| 88 |
} |
|
| 89 |
break; |
|
| 90 |
case 3: switch(quarter) |
|
| 91 |
{
|
|
| 92 |
case 0: enabled[1]=1; enabled[2]=2; break; |
|
| 93 |
case 1: enabled[1]=2; enabled[2]=3; break; |
|
| 94 |
case 2: enabled[1]=0; enabled[2]=3; break; |
|
| 95 |
case 3: enabled[1]=0; enabled[2]=1; break; |
|
| 96 |
} |
|
| 97 |
break; |
|
| 98 |
case 4: switch(quarter) |
|
| 99 |
{
|
|
| 100 |
case 0: enabled[1]=0; enabled[2]=3; break; |
|
| 101 |
case 1: enabled[1]=0; enabled[2]=2; break; |
|
| 102 |
case 2: enabled[1]=1; enabled[2]=2; break; |
|
| 103 |
case 3: enabled[1]=1; enabled[2]=3; break; |
|
| 104 |
} |
|
| 105 |
break; |
|
| 106 |
case 5: switch(quarter) |
|
| 107 |
{
|
|
| 108 |
case 0: enabled[1]=1; enabled[2]=2; break; |
|
| 109 |
case 1: enabled[1]=0; enabled[2]=2; break; |
|
| 110 |
case 2: enabled[1]=0; enabled[2]=3; break; |
|
| 111 |
case 3: enabled[1]=1; enabled[2]=3; break; |
|
| 112 |
} |
|
| 113 |
break; |
|
| 114 |
} |
|
| 58 |
enabled[0] = ENABLED[face][quarter][0]; |
|
| 59 |
enabled[1] = ENABLED[face][quarter][1]; |
|
| 60 |
enabled[2] = ENABLED[face][quarter][2]; |
|
| 115 | 61 |
} |
| 116 | 62 |
} |
| 63 |
|
|
Also available in: Unified diff
Abstract the next function, computeRowFromOffset(), out of the individual Movement classes.
Still two issues:
1) mysterious 1.5 multiplier in Movement12
2) in Movement8, moving the offset works only if the rotAxis are face-turning, i.e. they connect the centers of the opposing faces of the octahedron.