commit 30c71dd53e648521e6dd68f2cd54085c53e160e8
Author: Leszek Koltunski <leszek@distoretedandroid.org>
Date:   Fri Nov 4 10:49:23 2016 +0000

    Remove 'statics' from the Deform app

diff --git a/src/main/java/org/distorted/examples/deform/DeformActivity.java b/src/main/java/org/distorted/examples/deform/DeformActivity.java
index 346b27c..306db2b 100644
--- a/src/main/java/org/distorted/examples/deform/DeformActivity.java
+++ b/src/main/java/org/distorted/examples/deform/DeformActivity.java
@@ -57,7 +57,10 @@ public class DeformActivity extends Activity implements OnSeekBarChangeListener
 
       RadioButton effect = (RadioButton)findViewById(R.id.deformDistortButton);
       effect.setChecked(true);
-      DeformRenderer.setMode(EffectNames.DISTORT);
+
+      DeformSurfaceView view = (DeformSurfaceView) this.findViewById(R.id.deformSurfaceView);
+
+      view.getRenderer().setMode(EffectNames.DISTORT);
       }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -65,11 +68,10 @@ public class DeformActivity extends Activity implements OnSeekBarChangeListener
     @Override
     protected void onPause() 
       {
-      DeformRenderer.onPause();
-      
-      GLSurfaceView mView = (GLSurfaceView) this.findViewById(R.id.deformSurfaceView);
-      mView.onPause();
-      
+      DeformSurfaceView view = (DeformSurfaceView) this.findViewById(R.id.deformSurfaceView);
+
+      view.getRenderer().onPause();
+      view.onPause();
       super.onPause();
       }
 
@@ -80,8 +82,8 @@ public class DeformActivity extends Activity implements OnSeekBarChangeListener
       {
       super.onResume();
       
-      GLSurfaceView mView = (GLSurfaceView) this.findViewById(R.id.deformSurfaceView);
-      mView.onResume();
+      GLSurfaceView view = (GLSurfaceView) this.findViewById(R.id.deformSurfaceView);
+      view.onResume();
       }
  
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -97,21 +99,24 @@ public class DeformActivity extends Activity implements OnSeekBarChangeListener
     
     public void Distort(View v)
       {
-      DeformRenderer.setMode(EffectNames.DISTORT);
+      DeformSurfaceView view = (DeformSurfaceView) this.findViewById(R.id.deformSurfaceView);
+      view.getRenderer().setMode(EffectNames.DISTORT);
       }     
     
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
     public void Deform(View v)
       {
-      DeformRenderer.setMode(EffectNames.DEFORM);
+      DeformSurfaceView view = (DeformSurfaceView) this.findViewById(R.id.deformSurfaceView);
+      view.getRenderer().setMode(EffectNames.DEFORM);
       }       
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
     public void Shear(View v)
       {
-      DeformRenderer.setMode(EffectNames.SHEAR);
+      DeformSurfaceView view = (DeformSurfaceView) this.findViewById(R.id.deformSurfaceView);
+      view.getRenderer().setMode(EffectNames.SHEAR);
       }       
     
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -120,9 +125,10 @@ public class DeformActivity extends Activity implements OnSeekBarChangeListener
       {
       switch (bar.getId()) 
         {
-        case R.id.deformSeekRadius: DeformRenderer.setRegionRadius(progress);
-                              textR.setText("Radius: "+progress);
-                              break;
+        case R.id.deformSeekRadius: DeformSurfaceView view = (DeformSurfaceView) this.findViewById(R.id.deformSurfaceView);
+                                    view.getRenderer().setRegionRadius(progress);
+                                    textR.setText("Radius: "+progress);
+                                    break;
         }
       }
 
diff --git a/src/main/java/org/distorted/examples/deform/DeformRenderer.java b/src/main/java/org/distorted/examples/deform/DeformRenderer.java
index c6bebd2..1fcc7f5 100644
--- a/src/main/java/org/distorted/examples/deform/DeformRenderer.java
+++ b/src/main/java/org/distorted/examples/deform/DeformRenderer.java
@@ -42,27 +42,27 @@ import android.opengl.GLSurfaceView;
 class DeformRenderer implements GLSurfaceView.Renderer 
 {
    private static final int NUM_VECTORS = 8;
-   private static final int NUMLINES = 10;
-   private static final int NUMFRAMES =10;
+   private static final int NUM_LINES = 10;
+   private static final int NUM_FRAMES =10;
 
    private GLSurfaceView mView;
    private DistortedBitmap fps;
    private DistortedBitmap stretch;
    private Static3D touchPoint;
 
-   private static Dynamic3D mReleasedDistortDynamic;
-   private static Dynamic3D mMovingDistortDynamic;
-   private static Static3D[] vDistort;
-   private static Dynamic3D mReleasedDeformDynamic;
-   private static Dynamic3D mMovingDeformDynamic;
-   private static Static3D[] vDeform;
-   private static Dynamic3D mReleasedShearDynamic;
-   private static Dynamic3D mMovingShearDynamic;
-   private static Static3D[] vShear;
-
-   private static Static4D dr;
+   private Dynamic3D mReleasedDistortDynamic;
+   private Dynamic3D mMovingDistortDynamic;
+   private Static3D[] vDistort;
+   private Dynamic3D mReleasedDeformDynamic;
+   private Dynamic3D mMovingDeformDynamic;
+   private Static3D[] vDeform;
+   private Dynamic3D mReleasedShearDynamic;
+   private Dynamic3D mMovingShearDynamic;
+   private Static3D[] vShear;
+
+   private Static4D dr;
    private Canvas fpsCanvas;
-   private Bitmap fpsBitmap, stretchBitmap;
+   private Bitmap fpsBitmap;
    private int scrHeight, scrWidth;
    private Paint mPaint;
    private int fpsH, fpsW;
@@ -71,23 +71,22 @@ class DeformRenderer implements GLSurfaceView.Renderer
    private long[] durations;
    private int currDuration;
 
-   private static EffectNames mMode = EffectNames.DISTORT;
-   private static boolean bitmapCreated = false;
-
-   private static long mLastEffect = -1;
+   private EffectNames mMode = EffectNames.DISTORT;
+   private boolean bitmapCreated = false;
+   private long mLastEffect = -1;
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-   public DeformRenderer(GLSurfaceView view) 
+   DeformRenderer(GLSurfaceView view)
       { 
       mView = view;
       
       dr = new Static4D(0,0,0,0);
 
-      durations = new long[NUMFRAMES+1];
+      durations = new long[NUM_FRAMES+1];
       currDuration = 0;
 
-      for(int i=0; i<NUMFRAMES+1; i++)
+      for(int i=0; i<NUM_FRAMES+1; i++)
         {
         durations[i]=0;
         }
@@ -143,21 +142,21 @@ class DeformRenderer implements GLSurfaceView.Renderer
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-   public static void setMode(EffectNames mode)
+   void setMode(EffectNames mode)
       {
       mMode = mode;  
       }
    
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-   public static void setRegionRadius(int r)
+   void setRegionRadius(int r)
       {
       dr.set(0,0,r); 
       }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-    public static void onPause()
+    public void onPause()
       {
       bitmapCreated = false;  
       }
@@ -230,7 +229,7 @@ class DeformRenderer implements GLSurfaceView.Renderer
       
       mPaint = new Paint();
       stretch = new DistortedBitmap(w,h, 50);   
-      stretchBitmap = Bitmap.createBitmap(w,h, Bitmap.Config.ARGB_8888);
+      Bitmap stretchBitmap = Bitmap.createBitmap(w,h, Bitmap.Config.ARGB_8888);
       stretchCanvas = new Canvas(stretchBitmap);
       
       fpsW = scrWidth/5;
@@ -244,10 +243,10 @@ class DeformRenderer implements GLSurfaceView.Renderer
       stretchCanvas.drawRect(0, 0, w, h, mPaint);
       mPaint.setColor(0xffffffff);
       
-      for(int i=0; i<=NUMLINES ; i++ )
+      for(int i=0; i<=NUM_LINES ; i++ )
         {
-        stretchCanvas.drawRect(w*i/NUMLINES - 1,                0,  w*i/NUMLINES + 1,  h               , mPaint);
-        stretchCanvas.drawRect(               0, h *i/NUMLINES -1,  w               ,  h*i/NUMLINES + 1, mPaint);  
+        stretchCanvas.drawRect(w*i/NUM_LINES - 1,                 0,  w*i/NUM_LINES + 1,  h                , mPaint);
+        stretchCanvas.drawRect(                0, h *i/NUM_LINES -1,  w                ,  h*i/NUM_LINES + 1, mPaint);
         }
         
       touchPoint= new Static3D(0,0,0);
@@ -262,7 +261,7 @@ class DeformRenderer implements GLSurfaceView.Renderer
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-    public void down(int x, int y)
+    void down(int x, int y)
       {
       int xt = x-scrWidth/4;
       int yt = y-scrHeight/4;
@@ -290,7 +289,7 @@ class DeformRenderer implements GLSurfaceView.Renderer
     
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-    public void move(int x, int y)
+    void move(int x, int y)
       {
       switch(mMode)
         {
@@ -305,7 +304,7 @@ class DeformRenderer implements GLSurfaceView.Renderer
     
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-    public void up()
+    void up()
       {
       stretch.abortEffect(mLastEffect);
 
@@ -344,11 +343,11 @@ class DeformRenderer implements GLSurfaceView.Renderer
       if( lastTime!=0 )
         {
         currDuration++;
-        if( currDuration>=NUMFRAMES ) currDuration = 0;  
-        durations[NUMFRAMES] += ((currentTime-lastTime)-durations[currDuration]);
+        if( currDuration>=NUM_FRAMES ) currDuration = 0;
+        durations[NUM_FRAMES] += ((currentTime-lastTime)-durations[currDuration]);
         durations[currDuration] = currentTime-lastTime;
 
-        fpsString = "" + ((int)(10000.0f*NUMFRAMES/durations[NUMFRAMES]))/10.0f;
+        fpsString = "" + ((int)(10000.0f*NUM_FRAMES/durations[NUM_FRAMES]))/10.0f;
         }
       
       lastTime = currentTime;   
diff --git a/src/main/java/org/distorted/examples/deform/DeformSurfaceView.java b/src/main/java/org/distorted/examples/deform/DeformSurfaceView.java
index 31f1023..8ed8fec 100644
--- a/src/main/java/org/distorted/examples/deform/DeformSurfaceView.java
+++ b/src/main/java/org/distorted/examples/deform/DeformSurfaceView.java
@@ -29,7 +29,7 @@ import android.view.MotionEvent;
 
 class DeformSurfaceView extends GLSurfaceView 
 {
-    private DeformRenderer renderer;
+    private DeformRenderer mRenderer;
     private int xTouch, yTouch;
    
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -47,13 +47,20 @@ class DeformSurfaceView extends GLSurfaceView
           setEGLConfigChooser(8, 8, 8, 8, 16, 0);   
           }
     
-        renderer = new DeformRenderer(this);
-        setRenderer(renderer);
+        mRenderer = new DeformRenderer(this);
+        setRenderer(mRenderer);
         }
       }
     
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-    
+
+    DeformRenderer getRenderer()
+      {
+      return mRenderer;
+      }
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
     @Override public boolean onTouchEvent(MotionEvent event) 
       {
       int action = event.getAction();
@@ -64,11 +71,11 @@ class DeformSurfaceView extends GLSurfaceView
          {
          case MotionEvent.ACTION_DOWN: xTouch =x;
                                        yTouch =y; 
-                                       renderer.down(x,y);
+                                       mRenderer.down(x,y);
                                        break;
-         case MotionEvent.ACTION_MOVE: renderer.move(x-xTouch,y-yTouch);                      
+         case MotionEvent.ACTION_MOVE: mRenderer.move(x-xTouch,y-yTouch);
                                        break;
-         case MotionEvent.ACTION_UP  : renderer.up(); 
+         case MotionEvent.ACTION_UP  : mRenderer.up();
                                        break;
          }