Revision dd1a65c1
Added by Leszek Koltunski over 2 years ago
| src/main/java/org/distorted/control/RubikControlWhole.java | ||
|---|---|---|
| 281 | 281 |
RubikSurfaceView view = mControl.getSurfaceView(); |
| 282 | 282 |
float x = point1.get0() + mWidth*0.5f; |
| 283 | 283 |
float y = mHeight*0.5f - point1.get1(); |
| 284 |
|
|
| 285 |
/* |
|
| 284 | 286 |
view.prepareDown(); |
| 285 | 287 |
view.actionDown(x,y); |
| 288 |
|
|
| 289 |
*/ |
|
| 286 | 290 |
} |
| 287 | 291 |
|
| 288 | 292 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| ... | ... | |
| 509 | 513 |
float y2 = mHeight*0.5f - point2s.get1(); |
| 510 | 514 |
|
| 511 | 515 |
RubikSurfaceView view = mControl.getSurfaceView(); |
| 516 |
|
|
| 517 |
/* |
|
| 512 | 518 |
view.prepareDown(); |
| 513 | 519 |
view.prepareDown2(); |
| 514 | 520 |
view.actionDown(x1,y1); |
| 515 | 521 |
view.actionDown2(x1,y1,x2,y2); |
| 522 |
|
|
| 523 |
*/ |
|
| 516 | 524 |
} |
| 517 | 525 |
|
| 518 | 526 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| ... | ... | |
| 920 | 928 |
RubikSurfaceView view = mControl.getSurfaceView(); |
| 921 | 929 |
float x1 = tmpBuffer[0]+mWidth*0.5f; |
| 922 | 930 |
float y1 = mHeight*0.5f-tmpBuffer[1]; |
| 923 |
view.actionMove(x1,y1,0,0); |
|
| 931 |
//view.actionMove(x1,y1,0,0);
|
|
| 924 | 932 |
} |
| 925 | 933 |
|
| 926 | 934 |
if( finished1 ) |
| ... | ... | |
| 928 | 936 |
if( mCurrentStage==3 ) |
| 929 | 937 |
{
|
| 930 | 938 |
RubikSurfaceView view = mControl.getSurfaceView(); |
| 931 |
view.prepareUp(); |
|
| 932 |
view.actionUp(); |
|
| 939 |
//view.prepareUp();
|
|
| 940 |
//view.actionUp();
|
|
| 933 | 941 |
} |
| 934 | 942 |
|
| 935 | 943 |
stageFinished(mCurrentStage); |
| ... | ... | |
| 947 | 955 |
float y1 = mHeight*0.5f-tmpBuffer[1]; |
| 948 | 956 |
float x2 = tmpBuffer[3]+mWidth*0.5f; |
| 949 | 957 |
float y2 = mHeight*0.5f-tmpBuffer[4]; |
| 950 |
view.prepareMove(x1,y1,x2,y2); |
|
| 951 |
view.actionMove(x1,y1,x2,y2); |
|
| 958 |
//view.prepareMove(x1,y1,x2,y2);
|
|
| 959 |
//view.actionMove(x1,y1,x2,y2);
|
|
| 952 | 960 |
} |
| 953 | 961 |
|
| 954 | 962 |
if( finished2_1 && finished2_2 ) |
| ... | ... | |
| 956 | 964 |
if( mCurrentStage==11 ) |
| 957 | 965 |
{
|
| 958 | 966 |
RubikSurfaceView view = mControl.getSurfaceView(); |
| 959 |
view.prepareUp(); |
|
| 960 |
view.actionUp2(true,0,0,false,0,0); |
|
| 961 |
view.actionUp(); |
|
| 967 |
//view.prepareUp();
|
|
| 968 |
//view.actionUp2(true,0,0,false,0,0);
|
|
| 969 |
//view.actionUp();
|
|
| 962 | 970 |
} |
| 963 | 971 |
|
| 964 | 972 |
stageFinished(mCurrentStage); |
Also available in: Unified diff
Move ObjectControl, the next big chunk of code, to objectlib.