Revision a42e25a6
Added by Leszek Koltunski about 4 years ago
| src/main/java/org/distorted/magic/RubikSurfaceView.java | ||
|---|---|---|
| 190 | 190 |
} |
| 191 | 191 |
else |
| 192 | 192 |
{
|
| 193 |
mDragging = mPostRender.canDrag();
|
|
| 193 |
mDragging = true;
|
|
| 194 | 194 |
mBeginningRotation = false; |
| 195 | 195 |
mContinuingRotation = false; |
| 196 | 196 |
} |
| ... | ... | |
| 211 | 211 |
float len = (float)Math.sqrt(mAxisX*mAxisX + mAxisY*mAxisY); |
| 212 | 212 |
mAxisX /= len; |
| 213 | 213 |
mAxisY /= len; |
| 214 |
|
|
| 215 |
// android.util.Log.e("axis", "axis 2D: "+mAxisX+" , "+mAxisY);
|
|
| 216 | 214 |
} |
| 217 | 215 |
|
| 218 | 216 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| ... | ... | |
| 371 | 369 |
mPostRender.setQuatAccumulatedOnNextRender(); |
| 372 | 370 |
} |
| 373 | 371 |
} |
| 374 |
else if( mPostRender.canRotate() || mPostRender.canDrag() )
|
|
| 372 |
else |
|
| 375 | 373 |
{
|
| 376 | 374 |
setUpDragOrRotate(x,y); |
| 377 | 375 |
} |
Also available in: Unified diff
Bugfixes.