commit a418b421a53887e431371756a8bab3397a526c81
Author: Leszek Koltunski <leszek@distoretedandroid.org>
Date:   Mon Jun 12 14:54:40 2017 +0100

    Progress with the last 2 APPs.

diff --git a/src/main/java/org/distorted/examples/effects3d/Effects3DActivity.java b/src/main/java/org/distorted/examples/effects3d/Effects3DActivity.java
index f49d471..4133233 100644
--- a/src/main/java/org/distorted/examples/effects3d/Effects3DActivity.java
+++ b/src/main/java/org/distorted/examples/effects3d/Effects3DActivity.java
@@ -38,6 +38,8 @@ import android.widget.Spinner;
 import android.widget.TableRow;
 
 import org.distorted.examples.R;
+import org.distorted.library.effect.EffectName;
+import org.distorted.library.effect.EffectType;
 import org.distorted.library.main.Distorted;
 import org.distorted.library.main.MeshCubes;
 import org.distorted.library.main.MeshFlat;
@@ -78,7 +80,7 @@ public class Effects3DActivity extends Activity
   private float mCenterX, mCenterY, mCenterZ;
   private float mRegionX, mRegionY, mRegionR;
 
-  private EffectNames[] mEffectNames;
+  private EffectName[] mEffectNames;
 
   private static boolean mSupportsRegion;
   private static boolean mSupportsCenter;
@@ -167,17 +169,17 @@ public class Effects3DActivity extends Activity
 
   private void createEffectNames()
     {
-    EffectTypes type1 = EffectTypes.FRAGMENT;
-    EffectTypes type2 = EffectTypes.VERTEX;
+    EffectType type1 = EffectType.FRAGMENT;
+    EffectType type2 = EffectType.VERTEX;
 
-    EffectNames[] names = EffectNames.values();
+    EffectName[] names = EffectName.values();
 
     int numEffects=0;
 
     for(int i=0; i<names.length; i++)
       if( names[i].getType() == type1 || names[i].getType() == type2 ) numEffects++;
 
-    mEffectNames = new EffectNames[numEffects];
+    mEffectNames = new EffectName[numEffects];
 
     numEffects=0;
 
@@ -569,7 +571,7 @@ public class Effects3DActivity extends Activity
 
     eff.apply(mEffects);
 
-    boolean show = (mEffectNames[mEffectAdd].getType()==EffectTypes.VERTEX);
+    boolean show = (mEffectNames[mEffectAdd].getType()==EffectType.VERTEX);
     Effects3DSurfaceView sv = (Effects3DSurfaceView)findViewById(R.id.effects3dSurfaceView);
     sv.getRenderer().showRegionAndCenter( (show && mShowRegion) , (show && mShowCenter) );
     }
@@ -581,8 +583,8 @@ public class Effects3DActivity extends Activity
     mList.clear();
     LinearLayout layout = (LinearLayout)findViewById(R.id.effects3dlayout);
     layout.removeAllViews();
-    mEffects.abortEffects(EffectTypes.VERTEX);
-    mEffects.abortEffects(EffectTypes.FRAGMENT);
+    mEffects.abortByType(EffectType.VERTEX);
+    mEffects.abortByType(EffectType.FRAGMENT);
 
     resetData();
 
@@ -613,7 +615,7 @@ public class Effects3DActivity extends Activity
         view = effect.getRegion();
         if( view!=null ) layout.removeView(view);
 
-        mEffects.abortEffect(effect.getId());
+        mEffects.abortById(effect.getId());
         mList.remove(effect);
 
         resetData();
diff --git a/src/main/java/org/distorted/examples/effects3d/Effects3DEffect.java b/src/main/java/org/distorted/examples/effects3d/Effects3DEffect.java
index adfccd6..51a4730 100644
--- a/src/main/java/org/distorted/examples/effects3d/Effects3DEffect.java
+++ b/src/main/java/org/distorted/examples/effects3d/Effects3DEffect.java
@@ -24,6 +24,8 @@ import android.widget.SeekBar;
 import android.widget.TextView;
 
 import org.distorted.examples.R;
+import org.distorted.library.effect.EffectName;
+import org.distorted.library.effect.EffectType;
 import org.distorted.library.main.DistortedEffects;
 import org.distorted.library.type.Dynamic1D;
 import org.distorted.library.type.Dynamic2D;
@@ -44,7 +46,7 @@ class Effects3DEffect implements SeekBar.OnSeekBarChangeListener
   {
   private WeakReference<Effects3DActivity> mAct;
 
-  private EffectNames mName;
+  private EffectName mName;
   private int[] mInter;
   private int[] mInterRegion;
   private int[] mInterCenter;
@@ -203,7 +205,7 @@ class Effects3DEffect implements SeekBar.OnSeekBarChangeListener
       case 1: mInter[0] = 50;
       }
 
-    if( mName==EffectNames.ROTATE || mName==EffectNames.QUATERNION ) mInter[1]= 100;
+    if( mName==EffectName.ROTATE || mName==EffectName.QUATERNION ) mInter[1]= 100;
     }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -297,7 +299,7 @@ class Effects3DEffect implements SeekBar.OnSeekBarChangeListener
     float factorX = act.getWidth() / 100.0f;
     float factorY = act.getHeight()/ 100.0f;
 
-    int deduct = (mName.getType() == EffectTypes.VERTEX ? 50:0);
+    int deduct = (mName.getType() == EffectType.VERTEX ? 50:0);
 
     float  x = (mInterRegion[0]-deduct)*factorX;
     float  y = (mInterRegion[1]-deduct)*factorY;
@@ -331,7 +333,7 @@ class Effects3DEffect implements SeekBar.OnSeekBarChangeListener
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-  Effects3DEffect(EffectNames name, Effects3DActivity act)
+  Effects3DEffect(EffectName name, Effects3DActivity act)
     {
     mAct = new WeakReference<>(act);
     mName = name;
@@ -363,7 +365,7 @@ class Effects3DEffect implements SeekBar.OnSeekBarChangeListener
                mSta3 = new Static3D(0,0,0);
                mDyn3.add(mSta3);
                break;
-      case 4 : if( mName == EffectNames.ROTATE || mName == EffectNames.QUATERNION )
+      case 4 : if( mName == EffectName.ROTATE || mName == EffectName.QUATERNION )
                  {
                  mDyn4 = new Dynamic4D();
                  mSta4 = new Static4D(0,0,0,0);
@@ -636,7 +638,7 @@ class Effects3DEffect implements SeekBar.OnSeekBarChangeListener
       {
       Effects3DActivity act = mAct.get();
 
-      boolean show = (mName.getType()==EffectTypes.VERTEX);
+      boolean show = (mName.getType()==EffectType.VERTEX);
       boolean showR= (show && act.getShowRegion());
       boolean showC= (show && act.getShowCenter());
 
diff --git a/src/main/java/org/distorted/examples/matrix3d/Matrix3DActivity.java b/src/main/java/org/distorted/examples/matrix3d/Matrix3DActivity.java
index f77beb4..2e3add0 100644
--- a/src/main/java/org/distorted/examples/matrix3d/Matrix3DActivity.java
+++ b/src/main/java/org/distorted/examples/matrix3d/Matrix3DActivity.java
@@ -31,6 +31,8 @@ import android.widget.LinearLayout;
 import android.widget.Spinner;
 
 import org.distorted.examples.R;
+import org.distorted.library.effect.EffectName;
+import org.distorted.library.effect.EffectType;
 import org.distorted.library.main.Distorted;
 import org.distorted.library.main.DistortedEffects;
 import org.distorted.library.main.MeshCubes;
@@ -52,7 +54,7 @@ public class Matrix3DActivity extends Activity implements AdapterView.OnItemSele
   private ArrayList<Matrix3DEffect> mList;
   private int mEffectAdd;
 
-  private EffectNames[] mEffectNames;
+  private EffectName[] mEffectNames;
 
   private static boolean mSupportsCenter;
 
@@ -78,16 +80,16 @@ public class Matrix3DActivity extends Activity implements AdapterView.OnItemSele
 
   private void createEffectNames()
     {
-    EffectTypes type = EffectTypes.MATRIX;
+    EffectType type = EffectType.MATRIX;
 
-    EffectNames[] names = EffectNames.values();
+    EffectName[] names = EffectName.values();
 
     int numEffects=0;
 
     for(int i=0; i<names.length; i++)
       if( names[i].getType() == type ) numEffects++;
 
-    mEffectNames = new EffectNames[numEffects];
+    mEffectNames = new EffectName[numEffects];
 
     numEffects=0;
 
@@ -275,7 +277,7 @@ public class Matrix3DActivity extends Activity implements AdapterView.OnItemSele
     mList.clear();
     LinearLayout layout = (LinearLayout)findViewById(R.id.matrix3dlayout);
     layout.removeAllViews();
-    mEffects.abortEffects(EffectTypes.MATRIX);
+    mEffects.abortByType(EffectType.MATRIX);
 
     resetData();
     }
@@ -298,7 +300,7 @@ public class Matrix3DActivity extends Activity implements AdapterView.OnItemSele
         view = effect.getRegion();
         if( view!=null ) layout.removeView(view);
 
-        mEffects.abortEffect(effect.getId());
+        mEffects.abortById(effect.getId());
         mList.remove(effect);
 
         resetData();
diff --git a/src/main/java/org/distorted/examples/matrix3d/Matrix3DEffect.java b/src/main/java/org/distorted/examples/matrix3d/Matrix3DEffect.java
index c1e85dc..a8466ad 100644
--- a/src/main/java/org/distorted/examples/matrix3d/Matrix3DEffect.java
+++ b/src/main/java/org/distorted/examples/matrix3d/Matrix3DEffect.java
@@ -25,6 +25,7 @@ import android.widget.TextView;
 
 import org.distorted.examples.R;
 import org.distorted.library.effect.EffectName;
+import org.distorted.library.effect.EffectType;
 import org.distorted.library.main.DistortedEffects;
 import org.distorted.library.type.Dynamic1D;
 import org.distorted.library.type.Dynamic2D;
@@ -204,11 +205,11 @@ class Matrix3DEffect implements SeekBar.OnSeekBarChangeListener
       case 1: mInter[0] = 50;
       }
 
-    if( mName==EffectNames.ROTATE || mName==EffectNames.QUATERNION )
+    if( mName==EffectName.ROTATE || mName==EffectName.QUATERNION )
       {
       mInter[1]= 100;
       }
-    if( mName==EffectNames.SCALE )
+    if( mName==EffectName.SCALE )
       {
       mInter[0]= 60;
       mInter[1]= 60;
@@ -307,7 +308,7 @@ class Matrix3DEffect implements SeekBar.OnSeekBarChangeListener
     float factorX = act.getWidth() / 100.0f;
     float factorY = act.getHeight()/ 100.0f;
 
-    int deduct = (mName.getType() == EffectTypes.VERTEX ? 50:0);
+    int deduct = (mName.getType() == EffectType.VERTEX ? 50:0);
 
     float  x = (mInterRegion[0]-deduct)*factorX;
     float  y = (mInterRegion[1]-deduct)*factorY;
@@ -341,7 +342,7 @@ class Matrix3DEffect implements SeekBar.OnSeekBarChangeListener
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-  Matrix3DEffect(EffectNames name, Matrix3DActivity act)
+  Matrix3DEffect(EffectName name, Matrix3DActivity act)
     {
     mAct = new WeakReference<>(act);
     mName = name;
@@ -373,7 +374,7 @@ class Matrix3DEffect implements SeekBar.OnSeekBarChangeListener
                mSta3 = new Static3D(0,0,0);
                mDyn3.add(mSta3);
                break;
-      case 4 : if( mName == EffectNames.ROTATE || mName == EffectNames.QUATERNION )
+      case 4 : if( mName == EffectName.ROTATE || mName == EffectName.QUATERNION )
                  {
                  mDyn4 = new Dynamic4D();
                  mSta4 = new Static4D(0,0,0,0);