Revision 348dfe69
Added by Leszek Koltunski over 4 years ago
src/main/java/org/distorted/object/RubikCubeMovement.java | ||
---|---|---|
160 | 160 |
{ |
161 | 161 |
float cubeHalfSize= RubikCube.CUBE_SCREEN_RATIO*0.5f; |
162 | 162 |
|
163 |
mPoint[0] = rotatedTouchPoint.get1();
|
|
164 |
mPoint[1] = rotatedTouchPoint.get2();
|
|
165 |
mPoint[2] = rotatedTouchPoint.get3();
|
|
163 |
mPoint[0] = rotatedTouchPoint.get0();
|
|
164 |
mPoint[1] = rotatedTouchPoint.get1();
|
|
165 |
mPoint[2] = rotatedTouchPoint.get2();
|
|
166 | 166 |
|
167 |
mCamera[0] = rotatedCamera.get1();
|
|
168 |
mCamera[1] = rotatedCamera.get2();
|
|
169 |
mCamera[2] = rotatedCamera.get3();
|
|
167 |
mCamera[0] = rotatedCamera.get0();
|
|
168 |
mCamera[1] = rotatedCamera.get1();
|
|
169 |
mCamera[2] = rotatedCamera.get2();
|
|
170 | 170 |
|
171 | 171 |
for( mLastTouchedFace=FRONT; mLastTouchedFace<=BOTTOM; mLastTouchedFace++) |
172 | 172 |
{ |
... | ... | |
192 | 192 |
{ |
193 | 193 |
float cubeHalfSize= RubikCube.CUBE_SCREEN_RATIO*0.5f; |
194 | 194 |
|
195 |
mPoint[0] = rotatedTouchPoint.get1();
|
|
196 |
mPoint[1] = rotatedTouchPoint.get2();
|
|
197 |
mPoint[2] = rotatedTouchPoint.get3();
|
|
195 |
mPoint[0] = rotatedTouchPoint.get0();
|
|
196 |
mPoint[1] = rotatedTouchPoint.get1();
|
|
197 |
mPoint[2] = rotatedTouchPoint.get2();
|
|
198 | 198 |
|
199 | 199 |
castTouchPointOntoFace(mLastTouchedFace,cubeHalfSize,mDiff); |
200 | 200 |
|
... | ... | |
218 | 218 |
|
219 | 219 |
public float continueRotation(Static4D rotatedTouchPoint) |
220 | 220 |
{ |
221 |
mDiff[0] = rotatedTouchPoint.get1()-mTouch[0];
|
|
222 |
mDiff[1] = rotatedTouchPoint.get2()-mTouch[1];
|
|
223 |
mDiff[2] = rotatedTouchPoint.get3()-mTouch[2];
|
|
221 |
mDiff[0] = rotatedTouchPoint.get0()-mTouch[0];
|
|
222 |
mDiff[1] = rotatedTouchPoint.get1()-mTouch[1];
|
|
223 |
mDiff[2] = rotatedTouchPoint.get2()-mTouch[2];
|
|
224 | 224 |
|
225 | 225 |
int xAxis= retFaceXaxis(mLastTouchedFace); |
226 | 226 |
int yAxis= retFaceYaxis(mLastTouchedFace); |
Also available in: Unified diff
Adjustment to Static's API.