Revision 967c1d17
Added by Leszek Koltunski over 2 years ago
| src/main/java/org/distorted/objects/TwistySquare.java | ||
|---|---|---|
| 19 | 19 |
|
| 20 | 20 |
package org.distorted.objects; |
| 21 | 21 |
|
| 22 |
import static org.distorted.objects.Movement.TYPE_NOT_SPLIT; |
|
| 23 |
|
|
| 22 | 24 |
import android.content.res.Resources; |
| 23 | 25 |
|
| 24 | 26 |
import org.distorted.library.main.DistortedEffects; |
| ... | ... | |
| 46 | 48 |
new Static3D(0,-1,0), |
| 47 | 49 |
}; |
| 48 | 50 |
|
| 51 |
private static final int[] NUM_ENABLED = {1,1,1,1,2,2};
|
|
| 52 |
|
|
| 53 |
private static final int[][][] ENABLED = new int[][][] |
|
| 54 |
{
|
|
| 55 |
{{0}},{{0}},{{1}},{{1}},{{0,1}},{{0,1}}
|
|
| 56 |
}; |
|
| 57 |
|
|
| 49 | 58 |
private int[] mBasicAngle; |
| 50 | 59 |
private float[][] mCuts; |
| 51 | 60 |
private boolean[][] mLayerRotatable; |
| ... | ... | |
| 155 | 164 |
int numLayers = getNumLayers(); |
| 156 | 165 |
if( mCuts==null ) getCuts(numLayers); |
| 157 | 166 |
getLayerRotatable(numLayers); |
| 158 |
|
|
| 159 |
mMovement = new MovementSquare(mCuts,mLayerRotatable,numLayers); |
|
| 167 |
mMovement = new Movement6(ROT_AXIS,mCuts,mLayerRotatable,numLayers,TYPE_NOT_SPLIT,NUM_ENABLED,ENABLED); |
|
| 160 | 168 |
} |
| 161 | 169 |
return mMovement; |
| 162 | 170 |
} |
Also available in: Unified diff
Do away with the last method in the object Movement classes. Remove the object Movement classes altogether.
From now on the implementation of a TwistyPuzzle is 100% data, no code at all.
Next step: make the implementation a (generated?) (XML?) file.