Revision fcd5b990
Added by Leszek Koltunski almost 3 years ago
| src/main/java/org/distorted/main/RubikSurfaceView.java | ||
|---|---|---|
| 35 | 35 |
import org.distorted.objects.TwistyObject; |
| 36 | 36 |
import org.distorted.objects.Movement; |
| 37 | 37 |
import org.distorted.solvers.SolverMain; |
| 38 |
import org.distorted.states.StateList;
|
|
| 39 |
import org.distorted.states.RubikStatePlay;
|
|
| 40 |
import org.distorted.states.RubikStateSolver;
|
|
| 41 |
import org.distorted.states.RubikStateSolving;
|
|
| 38 |
import org.distorted.screens.ScreenList;
|
|
| 39 |
import org.distorted.screens.RubikScreenPlay;
|
|
| 40 |
import org.distorted.screens.RubikScreenSolver;
|
|
| 41 |
import org.distorted.screens.RubikScreenSolving;
|
|
| 42 | 42 |
|
| 43 | 43 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 44 | 44 |
|
| ... | ... | |
| 295 | 295 |
|
| 296 | 296 |
private void setUpDragOrRotate(boolean down, float x, float y) |
| 297 | 297 |
{
|
| 298 |
int mode = StateList.getMode();
|
|
| 298 |
int mode = ScreenList.getMode();
|
|
| 299 | 299 |
|
| 300 | 300 |
if( mode==MODE_DRAG ) |
| 301 | 301 |
{
|
| ... | ... | |
| 327 | 327 |
|
| 328 | 328 |
if( down ) |
| 329 | 329 |
{
|
| 330 |
RubikStateSolver solver = (RubikStateSolver) StateList.SVER.getStateClass();
|
|
| 330 |
RubikScreenSolver solver = (RubikScreenSolver) ScreenList.SVER.getStateClass();
|
|
| 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( StateList.getCurrentState()== StateList.SOLV )
|
|
| 419 |
if( ScreenList.getCurrentState()== ScreenList.SOLV )
|
|
| 420 | 420 |
{
|
| 421 |
RubikStateSolving solving = (RubikStateSolving) StateList.SOLV.getStateClass();
|
|
| 421 |
RubikScreenSolving solving = (RubikScreenSolving) ScreenList.SOLV.getStateClass();
|
|
| 422 | 422 |
solving.addMove(mCurrentAxis, mCurrentRow, angle); |
| 423 | 423 |
} |
| 424 |
if( StateList.getCurrentState()== StateList.PLAY )
|
|
| 424 |
if( ScreenList.getCurrentState()== ScreenList.PLAY )
|
|
| 425 | 425 |
{
|
| 426 |
RubikStatePlay play = (RubikStatePlay) StateList.PLAY.getStateClass();
|
|
| 426 |
RubikScreenPlay play = (RubikScreenPlay) ScreenList.PLAY.getStateClass();
|
|
| 427 | 427 |
play.addMove(mCurrentAxis, mCurrentRow, angle); |
| 428 | 428 |
} |
| 429 | 429 |
} |
| ... | ... | |
| 477 | 477 |
|
| 478 | 478 |
object.beginNewRotation( mCurrentAxis, mCurrentRow ); |
| 479 | 479 |
|
| 480 |
if( StateList.getCurrentState()== StateList.READ )
|
|
| 480 |
if( ScreenList.getCurrentState()== ScreenList.READ )
|
|
| 481 | 481 |
{
|
| 482 |
RubikStateSolving solving = (RubikStateSolving) StateList.SOLV.getStateClass();
|
|
| 482 |
RubikScreenSolving solving = (RubikScreenSolving) ScreenList.SOLV.getStateClass();
|
|
| 483 | 483 |
solving.resetElapsed(); |
| 484 | 484 |
|
| 485 | 485 |
final RubikActivity act = (RubikActivity)getContext(); |
| ... | ... | |
| 489 | 489 |
@Override |
| 490 | 490 |
public void run() |
| 491 | 491 |
{
|
| 492 |
StateList.switchState( act, StateList.SOLV);
|
|
| 492 |
ScreenList.switchState( act, ScreenList.SOLV);
|
|
| 493 | 493 |
} |
| 494 | 494 |
}); |
| 495 | 495 |
} |
Also available in: Unified diff
Rename 'state' to 'screen'