Revision 4c2c0f44
Added by Leszek Koltunski about 1 year ago
| src/main/java/org/distorted/objectlib/main/ObjectPreRender.java | ||
|---|---|---|
| 47 | 47 |
private float mScale; |
| 48 | 48 |
|
| 49 | 49 |
private boolean mFinishRotation, mRemoveRotation, mRemovePatternRotation, mAddRotation, |
| 50 |
mSetQuat, mChangeObject, mSolveObject, mScrambleObject, mFastScrambleObject, mPresentObject, |
|
| 51 |
mInitializeObject, mSetTextureMap, mResetAllTextureMaps, mSolve, mApplyScrambles; |
|
| 50 |
mSetQuat, mChangeObject, mSolveObject, mScrambleObject, mFastScrambleObject, |
|
| 51 |
mPresentObject,mInitializeObject, mSetTextureMap, mResetAllTextureMaps, mSolve, |
|
| 52 |
mApplyScrambles, mResetTextureEffect; |
|
| 52 | 53 |
private boolean mScramblingAndSolvingBlocked, mRotationBlocked, mIsSolved; |
| 53 | 54 |
private long mRotationFinishedID; |
| 54 | 55 |
private final long[] mEffectID; |
| ... | ... | |
| 56 | 57 |
private int mScrambleObjectNum, mScrambleObjectDuration; |
| 57 | 58 |
private int mAddRotationAxis, mAddRotationRowBitmap, mAddRotationAngle; |
| 58 | 59 |
private long mAddRotationDuration; |
| 59 |
private int mPresentDuration; |
|
| 60 |
private int mPresentDuration, mRestickerDuration;
|
|
| 60 | 61 |
private long mAddRotationID, mRemoveRotationID; |
| 61 | 62 |
private int mCubit, mFace, mNewColor; |
| 62 | 63 |
private int mNearestAngle; |
| ... | ... | |
| 84 | 85 |
mScrambleObject = false; |
| 85 | 86 |
mFastScrambleObject = false; |
| 86 | 87 |
mPresentObject = false; |
| 88 |
mResetTextureEffect = false; |
|
| 87 | 89 |
|
| 88 | 90 |
mOldObject = null; |
| 89 | 91 |
mNewObject = null; |
| ... | ... | |
| 308 | 310 |
doEffectNow( BaseEffect.Type.FAST_SCRAMBLE, mScrambleObjectDuration ); |
| 309 | 311 |
} |
| 310 | 312 |
|
| 313 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 314 |
|
|
| 315 |
private void resetTextureNow() |
|
| 316 |
{
|
|
| 317 |
mResetTextureEffect = false; |
|
| 318 |
doEffectNow( BaseEffect.Type.RESTICKER, mRestickerDuration ); |
|
| 319 |
} |
|
| 320 |
|
|
| 311 | 321 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 312 | 322 |
|
| 313 | 323 |
private void presentObjectNow() |
| ... | ... | |
| 604 | 614 |
if( mApplyScrambles ) applyScramblesNow(); |
| 605 | 615 |
if( mResetAllTextureMaps ) resetAllTextureMapsNow(); |
| 606 | 616 |
if( mSetTextureMap ) setTextureMapNow(); |
| 617 |
if( mResetTextureEffect ) resetTextureNow(); |
|
| 607 | 618 |
} |
| 608 | 619 |
|
| 609 | 620 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| ... | ... | |
| 715 | 726 |
mSolve = true; |
| 716 | 727 |
} |
| 717 | 728 |
|
| 729 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 730 |
|
|
| 731 |
public void resetTextureMapsEffect(int duration) |
|
| 732 |
{
|
|
| 733 |
mRestickerDuration = duration; |
|
| 734 |
mResetTextureEffect = true; |
|
| 735 |
} |
|
| 736 |
|
|
| 718 | 737 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 719 | 738 |
|
| 720 | 739 |
public void resetAllTextureMaps() |
Also available in: Unified diff
New button in the solver screen: reset all textures.