Revision a418b421
Added by Leszek Koltunski almost 7 years ago
| src/main/java/org/distorted/examples/effects3d/Effects3DActivity.java | ||
|---|---|---|
| 38 | 38 |
import android.widget.TableRow; |
| 39 | 39 |
|
| 40 | 40 |
import org.distorted.examples.R; |
| 41 |
import org.distorted.library.effect.EffectName; |
|
| 42 |
import org.distorted.library.effect.EffectType; |
|
| 41 | 43 |
import org.distorted.library.main.Distorted; |
| 42 | 44 |
import org.distorted.library.main.MeshCubes; |
| 43 | 45 |
import org.distorted.library.main.MeshFlat; |
| ... | ... | |
| 78 | 80 |
private float mCenterX, mCenterY, mCenterZ; |
| 79 | 81 |
private float mRegionX, mRegionY, mRegionR; |
| 80 | 82 |
|
| 81 |
private EffectNames[] mEffectNames;
|
|
| 83 |
private EffectName[] mEffectNames; |
|
| 82 | 84 |
|
| 83 | 85 |
private static boolean mSupportsRegion; |
| 84 | 86 |
private static boolean mSupportsCenter; |
| ... | ... | |
| 167 | 169 |
|
| 168 | 170 |
private void createEffectNames() |
| 169 | 171 |
{
|
| 170 |
EffectTypes type1 = EffectTypes.FRAGMENT;
|
|
| 171 |
EffectTypes type2 = EffectTypes.VERTEX;
|
|
| 172 |
EffectType type1 = EffectType.FRAGMENT;
|
|
| 173 |
EffectType type2 = EffectType.VERTEX;
|
|
| 172 | 174 |
|
| 173 |
EffectNames[] names = EffectNames.values();
|
|
| 175 |
EffectName[] names = EffectName.values();
|
|
| 174 | 176 |
|
| 175 | 177 |
int numEffects=0; |
| 176 | 178 |
|
| 177 | 179 |
for(int i=0; i<names.length; i++) |
| 178 | 180 |
if( names[i].getType() == type1 || names[i].getType() == type2 ) numEffects++; |
| 179 | 181 |
|
| 180 |
mEffectNames = new EffectNames[numEffects];
|
|
| 182 |
mEffectNames = new EffectName[numEffects]; |
|
| 181 | 183 |
|
| 182 | 184 |
numEffects=0; |
| 183 | 185 |
|
| ... | ... | |
| 569 | 571 |
|
| 570 | 572 |
eff.apply(mEffects); |
| 571 | 573 |
|
| 572 |
boolean show = (mEffectNames[mEffectAdd].getType()==EffectTypes.VERTEX);
|
|
| 574 |
boolean show = (mEffectNames[mEffectAdd].getType()==EffectType.VERTEX); |
|
| 573 | 575 |
Effects3DSurfaceView sv = (Effects3DSurfaceView)findViewById(R.id.effects3dSurfaceView); |
| 574 | 576 |
sv.getRenderer().showRegionAndCenter( (show && mShowRegion) , (show && mShowCenter) ); |
| 575 | 577 |
} |
| ... | ... | |
| 581 | 583 |
mList.clear(); |
| 582 | 584 |
LinearLayout layout = (LinearLayout)findViewById(R.id.effects3dlayout); |
| 583 | 585 |
layout.removeAllViews(); |
| 584 |
mEffects.abortEffects(EffectTypes.VERTEX);
|
|
| 585 |
mEffects.abortEffects(EffectTypes.FRAGMENT);
|
|
| 586 |
mEffects.abortByType(EffectType.VERTEX);
|
|
| 587 |
mEffects.abortByType(EffectType.FRAGMENT);
|
|
| 586 | 588 |
|
| 587 | 589 |
resetData(); |
| 588 | 590 |
|
| ... | ... | |
| 613 | 615 |
view = effect.getRegion(); |
| 614 | 616 |
if( view!=null ) layout.removeView(view); |
| 615 | 617 |
|
| 616 |
mEffects.abortEffect(effect.getId());
|
|
| 618 |
mEffects.abortById(effect.getId());
|
|
| 617 | 619 |
mList.remove(effect); |
| 618 | 620 |
|
| 619 | 621 |
resetData(); |
Also available in: Unified diff
Progress with the last 2 APPs.