Revision ab31cf6f
Added by Leszek Koltunski over 2 years ago
| src/main/java/org/distorted/objectlib/objects/TwistyCuboid.java | ||
|---|---|---|
| 31 | 31 |
|
| 32 | 32 |
import org.distorted.objectlib.R; |
| 33 | 33 |
import org.distorted.objectlib.main.Movement; |
| 34 |
import org.distorted.objectlib.main.Movement6;
|
|
| 34 |
import org.distorted.objectlib.main.MovementC;
|
|
| 35 | 35 |
import org.distorted.objectlib.main.ObjectControl; |
| 36 | 36 |
import org.distorted.objectlib.main.ObjectType; |
| 37 | 37 |
import org.distorted.objectlib.helpers.ObjectShape; |
| ... | ... | |
| 244 | 244 |
{
|
| 245 | 245 |
if( mQuats ==null ) initializeQuats(); |
| 246 | 246 |
int status = retCubitSolvedStatus(cubit,numLayers); |
| 247 |
return status<0 ? null : buildSolvedQuats(Movement6.FACE_AXIS[status], mQuats);
|
|
| 247 |
return status<0 ? null : buildSolvedQuats(MovementC.FACE_AXIS[status], mQuats);
|
|
| 248 | 248 |
} |
| 249 | 249 |
|
| 250 | 250 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| ... | ... | |
| 608 | 608 |
} |
| 609 | 609 |
|
| 610 | 610 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 611 |
// TODO |
|
| 612 | 611 |
|
| 613 | 612 |
public Movement getMovement() |
| 614 | 613 |
{
|
| ... | ... | |
| 618 | 617 |
if( mCuts==null ) getCuts(numLayers); |
| 619 | 618 |
getLayerRotatable(numLayers); |
| 620 | 619 |
float avg = (numLayers[0]+numLayers[1]+numLayers[2])/3.0f; |
| 621 |
mMovement = new Movement6(ROT_AXIS,mCuts,mLayerRotatable,avg,TYPE_NOT_SPLIT,ENABLED); |
|
| 620 |
|
|
| 621 |
float[] dist3D = |
|
| 622 |
{
|
|
| 623 |
0.5f*numLayers[0]/avg, |
|
| 624 |
0.5f*numLayers[0]/avg, |
|
| 625 |
0.5f*numLayers[1]/avg, |
|
| 626 |
0.5f*numLayers[1]/avg, |
|
| 627 |
0.5f*numLayers[2]/avg, |
|
| 628 |
0.5f*numLayers[2]/avg, |
|
| 629 |
}; |
|
| 630 |
|
|
| 631 |
mMovement = new MovementC(ROT_AXIS,mCuts,mLayerRotatable,avg,TYPE_NOT_SPLIT,ENABLED,dist3D); |
|
| 622 | 632 |
} |
| 623 | 633 |
return mMovement; |
| 624 | 634 |
} |
Also available in: Unified diff
Cuboids: movement.