Revision af88bf2e
Added by Leszek Koltunski over 3 years ago
src/main/java/org/distorted/effects/objectchange/ObjectChangeEffect.java | ||
---|---|---|
24 | 24 |
import org.distorted.library.main.DistortedEffects; |
25 | 25 |
import org.distorted.library.main.DistortedScreen; |
26 | 26 |
import org.distorted.library.message.EffectListener; |
27 |
import org.distorted.main.RubikPreRender;
|
|
27 |
import org.distorted.effects.EffectController;
|
|
28 | 28 |
import org.distorted.objects.TwistyObject; |
29 | 29 |
|
30 | 30 |
import java.lang.reflect.Method; |
... | ... | |
66 | 66 |
} |
67 | 67 |
} |
68 | 68 |
|
69 |
private EffectListener mListener;
|
|
69 |
private EffectController mController;
|
|
70 | 70 |
private int mDuration; |
71 | 71 |
private int[] mEffectReturned; |
72 | 72 |
private int[] mCubeEffectNumber, mNodeEffectNumber; |
... | ... | |
144 | 144 |
assignEffects(1); |
145 | 145 |
mScreen.attach(mObject[1]); |
146 | 146 |
break; |
147 |
case 1: mListener.effectFinished(FAKE_EFFECT_ID);
|
|
147 |
case 1: mController.effectFinished(FAKE_EFFECT_ID);
|
|
148 | 148 |
break; |
149 | 149 |
} |
150 | 150 |
} |
... | ... | |
224 | 224 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
225 | 225 |
|
226 | 226 |
@SuppressWarnings("unused") |
227 |
public long start(int duration, DistortedScreen screen, RubikPreRender pre)
|
|
227 |
public long start(int duration, DistortedScreen screen, EffectController cont)
|
|
228 | 228 |
{ |
229 |
mScreen = screen; |
|
230 |
mObject[0]= pre.getOldObject();
|
|
231 |
mObject[1]= pre.getObject();
|
|
232 |
mListener = pre;
|
|
233 |
mDuration = duration; |
|
229 |
mScreen = screen;
|
|
230 |
mObject[0] = cont.getOldObject();
|
|
231 |
mObject[1] = cont.getObject();
|
|
232 |
mController= cont;
|
|
233 |
mDuration = duration;
|
|
234 | 234 |
|
235 | 235 |
if( mObject[0]!=null ) |
236 | 236 |
{ |
Also available in: Unified diff
New 'tutorial' activity.