commit 4562f295949dde3710d39edfee575b434cadf0c4
Author: Leszek Koltunski <leszek@distoretedandroid.org>
Date:   Fri Nov 4 11:50:54 2016 +0000

    Tidy up 'Moving effects'

diff --git a/src/main/java/org/distorted/examples/movingeffects/MovingEffectsActivity.java b/src/main/java/org/distorted/examples/movingeffects/MovingEffectsActivity.java
index f3a62c3..b8e544d 100644
--- a/src/main/java/org/distorted/examples/movingeffects/MovingEffectsActivity.java
+++ b/src/main/java/org/distorted/examples/movingeffects/MovingEffectsActivity.java
@@ -73,8 +73,8 @@ public class MovingEffectsActivity extends Activity
       {
       super.onResume();
       
-      GLSurfaceView mView = (GLSurfaceView) this.findViewById(R.id.movingeffectsSurfaceView);
-      mView.onResume();
+      GLSurfaceView view = (GLSurfaceView) this.findViewById(R.id.movingeffectsSurfaceView);
+      view.onResume();
       }
 
 ///////////////////////////////////////////////////////////////////
@@ -83,8 +83,8 @@ public class MovingEffectsActivity extends Activity
       {
       Abort(null);   
       
-      GLSurfaceView mView = (GLSurfaceView) this.findViewById(R.id.movingeffectsSurfaceView);
-      mView.onPause();
+      GLSurfaceView view = (GLSurfaceView) this.findViewById(R.id.movingeffectsSurfaceView);
+      view.onPause();
       
       super.onPause();
       }
@@ -116,7 +116,8 @@ public class MovingEffectsActivity extends Activity
     
     public void Bubble(View v)
       {
-      MovingEffectsSurfaceView.Bubble();
+      MovingEffectsSurfaceView view = (MovingEffectsSurfaceView) this.findViewById(R.id.movingeffectsSurfaceView);
+      view.Bubble();
       
       mAbort.setBackgroundColor(COLOR_UNPRESSED);
       mChroma.setBackgroundColor(COLOR_UNPRESSED);
@@ -130,7 +131,8 @@ public class MovingEffectsActivity extends Activity
 
     public void Sink(View v)
       {
-      MovingEffectsSurfaceView.Sink();
+      MovingEffectsSurfaceView view = (MovingEffectsSurfaceView) this.findViewById(R.id.movingeffectsSurfaceView);
+      view.Sink();
       
       mAbort.setBackgroundColor(COLOR_UNPRESSED);
       mChroma.setBackgroundColor(COLOR_UNPRESSED);
@@ -144,7 +146,8 @@ public class MovingEffectsActivity extends Activity
     
     public void Transparency(View v)
       {
-      MovingEffectsSurfaceView.Transparency();
+      MovingEffectsSurfaceView view = (MovingEffectsSurfaceView) this.findViewById(R.id.movingeffectsSurfaceView);
+      view.Transparency();
       
       mAbort.setBackgroundColor(COLOR_UNPRESSED);
       mChroma.setBackgroundColor(COLOR_UNPRESSED);
@@ -158,7 +161,8 @@ public class MovingEffectsActivity extends Activity
 
     public void Chroma(View v)
       {
-      MovingEffectsSurfaceView.Chroma();
+      MovingEffectsSurfaceView view = (MovingEffectsSurfaceView) this.findViewById(R.id.movingeffectsSurfaceView);
+      view.Chroma();
       
       mAbort.setBackgroundColor(COLOR_UNPRESSED);
       mChroma.setBackgroundColor(COLOR_PRESSED);
@@ -172,7 +176,8 @@ public class MovingEffectsActivity extends Activity
 
     public void Swirl(View v)
       {
-      MovingEffectsSurfaceView.Swirl();
+      MovingEffectsSurfaceView view = (MovingEffectsSurfaceView) this.findViewById(R.id.movingeffectsSurfaceView);
+      view.Swirl();
       
       mAbort.setBackgroundColor(COLOR_UNPRESSED);
       mChroma.setBackgroundColor(COLOR_UNPRESSED);
@@ -186,7 +191,8 @@ public class MovingEffectsActivity extends Activity
 
     public void Abort(View v)
       {
-      MovingEffectsSurfaceView.Abort();
+      MovingEffectsSurfaceView view = (MovingEffectsSurfaceView) this.findViewById(R.id.movingeffectsSurfaceView);
+      view.Abort();
       
       mAbort.setBackgroundColor(COLOR_PRESSED);
       mChroma.setBackgroundColor(COLOR_UNPRESSED);
diff --git a/src/main/java/org/distorted/examples/movingeffects/MovingEffectsRenderer.java b/src/main/java/org/distorted/examples/movingeffects/MovingEffectsRenderer.java
index e3bf4a0..5d5817d 100644
--- a/src/main/java/org/distorted/examples/movingeffects/MovingEffectsRenderer.java
+++ b/src/main/java/org/distorted/examples/movingeffects/MovingEffectsRenderer.java
@@ -36,7 +36,7 @@ import org.distorted.library.Distorted;
 
 class MovingEffectsRenderer implements GLSurfaceView.Renderer
    {  
-   private GLSurfaceView mView;
+   private MovingEffectsSurfaceView mView;
    private Canvas mCanvas;
    private Bitmap mBitmap;
    private Paint mPaint;
@@ -46,7 +46,7 @@ class MovingEffectsRenderer implements GLSurfaceView.Renderer
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-   MovingEffectsRenderer(GLSurfaceView v)
+   MovingEffectsRenderer(MovingEffectsSurfaceView v)
      {    
      mPaint = new Paint();
      mPaint.setAntiAlias(true);
@@ -107,7 +107,7 @@ class MovingEffectsRenderer implements GLSurfaceView.Renderer
      mCanvas = new Canvas(mBitmap);
 
      Distorted.onSurfaceChanged(texW, texH);
-     MovingEffectsSurfaceView.onSurfaceChanged(texW,texH);
+     mView.onSurfaceChanged(texW,texH);
      }
    
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -118,10 +118,10 @@ class MovingEffectsRenderer implements GLSurfaceView.Renderer
        
      long time = System.currentTimeMillis();
       
-     if (MovingEffectsSurfaceView.getCurrentEffect() == MovingEffectsSurfaceView.EFFECT_POINTS )
+     if (mView.getCurrentEffect() == MovingEffectsSurfaceView.EFFECT_POINTS )
        {
        drawBackground();   
-       MovingEffectsSurfaceView.drawCurve(mCanvas,time);
+       mView.drawCurve(mCanvas,time);
        mBackground.setBitmap(mBitmap);  
        }
       
diff --git a/src/main/java/org/distorted/examples/movingeffects/MovingEffectsSurfaceView.java b/src/main/java/org/distorted/examples/movingeffects/MovingEffectsSurfaceView.java
index e2ade90..4f020d2 100644
--- a/src/main/java/org/distorted/examples/movingeffects/MovingEffectsSurfaceView.java
+++ b/src/main/java/org/distorted/examples/movingeffects/MovingEffectsSurfaceView.java
@@ -50,18 +50,19 @@ public class MovingEffectsSurfaceView extends GLSurfaceView
     public static final int EFFECT_CHROMA=4;
     public static final int EFFECT_SWIRL =5;
 
-    private static Dynamic2D di2D;
-    private static Static4D dr;
-    private static Dynamic4D mRegion;
-
-    private static Paint mPaint;
-    private static int moving;
     private static final Object lock = new Object();
-    private static long mTime = 0;
+
+    private Dynamic2D di2D;
+    private Static4D dr;
+    private Dynamic4D mRegion;
+
+    private Paint mPaint;
+    private int moving;
+    private long mTime = 0;
     
-    private static int mCurrEffect;
-    private static int mSize1, mSize2, mSizeR;
-    private static int mMax;
+    private int mCurrEffect;
+    private int mSize1, mSize2, mSizeR;
+    private int mMax;
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
     
@@ -96,7 +97,7 @@ public class MovingEffectsSurfaceView extends GLSurfaceView
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-    public static void onSurfaceChanged(int width,int height)
+    public void onSurfaceChanged(int width,int height)
       {
       mMax = width>height ? width:height;
 
@@ -109,14 +110,14 @@ public class MovingEffectsSurfaceView extends GLSurfaceView
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-    public static int getCurrentEffect()
+    public int getCurrentEffect()
       {
       return mCurrEffect;
       }
     
 ///////////////////////////////////////////////////////////////////////////////////////////////////
     
-    public static void Bubble()
+    public void Bubble()
       {
       if( mCurrEffect==EFFECT_BUBBLE ) return;     
       
@@ -131,7 +132,7 @@ public class MovingEffectsSurfaceView extends GLSurfaceView
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-    public static void Sink()
+    public void Sink()
       {
       if( mCurrEffect==EFFECT_SINK ) return; 
          
@@ -146,7 +147,7 @@ public class MovingEffectsSurfaceView extends GLSurfaceView
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-    public static void Chroma()
+    public void Chroma()
       {
       if( mCurrEffect==EFFECT_CHROMA ) return;
          
@@ -161,7 +162,7 @@ public class MovingEffectsSurfaceView extends GLSurfaceView
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-    public static void Transparency()
+    public void Transparency()
       {
       if( mCurrEffect==EFFECT_TRANS ) return;   
       
@@ -176,7 +177,7 @@ public class MovingEffectsSurfaceView extends GLSurfaceView
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-    public static void Swirl()
+    public void Swirl()
       {
       if( mCurrEffect==EFFECT_SWIRL ) return;   
       
@@ -191,7 +192,7 @@ public class MovingEffectsSurfaceView extends GLSurfaceView
     
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-    public static void Abort()
+    public void Abort()
       {
       synchronized(lock)
         {
@@ -205,7 +206,7 @@ public class MovingEffectsSurfaceView extends GLSurfaceView
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
  
-    public static void drawCurve(Canvas c, long time)
+    public void drawCurve(Canvas c, long time)
       {
       synchronized(lock)
         {