Revision b1629e16
Added by Leszek Koltunski almost 3 years ago
| src/main/java/org/distorted/bandaged/BandagedPlayScreen.java | ||
|---|---|---|
| 18 | 18 |
import org.distorted.helpers.MovesController; |
| 19 | 19 |
import org.distorted.helpers.TransparentImageButton; |
| 20 | 20 |
import org.distorted.main.R; |
| 21 |
import org.distorted.objectlib.effects.BaseEffect; |
|
| 21 | 22 |
import org.distorted.objectlib.main.ObjectControl; |
| 22 | 23 |
|
| 23 | 24 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| ... | ... | |
| 93 | 94 |
public void onClick(View v) |
| 94 | 95 |
{
|
| 95 | 96 |
ObjectControl control = act.getControl(); |
| 96 |
control.fastScrambleObject(NUM_SCRAMBLES); |
|
| 97 |
int duration = BaseEffect.Type.FAST_SCRAMBLE.getDuration(); |
|
| 98 |
control.fastScrambleObject(duration,NUM_SCRAMBLES); |
|
| 97 | 99 |
mMovesController.clearMoves(act); |
| 98 | 100 |
} |
| 99 | 101 |
}); |
| src/main/java/org/distorted/main/RubikActivity.java | ||
|---|---|---|
| 64 | 64 |
{
|
| 65 | 65 |
public static final boolean SHOW_DOWNLOADED_DEBUG = false; |
| 66 | 66 |
public static final boolean SHOW_IAP_DEBUG = true; |
| 67 |
public static final boolean USE_IAP = false;
|
|
| 67 |
public static final boolean USE_IAP = true;
|
|
| 68 | 68 |
|
| 69 | 69 |
public static final float PADDING = 0.01f; |
| 70 | 70 |
public static final float SMALL_MARGIN = 0.004f; |
| src/main/java/org/distorted/screens/RubikScreenPlay.java | ||
|---|---|---|
| 43 | 43 |
import org.distorted.dialogs.RubikDialogScores; |
| 44 | 44 |
import org.distorted.dialogs.RubikDialogTutorial; |
| 45 | 45 |
import org.distorted.helpers.TransparentImageButton; |
| 46 |
import org.distorted.objectlib.effects.BaseEffect; |
|
| 46 | 47 |
import org.distorted.objectlib.main.ObjectControl; |
| 47 | 48 |
import org.distorted.objects.RubikObject; |
| 48 | 49 |
import org.distorted.objects.RubikObjectList; |
| ... | ... | |
| 323 | 324 |
public void onClick(View v) |
| 324 | 325 |
{
|
| 325 | 326 |
mShouldReactToEndOfScrambling = false; |
| 326 |
act.getControl().fastScrambleObject(RubikObject.FAST_SCRAMBLES); |
|
| 327 |
int duration = BaseEffect.Type.FAST_SCRAMBLE.getDuration(); |
|
| 328 |
act.getControl().fastScrambleObject(duration,RubikObject.FAST_SCRAMBLES); |
|
| 327 | 329 |
} |
| 328 | 330 |
}); |
| 329 | 331 |
} |
| src/main/java/org/distorted/tutorials/TutorialScreen.java | ||
|---|---|---|
| 12 | 12 |
import android.widget.LinearLayout; |
| 13 | 13 |
|
| 14 | 14 |
import org.distorted.helpers.MovesController; |
| 15 |
import org.distorted.objectlib.effects.BaseEffect; |
|
| 15 | 16 |
import org.distorted.objectlib.main.ObjectControl; |
| 16 | 17 |
|
| 17 | 18 |
import org.distorted.helpers.LockController; |
| ... | ... | |
| 60 | 61 |
@Override |
| 61 | 62 |
public void onClick(View v) |
| 62 | 63 |
{
|
| 63 |
act.getControl().fastScrambleObject(RubikObject.FAST_SCRAMBLES); |
|
| 64 |
int duration = BaseEffect.Type.FAST_SCRAMBLE.getDuration(); |
|
| 65 |
act.getControl().fastScrambleObject(duration,RubikObject.FAST_SCRAMBLES); |
|
| 64 | 66 |
} |
| 65 | 67 |
}); |
| 66 | 68 |
} |
Also available in: Unified diff
Make it possible to decide about FastScramble duration fromo outside the ObjectControl.