Revision f5da732a
Added by Leszek Koltunski almost 3 years ago
| src/main/java/org/distorted/main/RubikSurfaceView.java | ||
|---|---|---|
| 327 | 327 |
|
| 328 | 328 |
if( down ) |
| 329 | 329 |
{
|
| 330 |
RubikScreenSolver solver = (RubikScreenSolver) ScreenList.SVER.getStateClass();
|
|
| 330 |
RubikScreenSolver solver = (RubikScreenSolver) ScreenList.SVER.getScreenClass();
|
|
| 331 | 331 |
mLastCubitFace = mMovement.getTouchedFace(); |
| 332 | 332 |
float[] point = mMovement.getTouchedPoint3D(); |
| 333 | 333 |
int color = solver.getCurrentColor(); |
| ... | ... | |
| 416 | 416 |
|
| 417 | 417 |
if( angle!=0 ) |
| 418 | 418 |
{
|
| 419 |
if( ScreenList.getCurrentState()== ScreenList.SOLV )
|
|
| 419 |
if( ScreenList.getCurrentScreen()== ScreenList.SOLV )
|
|
| 420 | 420 |
{
|
| 421 |
RubikScreenSolving solving = (RubikScreenSolving) ScreenList.SOLV.getStateClass();
|
|
| 421 |
RubikScreenSolving solving = (RubikScreenSolving) ScreenList.SOLV.getScreenClass();
|
|
| 422 | 422 |
solving.addMove(mCurrentAxis, mCurrentRow, angle); |
| 423 | 423 |
} |
| 424 |
if( ScreenList.getCurrentState()== ScreenList.PLAY )
|
|
| 424 |
if( ScreenList.getCurrentScreen()== ScreenList.PLAY )
|
|
| 425 | 425 |
{
|
| 426 |
RubikScreenPlay play = (RubikScreenPlay) ScreenList.PLAY.getStateClass();
|
|
| 426 |
RubikScreenPlay play = (RubikScreenPlay) ScreenList.PLAY.getScreenClass();
|
|
| 427 | 427 |
play.addMove(mCurrentAxis, mCurrentRow, angle); |
| 428 | 428 |
} |
| 429 | 429 |
} |
| ... | ... | |
| 477 | 477 |
|
| 478 | 478 |
object.beginNewRotation( mCurrentAxis, mCurrentRow ); |
| 479 | 479 |
|
| 480 |
if( ScreenList.getCurrentState()== ScreenList.READ )
|
|
| 480 |
if( ScreenList.getCurrentScreen()== ScreenList.READ )
|
|
| 481 | 481 |
{
|
| 482 |
RubikScreenSolving solving = (RubikScreenSolving) ScreenList.SOLV.getStateClass();
|
|
| 482 |
RubikScreenSolving solving = (RubikScreenSolving) ScreenList.SOLV.getScreenClass();
|
|
| 483 | 483 |
solving.resetElapsed(); |
| 484 | 484 |
|
| 485 | 485 |
final RubikActivity act = (RubikActivity)getContext(); |
| ... | ... | |
| 489 | 489 |
@Override |
| 490 | 490 |
public void run() |
| 491 | 491 |
{
|
| 492 |
ScreenList.switchState( act, ScreenList.SOLV);
|
|
| 492 |
ScreenList.switchScreen( act, ScreenList.SOLV);
|
|
| 493 | 493 |
} |
| 494 | 494 |
}); |
| 495 | 495 |
} |
Also available in: Unified diff
Cube Control: step 2.