Revision 2afc6754
Added by Leszek Koltunski over 2 years ago
| src/main/java/org/distorted/helpers/MovesController.java | ||
|---|---|---|
| 28 | 28 |
import org.distorted.objectlib.helpers.BlockController; |
| 29 | 29 |
import org.distorted.objectlib.helpers.MovesFinished; |
| 30 | 30 |
import org.distorted.objectlib.helpers.TwistyActivity; |
| 31 |
import org.distorted.objectlib.main.ObjectPreRender;
|
|
| 31 |
import org.distorted.objectlib.main.ObjectControl;
|
|
| 32 | 32 |
|
| 33 | 33 |
import org.distorted.main.R; |
| 34 | 34 |
import org.distorted.main.RubikActivity; |
| ... | ... | |
| 53 | 53 |
|
| 54 | 54 |
private final ArrayList<Move> mMoves; |
| 55 | 55 |
private boolean mCanPrevMove; |
| 56 |
private ObjectPreRender mPre;
|
|
| 56 |
private ObjectControl mControl;
|
|
| 57 | 57 |
private ImageButton mPrevButton; |
| 58 | 58 |
|
| 59 | 59 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| ... | ... | |
| 104 | 104 |
if( angle!=0 ) |
| 105 | 105 |
{
|
| 106 | 106 |
mCanPrevMove = false; |
| 107 |
mPre = act.getPreRender();
|
|
| 108 |
mPre.blockTouch(BlockController.MOVES_PLACE_0);
|
|
| 109 |
mPre.addRotation(this, axis, row, -angle, duration);
|
|
| 107 |
mControl = act.getControl();
|
|
| 108 |
mControl.blockTouch(BlockController.MOVES_PLACE_0);
|
|
| 109 |
mControl.addRotation(this, axis, row, -angle, duration);
|
|
| 110 | 110 |
} |
| 111 | 111 |
else |
| 112 | 112 |
{
|
| ... | ... | |
| 146 | 146 |
public void onActionFinished(final long effectID) |
| 147 | 147 |
{
|
| 148 | 148 |
mCanPrevMove = true; |
| 149 |
mPre.unblockTouch();
|
|
| 149 |
mControl.unblockTouch();
|
|
| 150 | 150 |
} |
| 151 | 151 |
|
| 152 | 152 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
Also available in: Unified diff
Move RubikControl to objectlib (as 'ObjectAutomator')
Hide ObjectPreRender inside objectlib and move its APi to ObjectControl.