Revision f7e30f36
Added by Leszek Koltunski over 1 year ago
| src/main/java/org/distorted/objectlib/main/ObjectControl.java | ||
|---|---|---|
| 809 | 809 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 810 | 810 |
// ditto |
| 811 | 811 |
|
| 812 |
public void fastScrambleObject(int num) |
|
| 812 |
public void fastScrambleObject(int duration, int num)
|
|
| 813 | 813 |
{
|
| 814 | 814 |
if( !mBeginningRotation && !mContinuingRotation ) |
| 815 | 815 |
{
|
| 816 |
mPreRender.fastScrambleObject(num); |
|
| 816 |
mPreRender.fastScrambleObject(duration,num);
|
|
| 817 | 817 |
} |
| 818 | 818 |
} |
| 819 | 819 |
|
| src/main/java/org/distorted/objectlib/main/ObjectPreRender.java | ||
|---|---|---|
| 51 | 51 |
private long mRotationFinishedID; |
| 52 | 52 |
private final long[] mEffectID; |
| 53 | 53 |
private int[][] mNextMoves; |
| 54 |
private int mScrambleObjectNum; |
|
| 54 |
private int mScrambleObjectNum, mScrambleObjectDuration;
|
|
| 55 | 55 |
private int mAddRotationAxis, mAddRotationRowBitmap, mAddRotationAngle; |
| 56 | 56 |
private long mAddRotationDuration; |
| 57 | 57 |
private int mPresentDuration; |
| ... | ... | |
| 285 | 285 |
mFastScrambleObject = false; |
| 286 | 286 |
mIsSolved = false; |
| 287 | 287 |
blockEverything(BlockController.PLACE_5); |
| 288 |
int duration = BaseEffect.Type.FAST_SCRAMBLE.getDuration(); |
|
| 289 |
doEffectNow( BaseEffect.Type.FAST_SCRAMBLE, duration ); |
|
| 288 |
doEffectNow( BaseEffect.Type.FAST_SCRAMBLE, mScrambleObjectDuration ); |
|
| 290 | 289 |
} |
| 291 | 290 |
|
| 292 | 291 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| ... | ... | |
| 649 | 648 |
|
| 650 | 649 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 651 | 650 |
|
| 652 |
public void fastScrambleObject(int num) |
|
| 651 |
public void fastScrambleObject(int duration, int num)
|
|
| 653 | 652 |
{
|
| 654 | 653 |
if( !mUIBlocked ) |
| 655 | 654 |
{
|
| 656 | 655 |
mFastScrambleObject = true; |
| 657 | 656 |
mScrambleObjectNum = num; |
| 657 |
mScrambleObjectDuration = duration; |
|
| 658 | 658 |
mDebug = ""; |
| 659 | 659 |
mScrambleStartTime = System.currentTimeMillis(); |
| 660 | 660 |
} |
Also available in: Unified diff
Make it possible to decide about FastScramble duration fromo outside the ObjectControl.