Revision b78ebd76
Added by Leszek Koltunski over 2 years ago
| src/main/java/org/distorted/objectlib/helpers/BlockController.java | ||
|---|---|---|
| 33 | 33 |
|
| 34 | 34 |
public class BlockController |
| 35 | 35 |
{
|
| 36 |
public static final int RUBIK_PLACE_0 =0; |
|
| 37 |
public static final int RUBIK_PLACE_1 =1; |
|
| 38 |
public static final int RUBIK_PLACE_2 =2; |
|
| 39 |
public static final int RUBIK_PLACE_3 =3; |
|
| 40 |
public static final int RUBIK_PLACE_4 =4; |
|
| 41 |
public static final int TUTORIAL_PLACE_0 =10; |
|
| 42 |
public static final int TUTORIAL_PLACE_1 =11; |
|
| 43 |
public static final int TUTORIAL_PLACE_2 =12; |
|
| 44 |
public static final int TUTORIAL_PLACE_3 =13; |
|
| 45 |
public static final int TUTORIAL_PLACE_4 =14; |
|
| 36 |
public static final int PLACE_0 =0; |
|
| 37 |
public static final int PLACE_1 =1; |
|
| 38 |
public static final int PLACE_2 =2; |
|
| 39 |
public static final int PLACE_3 =3; |
|
| 40 |
public static final int PLACE_4 =4; |
|
| 46 | 41 |
public static final int CONTROL_PLACE_0 =20; |
| 47 | 42 |
public static final int CONTROL_PLACE_1 =21; |
| 48 | 43 |
public static final int MOVES_PLACE_0 =30; |
| ... | ... | |
| 107 | 102 |
{
|
| 108 | 103 |
switch(last) |
| 109 | 104 |
{
|
| 110 |
case RUBIK_PLACE_3 : |
|
| 111 |
case TUTORIAL_PLACE_3: return THRESHHOLD_1; |
|
| 112 |
case RUBIK_PLACE_4 : |
|
| 113 |
case TUTORIAL_PLACE_4: return THRESHHOLD_2; |
|
| 105 |
case PLACE_3 :return THRESHHOLD_1; |
|
| 106 |
case PLACE_4 : return THRESHHOLD_2; |
|
| 114 | 107 |
case CONTROL_PLACE_0 : |
| 115 | 108 |
case CONTROL_PLACE_1 : return THRESHHOLD_3; |
| 116 | 109 |
default : return THRESHHOLD_0; |
| src/main/java/org/distorted/objectlib/main/ObjectPreRender.java | ||
|---|---|---|
| 200 | 200 |
private void finishRotationNow() |
| 201 | 201 |
{
|
| 202 | 202 |
mFinishRotation = false; |
| 203 |
blockEverything(BlockController.RUBIK_PLACE_0);
|
|
| 203 |
blockEverything(BlockController.PLACE_0); |
|
| 204 | 204 |
mRotationFinishedID = mNewObject.finishRotationNow(this, mNearestAngle); |
| 205 | 205 |
|
| 206 | 206 |
if( mRotationFinishedID==0 ) // failed to add effect - should never happen |
| ... | ... | |
| 217 | 217 |
|
| 218 | 218 |
if ( mNewObject==null || mNewObject.getObjectType()!=mNextObject ) |
| 219 | 219 |
{
|
| 220 |
blockEverything(BlockController.RUBIK_PLACE_1);
|
|
| 220 |
blockEverything(BlockController.PLACE_1); |
|
| 221 | 221 |
createObjectNow(mNextObject, null); |
| 222 | 222 |
doEffectNow( BaseEffect.Type.SIZECHANGE ); |
| 223 | 223 |
} |
| ... | ... | |
| 231 | 231 |
|
| 232 | 232 |
if ( mNewObject==null || mNewObject.getObjectType()!=mNextObject) |
| 233 | 233 |
{
|
| 234 |
blockEverything(BlockController.RUBIK_PLACE_2);
|
|
| 234 |
blockEverything(BlockController.PLACE_2); |
|
| 235 | 235 |
createObjectNow(mNextObject, mNextMoves); |
| 236 | 236 |
doEffectNow( BaseEffect.Type.SIZECHANGE ); |
| 237 | 237 |
} |
| ... | ... | |
| 247 | 247 |
{
|
| 248 | 248 |
mScrambleObject = false; |
| 249 | 249 |
mIsSolved = false; |
| 250 |
blockEverything(BlockController.RUBIK_PLACE_3);
|
|
| 250 |
blockEverything(BlockController.PLACE_3); |
|
| 251 | 251 |
doEffectNow( BaseEffect.Type.SCRAMBLE ); |
| 252 | 252 |
} |
| 253 | 253 |
|
| ... | ... | |
| 256 | 256 |
private void solveObjectNow() |
| 257 | 257 |
{
|
| 258 | 258 |
mSolveObject = false; |
| 259 |
blockEverything(BlockController.RUBIK_PLACE_4);
|
|
| 259 |
blockEverything(BlockController.PLACE_4); |
|
| 260 | 260 |
doEffectNow( BaseEffect.Type.SOLVE ); |
| 261 | 261 |
} |
| 262 | 262 |
|
Also available in: Unified diff
Simplifications