Revision ecf3d6e3
Added by Leszek Koltunski over 2 years ago
| src/main/java/org/distorted/objectlib/effects/solve/SolveEffect.java | ||
|---|---|---|
| 26 | 26 |
import org.distorted.library.main.DistortedScreen; |
| 27 | 27 |
import org.distorted.library.message.EffectListener; |
| 28 | 28 |
|
| 29 |
import org.distorted.objectlib.main.ObjectPreRender; |
|
| 29 | 30 |
import org.distorted.objectlib.main.TwistyObject; |
| 30 | 31 |
|
| 31 | 32 |
import org.distorted.objectlib.effects.BaseEffect; |
| 32 |
import org.distorted.objectlib.effects.EffectController; |
|
| 33 | 33 |
|
| 34 | 34 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 35 | 35 |
|
| ... | ... | |
| 65 | 65 |
} |
| 66 | 66 |
} |
| 67 | 67 |
|
| 68 |
private EffectController mController;
|
|
| 68 |
private ObjectPreRender mPre;
|
|
| 69 | 69 |
private int mDuration; |
| 70 | 70 |
private int mEffectReturned; |
| 71 | 71 |
private final int[] mCubeEffectNumber, mNodeEffectNumber; |
| ... | ... | |
| 132 | 132 |
{
|
| 133 | 133 |
case 0: mEffectReturned = 0; |
| 134 | 134 |
mPhase = 1; |
| 135 |
mController.solveOnly();
|
|
| 135 |
mPre.solveOnly();
|
|
| 136 | 136 |
createEffectsPhase1(mDuration); |
| 137 | 137 |
assignEffects(mPhase); |
| 138 | 138 |
break; |
| 139 |
case 1: mController.effectFinished(FAKE_EFFECT_ID);
|
|
| 139 |
case 1: mPre.effectFinished(FAKE_EFFECT_ID);
|
|
| 140 | 140 |
break; |
| 141 | 141 |
} |
| 142 | 142 |
} |
| ... | ... | |
| 199 | 199 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 200 | 200 |
|
| 201 | 201 |
@SuppressWarnings("unused")
|
| 202 |
public long start(int duration, DistortedScreen screen, EffectController cont)
|
|
| 202 |
public long start(int duration, DistortedScreen screen, ObjectPreRender pre)
|
|
| 203 | 203 |
{
|
| 204 |
mScreen = screen;
|
|
| 205 |
mObject = cont.getObject();
|
|
| 206 |
mController= cont;
|
|
| 207 |
mDuration = duration;
|
|
| 204 |
mScreen = screen; |
|
| 205 |
mObject = pre.getObject();
|
|
| 206 |
mPre = pre;
|
|
| 207 |
mDuration= duration; |
|
| 208 | 208 |
|
| 209 | 209 |
createEffectsPhase0(mDuration); |
| 210 | 210 |
assignEffects(mPhase); |
Also available in: Unified diff
1) introduce possibility to move objects, i.e. display them not in the middle of the screen (not fully functional yet)
2) do away with unneeded any more interface 'EffectController' - since ObjectPreRender is the only implementation now.