Revision b9956428
Added by Leszek Koltunski over 2 years ago
| src/main/java/org/distorted/objectlib/helpers/TwistyActivity.java | ||
|---|---|---|
| 28 | 28 |
|
| 29 | 29 |
abstract public class TwistyActivity extends AppCompatActivity |
| 30 | 30 |
{
|
| 31 |
boolean mIsLocked, mRemLocked; |
|
| 32 |
|
|
| 33 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 34 |
|
|
| 35 | 31 |
public abstract ObjectControl getControl(); |
| 36 |
public abstract boolean isLocked(); |
|
| 37 | 32 |
public abstract DistortedScreen getScreen(); |
| 38 |
|
|
| 39 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 40 |
|
|
| 41 |
public boolean retLocked() |
|
| 42 |
{
|
|
| 43 |
return mIsLocked; |
|
| 44 |
} |
|
| 45 |
|
|
| 46 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 47 |
|
|
| 48 |
public void toggleLock() |
|
| 49 |
{
|
|
| 50 |
mIsLocked = !mIsLocked; |
|
| 51 |
} |
|
| 52 |
|
|
| 53 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 54 |
|
|
| 55 |
public void unlock() |
|
| 56 |
{
|
|
| 57 |
mIsLocked = false; |
|
| 58 |
} |
|
| 59 |
|
|
| 60 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 61 |
|
|
| 62 |
public void setLock() |
|
| 63 |
{
|
|
| 64 |
mRemLocked = mIsLocked; |
|
| 65 |
mIsLocked = true; |
|
| 66 |
} |
|
| 67 |
|
|
| 68 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 69 |
|
|
| 70 |
public void unsetLock() |
|
| 71 |
{
|
|
| 72 |
mIsLocked = mRemLocked; |
|
| 73 |
} |
|
| 74 | 33 |
} |
| src/main/java/org/distorted/objectlib/main/ObjectControl.java | ||
|---|---|---|
| 76 | 76 |
private float mX1, mY1, mX2, mY2, mX, mY; |
| 77 | 77 |
private final boolean mIsAutomatic; |
| 78 | 78 |
|
| 79 |
private boolean mIsLocked, mRemLocked; |
|
| 80 |
|
|
| 79 | 81 |
private static final Static4D mQuat= new Static4D(-0.25189602f,0.3546389f,0.009657208f,0.90038127f); |
| 80 | 82 |
private static final Static4D mTemp= new Static4D(0,0,0,1); |
| 81 | 83 |
|
| ... | ... | |
| 199 | 201 |
else |
| 200 | 202 |
{
|
| 201 | 203 |
final TwistyActivity act = mAct.get(); |
| 202 |
final boolean locked= act.isLocked(); |
|
| 203 |
mDragging = (!locked || mIsAutomatic); |
|
| 204 |
mDragging = (!mIsLocked || mIsAutomatic); |
|
| 204 | 205 |
mBeginningRotation = false; |
| 205 | 206 |
mContinuingRotation = false; |
| 206 | 207 |
if( !mDragging ) mActioner.failedToDrag(act); |
| ... | ... | |
| 546 | 547 |
{
|
| 547 | 548 |
mPointer1 = INVALID_POINTER_ID; |
| 548 | 549 |
mPointer2 = INVALID_POINTER_ID; |
| 550 |
|
|
| 551 |
unlock(); |
|
| 549 | 552 |
} |
| 550 | 553 |
|
| 551 | 554 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| ... | ... | |
| 580 | 583 |
|
| 581 | 584 |
public void blockEverything(int place) |
| 582 | 585 |
{
|
| 586 |
setLock(true); |
|
| 583 | 587 |
mPreRender.blockEverything(place); |
| 584 | 588 |
} |
| 585 | 589 |
|
| ... | ... | |
| 587 | 591 |
|
| 588 | 592 |
public void blockTouch(int place) |
| 589 | 593 |
{
|
| 594 |
setLock(true); |
|
| 590 | 595 |
mPreRender.blockTouch(place); |
| 591 | 596 |
} |
| 592 | 597 |
|
| ... | ... | |
| 594 | 599 |
|
| 595 | 600 |
public void unblockEverything() |
| 596 | 601 |
{
|
| 602 |
unsetLock(); |
|
| 597 | 603 |
mPreRender.unblockEverything(); |
| 598 | 604 |
} |
| 599 | 605 |
|
| ... | ... | |
| 601 | 607 |
|
| 602 | 608 |
public void unblockTouch() |
| 603 | 609 |
{
|
| 610 |
unsetLock(); |
|
| 604 | 611 |
mPreRender.unblockTouch(); |
| 605 | 612 |
} |
| 606 | 613 |
|
| ... | ... | |
| 701 | 708 |
{
|
| 702 | 709 |
mPreRender.restorePreferences(preferences); |
| 703 | 710 |
} |
| 711 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 712 |
|
|
| 713 |
public boolean retLocked() |
|
| 714 |
{
|
|
| 715 |
return mIsLocked; |
|
| 716 |
} |
|
| 717 |
|
|
| 718 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 719 |
|
|
| 720 |
public void toggleLock() |
|
| 721 |
{
|
|
| 722 |
mIsLocked = !mIsLocked; |
|
| 723 |
} |
|
| 724 |
|
|
| 725 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 726 |
|
|
| 727 |
public void unlock() |
|
| 728 |
{
|
|
| 729 |
mIsLocked = false; |
|
| 730 |
} |
|
| 731 |
|
|
| 732 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 733 |
|
|
| 734 |
public void setLock(boolean value) |
|
| 735 |
{
|
|
| 736 |
mRemLocked = mIsLocked; |
|
| 737 |
mIsLocked = value; |
|
| 738 |
} |
|
| 739 |
|
|
| 740 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 741 |
|
|
| 742 |
public void unsetLock() |
|
| 743 |
{
|
|
| 744 |
mIsLocked = mRemLocked; |
|
| 745 |
} |
|
| 704 | 746 |
|
| 705 | 747 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 706 | 748 |
|
Also available in: Unified diff
Hide most of the TwistyActivity methods inside objectlib.