Revision 53f23b64
Added by Leszek Koltunski over 4 years ago
| src/main/java/org/distorted/magic/RubikSurfaceView.java | ||
|---|---|---|
| 162 | 162 |
|
| 163 | 163 |
private void setUpDragOrRotate(float x, float y) |
| 164 | 164 |
{
|
| 165 |
boolean rota = mRenderer.canRotate(); |
|
| 166 |
boolean drag = mRenderer.canDrag(); |
|
| 167 |
|
|
| 168 |
if( !rota && drag ) |
|
| 165 |
if( !RubikState.canRotate() ) |
|
| 169 | 166 |
{
|
| 170 | 167 |
mDragging = true; |
| 171 | 168 |
mBeginningRotation = false; |
| ... | ... | |
| 180 | 177 |
if( mMovement!=null && mMovement.faceTouched(rotatedTouchPoint1,rotatedCamera) ) |
| 181 | 178 |
{
|
| 182 | 179 |
mDragging = false; |
| 183 |
mBeginningRotation = rota;
|
|
| 180 |
mBeginningRotation = mRenderer.canRotate();
|
|
| 184 | 181 |
mContinuingRotation = false; |
| 185 | 182 |
} |
| 186 | 183 |
else |
| 187 | 184 |
{
|
| 188 |
mDragging = drag;
|
|
| 185 |
mDragging = mRenderer.canDrag();
|
|
| 189 | 186 |
mBeginningRotation = false; |
| 190 | 187 |
mContinuingRotation = false; |
| 191 | 188 |
} |
Also available in: Unified diff
Progress with Pretty Patterns - do away with the tabbed dialog!