commit 42f65cb4e6d45ac3509584b21b3fe90f16f8576d
Author: Leszek Koltunski <leszek@distoretedandroid.org>
Date:   Fri Jun 9 16:45:20 2017 +0100

    Further progress with Apps.

diff --git a/src/main/java/org/distorted/examples/deform/DeformActivity.java b/src/main/java/org/distorted/examples/deform/DeformActivity.java
index 4a1e4b5..60c00be 100644
--- a/src/main/java/org/distorted/examples/deform/DeformActivity.java
+++ b/src/main/java/org/distorted/examples/deform/DeformActivity.java
@@ -21,7 +21,7 @@ package org.distorted.examples.deform;
 
 import org.distorted.library.main.Distorted;
 import org.distorted.examples.R;
-import org.distorted.library.EffectNames;
+import org.distorted.library.effect.EffectName;
 
 import android.app.Activity;
 import android.opengl.GLSurfaceView;
@@ -37,7 +37,7 @@ import android.widget.SeekBar.OnSeekBarChangeListener;
 public class DeformActivity extends Activity implements OnSeekBarChangeListener
 {
     private TextView textR;
-    private EffectNames mCurrEffect;
+    private EffectName mCurrEffect;
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
     
@@ -98,8 +98,8 @@ public class DeformActivity extends Activity implements OnSeekBarChangeListener
     public void Distort(View v)
       {
       DeformSurfaceView view = (DeformSurfaceView) this.findViewById(R.id.deformSurfaceView);
-      view.getRenderer().setMode(EffectNames.DISTORT);
-      mCurrEffect = EffectNames.DISTORT;
+      view.getRenderer().setMode(EffectName.DISTORT);
+      mCurrEffect = EffectName.DISTORT;
       }     
     
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -107,8 +107,8 @@ public class DeformActivity extends Activity implements OnSeekBarChangeListener
     public void Deform(View v)
       {
       DeformSurfaceView view = (DeformSurfaceView) this.findViewById(R.id.deformSurfaceView);
-      view.getRenderer().setMode(EffectNames.DEFORM);
-      mCurrEffect = EffectNames.DEFORM;
+      view.getRenderer().setMode(EffectName.DEFORM);
+      mCurrEffect = EffectName.DEFORM;
       }       
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -116,8 +116,8 @@ public class DeformActivity extends Activity implements OnSeekBarChangeListener
     public void Shear(View v)
       {
       DeformSurfaceView view = (DeformSurfaceView) this.findViewById(R.id.deformSurfaceView);
-      view.getRenderer().setMode(EffectNames.SHEAR);
-      mCurrEffect = EffectNames.SHEAR;
+      view.getRenderer().setMode(EffectName.SHEAR);
+      mCurrEffect = EffectName.SHEAR;
       }       
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -138,9 +138,9 @@ public class DeformActivity extends Activity implements OnSeekBarChangeListener
 
       int effect = savedInstanceState.getInt("effect");
 
-      if( effect == EffectNames.DISTORT.ordinal() ) Distort(null);
-      if( effect == EffectNames.DEFORM.ordinal()  ) Deform(null);
-      if( effect == EffectNames.SHEAR.ordinal()   ) Shear(null);
+      if( effect == EffectName.DISTORT.ordinal() ) Distort(null);
+      if( effect == EffectName.DEFORM.ordinal()  ) Deform(null);
+      if( effect == EffectName.SHEAR.ordinal()   ) Shear(null);
       }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/main/java/org/distorted/examples/deform/DeformRenderer.java b/src/main/java/org/distorted/examples/deform/DeformRenderer.java
index 9db04a9..6960860 100644
--- a/src/main/java/org/distorted/examples/deform/DeformRenderer.java
+++ b/src/main/java/org/distorted/examples/deform/DeformRenderer.java
@@ -22,6 +22,7 @@ package org.distorted.examples.deform;
 import javax.microedition.khronos.egl.EGLConfig;
 import javax.microedition.khronos.opengles.GL10;
 
+import org.distorted.library.effect.EffectName;
 import org.distorted.library.main.Distorted;
 import org.distorted.library.main.DistortedEffects;
 import org.distorted.library.main.DistortedScreen;
@@ -29,7 +30,6 @@ import org.distorted.library.main.DistortedTexture;
 import org.distorted.library.main.MeshObject;
 import org.distorted.library.main.MeshFlat;
 
-import org.distorted.library.EffectNames;
 import org.distorted.library.type.Dynamic3D;
 import org.distorted.library.type.Static3D;
 import org.distorted.library.type.Static4D;
@@ -68,8 +68,8 @@ class DeformRenderer implements GLSurfaceView.Renderer
    private int scrHeight, scrWidth;
    private float mRadius;
 
-   private EffectNames mMode = EffectNames.DISTORT;
-   private long mLastEffect = -1;
+   private EffectName mMode = EffectName.DISTORT;
+   private EffectName mLastEffect = EffectName.DISTORT;
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -134,7 +134,7 @@ class DeformRenderer implements GLSurfaceView.Renderer
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-   void setMode(EffectNames mode)
+   void setMode(EffectName mode)
       {
       mMode = mode;  
       }
@@ -203,8 +203,8 @@ class DeformRenderer implements GLSurfaceView.Renderer
     
    public void onSurfaceCreated(GL10 glUnused, EGLConfig config)
      {
-     DistortedEffects.enableEffect(EffectNames.DISTORT);
-     DistortedEffects.enableEffect(EffectNames.DEFORM);
+     DistortedEffects.enableEffect(EffectName.DISTORT);
+     DistortedEffects.enableEffect(EffectName.DEFORM);
 
      try
        {
@@ -263,7 +263,7 @@ class DeformRenderer implements GLSurfaceView.Renderer
 
    void up()
      {
-     stretchEffects.abortEffect(mLastEffect);
+     stretchEffects.abortByName(mLastEffect);
 
      float damp = -0.65f;