Revision af88bf2e
Added by Leszek Koltunski over 3 years ago
| src/main/java/org/distorted/effects/scramble/ScrambleEffect.java | ||
|---|---|---|
| 25 | 25 |
import org.distorted.library.main.DistortedScreen; |
| 26 | 26 |
import org.distorted.library.message.EffectListener; |
| 27 | 27 |
import org.distorted.main.RubikPreRender; |
| 28 |
import org.distorted.effects.EffectController; |
|
| 28 | 29 |
import org.distorted.objects.TwistyObject; |
| 29 | 30 |
|
| 30 | 31 |
import java.lang.reflect.Method; |
| ... | ... | |
| 66 | 67 |
public static final int START_AXIS = -2; |
| 67 | 68 |
public static final int STOP_AXIS = -1; |
| 68 | 69 |
|
| 69 |
private RubikPreRender mPreRender;
|
|
| 70 |
private EffectController mController;
|
|
| 70 | 71 |
private int mEffectReturned; |
| 71 | 72 |
private int mNumDoubleScramblesLeft, mNumScramblesLeft; |
| 72 | 73 |
private int mLastRotAxis, mLastRow; |
| ... | ... | |
| 152 | 153 |
android.util.Log.e("effect", "ERROR: "+mNumDoubleScramblesLeft);
|
| 153 | 154 |
} |
| 154 | 155 |
|
| 155 |
mPreRender.addRotation(this, mLastRotAxis, rowBitmap, angle*(360/mBasicAngle), durationMillis);
|
|
| 156 |
mController.addRotation(this, mLastRotAxis, rowBitmap, angle*(360/mBasicAngle), durationMillis);
|
|
| 156 | 157 |
} |
| 157 | 158 |
else |
| 158 | 159 |
{
|
| ... | ... | |
| 160 | 161 |
|
| 161 | 162 |
if( mEffectReturned == mCubeEffectNumber+mNodeEffectNumber ) |
| 162 | 163 |
{
|
| 163 |
mPreRender.effectFinished(FAKE_EFFECT_ID);
|
|
| 164 |
mController.effectFinished(FAKE_EFFECT_ID);
|
|
| 164 | 165 |
} |
| 165 | 166 |
} |
| 166 | 167 |
} |
| ... | ... | |
| 264 | 265 |
|
| 265 | 266 |
if( mNumScramblesLeft==0 ) |
| 266 | 267 |
{
|
| 267 |
mPreRender.effectFinished(FAKE_EFFECT_ID);
|
|
| 268 |
mController.effectFinished(FAKE_EFFECT_ID);
|
|
| 268 | 269 |
} |
| 269 | 270 |
} |
| 270 | 271 |
|
| ... | ... | |
| 287 | 288 |
|
| 288 | 289 |
if( mNumScramblesLeft==0 ) |
| 289 | 290 |
{
|
| 290 |
mPreRender.effectFinished(FAKE_EFFECT_ID);
|
|
| 291 |
mController.effectFinished(FAKE_EFFECT_ID);
|
|
| 291 | 292 |
} |
| 292 | 293 |
} |
| 293 | 294 |
|
| ... | ... | |
| 299 | 300 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 300 | 301 |
|
| 301 | 302 |
@SuppressWarnings("unused")
|
| 302 |
public long start(int duration, DistortedScreen screen, RubikPreRender pre)
|
|
| 303 |
public long start(int duration, DistortedScreen screen, EffectController cont)
|
|
| 303 | 304 |
{
|
| 304 |
mObject = pre.getObject();
|
|
| 305 |
mPreRender = pre;
|
|
| 305 |
mObject = cont.getObject();
|
|
| 306 |
mController= cont;
|
|
| 306 | 307 |
|
| 307 | 308 |
mObject.solve(); |
| 308 | 309 |
|
| 309 | 310 |
mBasicAngle = mObject.getBasicAngle(); |
| 310 | 311 |
|
| 311 |
int numScrambles = pre.getNumScrambles();
|
|
| 312 |
int numScrambles = cont.getNumScrambles();
|
|
| 312 | 313 |
int dura = (int)(duration*Math.pow(numScrambles,0.6f)); |
| 313 | 314 |
createBaseEffects(dura,numScrambles); |
| 314 | 315 |
createEffects (dura,numScrambles); |
Also available in: Unified diff
New 'tutorial' activity.