Revision dd00d051
Added by Leszek Koltunski over 2 years ago
| src/main/java/org/distorted/objectlib/effects/objectchange/ObjectChangeEffect.java | ||
|---|---|---|
| 23 | 23 |
|
| 24 | 24 |
import org.distorted.library.effect.Effect; |
| 25 | 25 |
import org.distorted.library.main.DistortedEffects; |
| 26 |
import org.distorted.library.main.DistortedScreen;
|
|
| 26 |
import org.distorted.library.main.DistortedFramebuffer;
|
|
| 27 | 27 |
import org.distorted.library.message.EffectListener; |
| 28 | 28 |
|
| 29 | 29 |
import org.distorted.objectlib.main.ObjectPreRender; |
| ... | ... | |
| 75 | 75 |
|
| 76 | 76 |
ObjectPreRender mPre; |
| 77 | 77 |
TwistyObject[] mObject; |
| 78 |
DistortedScreen mScreen;
|
|
| 78 |
DistortedFramebuffer mFrame;
|
|
| 79 | 79 |
Effect[][] mCubeEffects; |
| 80 | 80 |
int[][] mCubeEffectPosition; |
| 81 | 81 |
Effect[][] mNodeEffects; |
| ... | ... | |
| 143 | 143 |
case 0: mPhaseActive[1] = true; |
| 144 | 144 |
mEffectFinished[1] = createEffectsPhase1(mDuration); |
| 145 | 145 |
assignEffects(1); |
| 146 |
mScreen.attach(mObject[1]);
|
|
| 146 |
mFrame.attach(mObject[1]);
|
|
| 147 | 147 |
break; |
| 148 | 148 |
case 1: mPre.effectFinished(FAKE_EFFECT_ID); |
| 149 | 149 |
break; |
| ... | ... | |
| 154 | 154 |
switch(phase) |
| 155 | 155 |
{
|
| 156 | 156 |
case 0: mPhaseActive[0] = false; |
| 157 |
mScreen.detach(mObject[0]);
|
|
| 157 |
mFrame.detach(mObject[0]);
|
|
| 158 | 158 |
break; |
| 159 | 159 |
case 1: mPhaseActive[1] = false; |
| 160 | 160 |
break; |
| ... | ... | |
| 225 | 225 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 226 | 226 |
|
| 227 | 227 |
@SuppressWarnings("unused")
|
| 228 |
public long start(int duration, DistortedScreen screen, ObjectPreRender pre)
|
|
| 228 |
public long start(int duration, DistortedFramebuffer frame, ObjectPreRender pre)
|
|
| 229 | 229 |
{
|
| 230 |
mScreen = screen;
|
|
| 230 |
mFrame = frame;
|
|
| 231 | 231 |
mObject[0] = pre.getOldObject(); |
| 232 | 232 |
mObject[1] = pre.getObject(); |
| 233 | 233 |
mPre = pre; |
| ... | ... | |
| 244 | 244 |
mPhaseActive[1] = true; |
| 245 | 245 |
mEffectFinished[1] = createEffectsPhase1(mDuration); |
| 246 | 246 |
assignEffects(1); |
| 247 |
mScreen.attach(mObject[1]);
|
|
| 247 |
mFrame.attach(mObject[1]);
|
|
| 248 | 248 |
} |
| 249 | 249 |
|
| 250 | 250 |
return FAKE_EFFECT_ID; |
Also available in: Unified diff
Relax objectlib's requirements: it can be displayed not only on top of a DistortedScreen, but any DistortedFramebuffer.