commit 01cef452e14fabd109139b429fa5ad48eca14660
Author: Leszek Koltunski <leszek@koltunski.pl>
Date:   Mon Mar 18 17:00:14 2019 +0000

    Change Distort to Deform in two apps - looks better.

diff --git a/src/main/java/org/distorted/examples/movingeffects/MovingEffectsRenderer.java b/src/main/java/org/distorted/examples/movingeffects/MovingEffectsRenderer.java
index 61c616f..675fd07 100644
--- a/src/main/java/org/distorted/examples/movingeffects/MovingEffectsRenderer.java
+++ b/src/main/java/org/distorted/examples/movingeffects/MovingEffectsRenderer.java
@@ -30,7 +30,7 @@ import android.opengl.GLSurfaceView;
 
 import org.distorted.library.effect.FragmentEffectAlpha;
 import org.distorted.library.effect.FragmentEffectChroma;
-import org.distorted.library.effect.VertexEffectDistort;
+import org.distorted.library.effect.VertexEffectDeform;
 import org.distorted.library.effect.VertexEffectSink;
 import org.distorted.library.effect.VertexEffectSwirl;
 import org.distorted.library.main.DistortedScreen;
@@ -114,7 +114,7 @@ class MovingEffectsRenderer implements GLSurfaceView.Renderer
    public void onSurfaceCreated(GL10 glUnused, EGLConfig config) 
      {
      VertexEffectSwirl.enable();
-     VertexEffectDistort.enable();
+     VertexEffectDeform.enable();
      VertexEffectSink.enable();
      FragmentEffectChroma.enable();
      FragmentEffectAlpha.enable();
diff --git a/src/main/java/org/distorted/examples/movingeffects/MovingEffectsSurfaceView.java b/src/main/java/org/distorted/examples/movingeffects/MovingEffectsSurfaceView.java
index b576b0f..abb680f 100644
--- a/src/main/java/org/distorted/examples/movingeffects/MovingEffectsSurfaceView.java
+++ b/src/main/java/org/distorted/examples/movingeffects/MovingEffectsSurfaceView.java
@@ -32,7 +32,7 @@ import android.util.AttributeSet;
 import org.distorted.library.effect.EffectType;
 import org.distorted.library.effect.FragmentEffectAlpha;
 import org.distorted.library.effect.FragmentEffectChroma;
-import org.distorted.library.effect.VertexEffectDistort;
+import org.distorted.library.effect.VertexEffectDeform;
 import org.distorted.library.effect.VertexEffectSink;
 import org.distorted.library.effect.VertexEffectSwirl;
 import org.distorted.library.main.DistortedEffects;
@@ -68,11 +68,11 @@ public class MovingEffectsSurfaceView extends GLSurfaceView
     
     private int mCurrEffect;
     private int mSize1, mSize2;
-    private Static3D mDistort;
+    private Static3D mDeform;
 
     private MovingEffectsRenderer mRenderer;
 
-    private VertexEffectDistort mEffectDistort;
+    private VertexEffectDeform mEffectDeform;
     private VertexEffectSink mEffectSink;
     private VertexEffectSwirl mEffectSwirl;
     private FragmentEffectChroma mEffectChroma;
@@ -92,7 +92,7 @@ public class MovingEffectsSurfaceView extends GLSurfaceView
       mCenter         = new Dynamic3D(LOOP_TIME,0.0f);
       mRegionFragment = new Static3D(0,0,0);
       mRegionVertex   = new Static4D(0,0,0,0);
-      mDistort        = new Static3D(0,0,0);
+      mDeform         = new Static3D(0,0,0);
 
       if(!isInEditMode())
         {
@@ -105,7 +105,7 @@ public class MovingEffectsSurfaceView extends GLSurfaceView
         setEGLContextClientVersion( (configurationInfo.reqGlEsVersion>>16) >= 3 ? 3:2 );
         setRenderer(mRenderer);
 
-        mEffectDistort = new VertexEffectDistort ( mDistort         , mCenter, mRegionVertex);
+        mEffectDeform  = new VertexEffectDeform  ( mDeform          , mCenter, mRegionVertex);
         mEffectSink    = new VertexEffectSink    (new Static1D(10)  , mCenter, mRegionVertex);
         mEffectSwirl   = new VertexEffectSwirl   (new Static1D(30)  , mCenter, mRegionVertex);
         mEffectAlpha   = new FragmentEffectAlpha (new Static1D(0.5f), mCenter, mRegionFragment, true);
@@ -127,7 +127,7 @@ public class MovingEffectsSurfaceView extends GLSurfaceView
 
       mRegionVertex.set(0,0,0,rad);
       mRegionFragment.set(rad,rad,rad);
-      mDistort.set3(max/10);
+      mDeform.set3(max/7);
       }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -148,7 +148,7 @@ public class MovingEffectsSurfaceView extends GLSurfaceView
         DistortedEffects q = mRenderer.getEffects();
         q.abortByType(EffectType.VERTEX);
         q.abortByType(EffectType.FRAGMENT);
-        q.apply(mEffectDistort);
+        q.apply(mEffectDeform);
         mCurrEffect = EFFECT_BUBBLE;
         }
       }
@@ -291,7 +291,7 @@ public class MovingEffectsSurfaceView extends GLSurfaceView
                                         gx = dv.get1();
                                         gy = dv.get2();
 
-                                        float Z = mDistort.get3()/10;
+                                        float Z = mDeform.get3()/7;
 
                                         if( (xDown-gx)*(xDown-gx) + (yDown-gy)*(yDown-gy) < Z*Z )
                                           {
diff --git a/src/main/java/org/distorted/examples/projection/ProjectionRenderer.java b/src/main/java/org/distorted/examples/projection/ProjectionRenderer.java
index 9e78350..7a36f0a 100644
--- a/src/main/java/org/distorted/examples/projection/ProjectionRenderer.java
+++ b/src/main/java/org/distorted/examples/projection/ProjectionRenderer.java
@@ -22,7 +22,7 @@ package org.distorted.examples.projection;
 import javax.microedition.khronos.egl.EGLConfig;
 import javax.microedition.khronos.opengles.GL10;
 
-import org.distorted.library.effect.VertexEffectDistort;
+import org.distorted.library.effect.VertexEffectDeform;
 import org.distorted.library.main.Distorted;
 import org.distorted.library.main.DistortedEffects;
 import org.distorted.library.main.DistortedScreen;
@@ -66,10 +66,10 @@ class ProjectionRenderer implements GLSurfaceView.Renderer
       mPoint4 = new Static3D(0,0,0);
       mRegion = new Static4D(0,0,0,0);
 
-      mEffects.apply( new VertexEffectDistort(mVector, mPoint1, mRegion) );
-      mEffects.apply( new VertexEffectDistort(mVector, mPoint2, mRegion) );
-      mEffects.apply( new VertexEffectDistort(mVector, mPoint3, mRegion) );
-      mEffects.apply( new VertexEffectDistort(mVector, mPoint4, mRegion) );
+      mEffects.apply( new VertexEffectDeform(mVector, mPoint1, mRegion) );
+      mEffects.apply( new VertexEffectDeform(mVector, mPoint2, mRegion) );
+      mEffects.apply( new VertexEffectDeform(mVector, mPoint3, mRegion) );
+      mEffects.apply( new VertexEffectDeform(mVector, mPoint4, mRegion) );
       }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -122,8 +122,8 @@ class ProjectionRenderer implements GLSurfaceView.Renderer
 
       int min = width<height ? width:height;
 
-      mVector.set(0,0,min/5);
-      mRegion.set(0,0,0,min/5);
+      mVector.set(0,0,min/4);
+      mRegion.set(0,0,0,min/4);
 
       mPoint1.set(  width/4,   height/4, 0);
       mPoint2.set(3*width/4,   height/4, 0);
@@ -151,7 +151,7 @@ class ProjectionRenderer implements GLSurfaceView.Renderer
     
    public void onSurfaceCreated(GL10 glUnused, EGLConfig config) 
       {
-      VertexEffectDistort.enable();
+      VertexEffectDeform.enable();
 
       try
         {
