Revision a418b421
Added by Leszek Koltunski almost 7 years ago
src/main/java/org/distorted/examples/matrix3d/Matrix3DActivity.java | ||
---|---|---|
31 | 31 |
import android.widget.Spinner; |
32 | 32 |
|
33 | 33 |
import org.distorted.examples.R; |
34 |
import org.distorted.library.effect.EffectName; |
|
35 |
import org.distorted.library.effect.EffectType; |
|
34 | 36 |
import org.distorted.library.main.Distorted; |
35 | 37 |
import org.distorted.library.main.DistortedEffects; |
36 | 38 |
import org.distorted.library.main.MeshCubes; |
... | ... | |
52 | 54 |
private ArrayList<Matrix3DEffect> mList; |
53 | 55 |
private int mEffectAdd; |
54 | 56 |
|
55 |
private EffectNames[] mEffectNames;
|
|
57 |
private EffectName[] mEffectNames; |
|
56 | 58 |
|
57 | 59 |
private static boolean mSupportsCenter; |
58 | 60 |
|
... | ... | |
78 | 80 |
|
79 | 81 |
private void createEffectNames() |
80 | 82 |
{ |
81 |
EffectTypes type = EffectTypes.MATRIX;
|
|
83 |
EffectType type = EffectType.MATRIX;
|
|
82 | 84 |
|
83 |
EffectNames[] names = EffectNames.values();
|
|
85 |
EffectName[] names = EffectName.values();
|
|
84 | 86 |
|
85 | 87 |
int numEffects=0; |
86 | 88 |
|
87 | 89 |
for(int i=0; i<names.length; i++) |
88 | 90 |
if( names[i].getType() == type ) numEffects++; |
89 | 91 |
|
90 |
mEffectNames = new EffectNames[numEffects];
|
|
92 |
mEffectNames = new EffectName[numEffects]; |
|
91 | 93 |
|
92 | 94 |
numEffects=0; |
93 | 95 |
|
... | ... | |
275 | 277 |
mList.clear(); |
276 | 278 |
LinearLayout layout = (LinearLayout)findViewById(R.id.matrix3dlayout); |
277 | 279 |
layout.removeAllViews(); |
278 |
mEffects.abortEffects(EffectTypes.MATRIX);
|
|
280 |
mEffects.abortByType(EffectType.MATRIX);
|
|
279 | 281 |
|
280 | 282 |
resetData(); |
281 | 283 |
} |
... | ... | |
298 | 300 |
view = effect.getRegion(); |
299 | 301 |
if( view!=null ) layout.removeView(view); |
300 | 302 |
|
301 |
mEffects.abortEffect(effect.getId());
|
|
303 |
mEffects.abortById(effect.getId());
|
|
302 | 304 |
mList.remove(effect); |
303 | 305 |
|
304 | 306 |
resetData(); |
Also available in: Unified diff
Progress with the last 2 APPs.