Revision 5ea2d29e
Added by Leszek Koltunski over 1 year ago
| src/main/java/org/distorted/objectlib/main/Cubit.java | ||
|---|---|---|
| 51 | 51 |
mCubitType = mParent.getCubitRotationType(cubitIndex); |
| 52 | 52 |
mRowOffset = mParent.getCubitRowOffset(cubitIndex); |
| 53 | 53 |
mTrackingPoint= mParent.getTrackingPoint(cubitIndex,mCubitType); |
| 54 |
int face = mParent.computeCurrentPuzzleFace(mCubitType,mTrackingPoint); |
|
| 54 |
int face = mParent.computeCurrentPuzzleFace(mCubitType,cubitIndex,mTrackingPoint);
|
|
| 55 | 55 |
|
| 56 | 56 |
if( mRowOffset!=null ) |
| 57 | 57 |
{
|
| ... | ... | |
| 214 | 214 |
mTrackingPoint[0] = mTmp[0]; |
| 215 | 215 |
mTrackingPoint[1] = mTmp[1]; |
| 216 | 216 |
mTrackingPoint[2] = mTmp[2]; |
| 217 |
mCurrentPuzzleFace = mParent.computeCurrentPuzzleFace(mCubitType,mTrackingPoint); |
|
| 217 |
mCurrentPuzzleFace = mParent.computeCurrentPuzzleFace(mCubitType,mCubitIndex,mTrackingPoint);
|
|
| 218 | 218 |
} |
| 219 | 219 |
|
| 220 | 220 |
if( mCubitType==TYPE_DECIDER ) |
| src/main/java/org/distorted/objectlib/main/TwistyObject.java | ||
|---|---|---|
| 818 | 818 |
|
| 819 | 819 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 820 | 820 |
|
| 821 |
public int computeCurrentPuzzleFace(int type, float[] vertex) |
|
| 821 |
public int computeCurrentPuzzleFace(int type, int cubitIndex, float[] vertex)
|
|
| 822 | 822 |
{
|
| 823 | 823 |
if( type!=Cubit.TYPE_NORMAL ) |
| 824 | 824 |
{
|
| ... | ... | |
| 838 | 838 |
} |
| 839 | 839 |
|
| 840 | 840 |
// theoretically it should never reach this point |
| 841 |
String error = getShortName()+" "+x+" "+y+" "+z+" "+dist3D[0]; |
|
| 841 |
String error = getShortName()+" "+mSize+" "+cubitIndex+" "+x+" "+y+" "+z+" "+dist3D[0];
|
|
| 842 | 842 |
error += (" "+numAxis+" "+axis[0].get0()+" "+axis[0].get1()+" "+axis[0].get2());
|
| 843 | 843 |
mInterface.reportProblem(error,true); |
| 844 | 844 |
return 0; |
Also available in: Unified diff
Additional debugging for one weird crash.