Revision 31ed545f
Added by Leszek Koltunski over 1 year ago
| src/main/java/org/distorted/objectlib/main/TwistyObject.java | ||
|---|---|---|
| 1436 | 1436 |
float axisZ = mAxis[mCurrentRotAxis].get2(); |
| 1437 | 1437 |
Static4D quat = new Static4D( axisX*sinA, axisY*sinA, axisZ*sinA, cosA); |
| 1438 | 1438 |
|
| 1439 |
mRotationAngleStatic.set0(0); |
|
| 1440 |
mRotationAngle.removeAll(); |
|
| 1441 |
|
|
| 1439 | 1442 |
for(int i=0; i<mNumCubits; i++) |
| 1440 | 1443 |
{
|
| 1441 | 1444 |
mBelongs[i] = belongsToRotation(i, mCurrentRotAxis,mRotRowBitmap); |
| ... | ... | |
| 1461 | 1464 |
setCubitQuat(i,mCubits[i].computeAssociation(),mCubits[i].mQuatIndex); |
| 1462 | 1465 |
} |
| 1463 | 1466 |
} |
| 1464 |
|
|
| 1465 |
mRotationAngleStatic.set0(0); |
|
| 1466 |
mRotationAngle.removeAll(); |
|
| 1467 | 1467 |
} |
| 1468 | 1468 |
|
| 1469 | 1469 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| ... | ... | |
| 1519 | 1519 |
{
|
| 1520 | 1520 |
if( wasRotateApplied() ) |
| 1521 | 1521 |
{
|
| 1522 |
int numPoints = mRotationAngle.getNumPoints(); |
|
| 1523 |
|
|
| 1524 |
if( numPoints==0 ) |
|
| 1525 |
{
|
|
| 1526 |
mCurrentRotAxis = axis; |
|
| 1527 |
mRotRowBitmap= computeBitmapFromRow( rowBitmap,axis ); |
|
| 1528 |
|
|
| 1529 |
mRotationAngleStatic.set0(0.0f); |
|
| 1530 |
mRotationAxis.set( mAxis[axis] ); |
|
| 1531 |
mRotationAngle.setDuration(durationMillis); |
|
| 1532 |
mRotationAngle.resetToBeginning(); |
|
| 1533 |
mRotationAngle.add(new Static1D(0)); |
|
| 1534 |
mRotationAngle.add(new Static1D(angle)); |
|
| 1535 |
mRotateEffect.setMeshAssociation( mRotRowBitmap<<(axis*mMaxNumLayers) , -1); |
|
| 1536 |
mRotateEffect.notifyWhenFinished(listener); |
|
| 1537 |
|
|
| 1538 |
return mRotateEffect.getID(); |
|
| 1539 |
} |
|
| 1522 |
mCurrentRotAxis = axis; |
|
| 1523 |
mRotRowBitmap= computeBitmapFromRow( rowBitmap,axis ); |
|
| 1524 |
mRotationAngleStatic.set0(0.0f); |
|
| 1525 |
mRotationAxis.set( mAxis[axis] ); |
|
| 1526 |
mRotationAngle.setDuration(durationMillis); |
|
| 1527 |
mRotationAngle.resetToBeginning(); |
|
| 1528 |
mRotationAngle.add(new Static1D(0)); |
|
| 1529 |
mRotationAngle.add(new Static1D(angle)); |
|
| 1530 |
mRotateEffect.setMeshAssociation( mRotRowBitmap<<(axis*mMaxNumLayers) , -1); |
|
| 1531 |
mRotateEffect.notifyWhenFinished(listener); |
|
| 1532 |
return mRotateEffect.getID(); |
|
| 1540 | 1533 |
} |
| 1541 | 1534 |
|
| 1542 | 1535 |
return 0; |
| ... | ... | |
| 1551 | 1544 |
|
| 1552 | 1545 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 1553 | 1546 |
|
| 1554 |
synchronized boolean beginNewRotation(int axis, int row )
|
|
| 1547 |
synchronized void beginNewRotation(int axis, int row )
|
|
| 1555 | 1548 |
{
|
| 1556 | 1549 |
if( axis<0 || axis>=mNumAxis ) |
| 1557 | 1550 |
{
|
| 1558 | 1551 |
android.util.Log.e("object", "invalid rotation axis: "+axis);
|
| 1559 |
return false;
|
|
| 1552 |
return; |
|
| 1560 | 1553 |
} |
| 1561 | 1554 |
if( row<0 || row>=mNumLayers[axis] ) |
| 1562 | 1555 |
{
|
| 1563 | 1556 |
android.util.Log.e("object", "invalid rotation row: "+row);
|
| 1564 |
return false;
|
|
| 1557 |
return; |
|
| 1565 | 1558 |
} |
| 1566 | 1559 |
|
| 1567 |
int numPoints = mRotationAngle.getNumPoints(); |
|
| 1568 |
|
|
| 1569 |
if( numPoints==0 ) |
|
| 1570 |
{
|
|
| 1571 |
mCurrentRotAxis = axis; |
|
| 1572 |
mRotRowBitmap= computeBitmapFromRow( (1<<row),axis ); |
|
| 1573 |
mRotationAngleStatic.set0(0.0f); |
|
| 1574 |
mRotationAxis.set( mAxis[axis] ); |
|
| 1575 |
mRotationAngle.add(mRotationAngleStatic); |
|
| 1576 |
mRotateEffect.setMeshAssociation( mRotRowBitmap<<(axis*mMaxNumLayers) , -1); |
|
| 1577 |
return true; |
|
| 1578 |
} |
|
| 1579 |
return false; |
|
| 1560 |
mCurrentRotAxis = axis; |
|
| 1561 |
mRotRowBitmap= computeBitmapFromRow( (1<<row),axis ); |
|
| 1562 |
mRotationAngleStatic.set0(0.0f); |
|
| 1563 |
mRotationAxis.set( mAxis[axis] ); |
|
| 1564 |
mRotationAngle.add(mRotationAngleStatic); |
|
| 1565 |
mRotateEffect.setMeshAssociation( mRotRowBitmap<<(axis*mMaxNumLayers) , -1); |
|
| 1580 | 1566 |
} |
| 1581 | 1567 |
|
| 1582 | 1568 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
Also available in: Unified diff
Withdraw the last change.