commit 13a5c5cd08838cd89ee3e4a3ea437fb843fcfc1c
Author: Leszek Koltunski <leszek@distoretedandroid.org>
Date:   Fri Nov 4 12:09:30 2016 +0000

    Tidy up 'Save'

diff --git a/src/main/java/org/distorted/examples/save/SaveActivity.java b/src/main/java/org/distorted/examples/save/SaveActivity.java
index 6fc9f75..c03b70c 100644
--- a/src/main/java/org/distorted/examples/save/SaveActivity.java
+++ b/src/main/java/org/distorted/examples/save/SaveActivity.java
@@ -26,16 +26,12 @@ import android.app.Activity;
 import android.opengl.GLSurfaceView;
 import android.os.Bundle;
 import android.view.View;
-import android.widget.Button;
 import android.widget.SeekBar;
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 public class SaveActivity extends Activity implements SeekBar.OnSeekBarChangeListener
   {
-  private Button mSave;
-  private SeekBar barSize;
-
 ///////////////////////////////////////////////////////////////////////////////////////////////////
     
   @Override
@@ -44,10 +40,8 @@ public class SaveActivity extends Activity implements SeekBar.OnSeekBarChangeLis
     super.onCreate(icicle);
      
     setContentView(R.layout.savelayout);
-           
-    mSave = (Button)findViewById(R.id.saveButton);
 
-    barSize  = (SeekBar)findViewById(R.id.saveSeekBar);
+    SeekBar barSize  = (SeekBar)findViewById(R.id.saveSeekBar);
     barSize.setOnSeekBarChangeListener(this);
     barSize.setProgress(50);
     }
@@ -57,10 +51,10 @@ public class SaveActivity extends Activity implements SeekBar.OnSeekBarChangeLis
   @Override
   protected void onPause() 
     {
-    SaveRenderer.stopThread();
+    SaveWorkerThread.stopSending();
 
-    GLSurfaceView mView = (GLSurfaceView) this.findViewById(R.id.saveSurfaceView);
-    mView.onPause();
+    GLSurfaceView view = (GLSurfaceView) this.findViewById(R.id.saveSurfaceView);
+    view.onPause();
       
     super.onPause();
     }
@@ -72,10 +66,10 @@ public class SaveActivity extends Activity implements SeekBar.OnSeekBarChangeLis
     {
     super.onResume();
       
-    GLSurfaceView mView = (GLSurfaceView) this.findViewById(R.id.saveSurfaceView);
-    mView.onResume();
+    GLSurfaceView view = (GLSurfaceView) this.findViewById(R.id.saveSurfaceView);
+    view.onResume();
 
-    SaveRenderer.startThread(this);
+    SaveWorkerThread.startSending(this);
     }
  
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -91,7 +85,8 @@ public class SaveActivity extends Activity implements SeekBar.OnSeekBarChangeLis
 
   public void Save(View v)
     {
-    SaveRenderer.Save();
+    SaveSurfaceView view = (SaveSurfaceView) this.findViewById(R.id.saveSurfaceView);
+    view.getRenderer().Save();
     }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -99,7 +94,8 @@ public class SaveActivity extends Activity implements SeekBar.OnSeekBarChangeLis
   public void onProgressChanged(SeekBar bar, int progress, boolean fromUser)
     {
     float s = (progress>50 ? ((progress-50)/16.0f + 1.0f):(0.015f*progress + 0.25f));
-    SaveRenderer.setSize(s);
+    SaveSurfaceView view = (SaveSurfaceView) this.findViewById(R.id.saveSurfaceView);
+    view.getRenderer().setSize(s);
     }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/main/java/org/distorted/examples/save/SaveRenderer.java b/src/main/java/org/distorted/examples/save/SaveRenderer.java
index 7e07031..f98883c 100644
--- a/src/main/java/org/distorted/examples/save/SaveRenderer.java
+++ b/src/main/java/org/distorted/examples/save/SaveRenderer.java
@@ -39,7 +39,6 @@ import org.distorted.library.type.Static2D;
 import org.distorted.library.type.Static3D;
 import org.distorted.library.type.Static4D;
 
-import android.app.Activity;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.opengl.GLES20;
@@ -51,23 +50,21 @@ import android.os.Environment;
 class SaveRenderer implements GLSurfaceView.Renderer
   {
   private GLSurfaceView mView;
-  private static DistortedBitmap mGirl;
+  private DistortedBitmap mGirl;
   private Static2D pLeft, pRight;
   private Static4D sinkRegion;
-  private static Dynamic1D diSink;
-  private static Static1D s0;
+  private Dynamic1D diSink;
+  private Static1D s0;
 
   private int bmpHeight, bmpWidth;
-  private static int scrHeight, scrWidth;
-  private static float boobsSink;
-  private static boolean isSaving = false;
-  private static String mPath;
-
-  private static SaveWorkerThread mWorkerThread =null;
+  private int scrHeight, scrWidth;
+  private float boobsSink;
+  private boolean isSaving = false;
+  private String mPath;
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-  public SaveRenderer(GLSurfaceView v)
+  SaveRenderer(GLSurfaceView v)
     {
     mView = v;
       
@@ -86,24 +83,7 @@ class SaveRenderer implements GLSurfaceView.Renderer
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-  public static void startThread(Activity act)
-    {
-    if( mWorkerThread ==null ) mWorkerThread = new SaveWorkerThread();
-
-    mWorkerThread.startSending(act);
-    }
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-  public static void stopThread()
-    {
-    mWorkerThread.stopSending();
-    mWorkerThread = null;
-    }
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-  public static void setSize(float s)
+  void setSize(float s)
     {
     boobsSink = s;
     s0.set(boobsSink);
@@ -111,7 +91,7 @@ class SaveRenderer implements GLSurfaceView.Renderer
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-  public static void Save()
+  void Save()
     {
     if( isSaving==false )
       {
@@ -147,7 +127,7 @@ class SaveRenderer implements GLSurfaceView.Renderer
       buf.order(ByteOrder.LITTLE_ENDIAN);
       GLES20.glReadPixels( 0, 0, scrWidth, scrHeight , GLES20.GL_RGBA, GLES20.GL_UNSIGNED_BYTE, buf);
 
-      mWorkerThread.newBuffer(buf,scrWidth,scrHeight,mPath);
+      SaveWorkerThread.newBuffer(buf,scrWidth,scrHeight,mPath);
 
       isSaving = false;
       }
diff --git a/src/main/java/org/distorted/examples/save/SaveSurfaceView.java b/src/main/java/org/distorted/examples/save/SaveSurfaceView.java
index 9938c4d..281d67c 100644
--- a/src/main/java/org/distorted/examples/save/SaveSurfaceView.java
+++ b/src/main/java/org/distorted/examples/save/SaveSurfaceView.java
@@ -28,6 +28,10 @@ import android.util.AttributeSet;
 
 class SaveSurfaceView extends GLSurfaceView 
   {
+  private SaveRenderer mRenderer;
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
   public SaveSurfaceView(Context c, AttributeSet attrs)
     {
     super(c, attrs);
@@ -38,8 +42,17 @@ class SaveSurfaceView extends GLSurfaceView
       { 
       setEGLConfigChooser(8, 8, 8, 8, 16, 0);   
       }
-        
-    setRenderer(new SaveRenderer(this));
+
+    mRenderer = new SaveRenderer(this);
+
+    setRenderer(mRenderer);
+    }
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+  SaveRenderer getRenderer()
+    {
+    return mRenderer;
     }
   }
 
diff --git a/src/main/java/org/distorted/examples/save/SaveWorkerThread.java b/src/main/java/org/distorted/examples/save/SaveWorkerThread.java
index 5475e4d..3ca558e 100644
--- a/src/main/java/org/distorted/examples/save/SaveWorkerThread.java
+++ b/src/main/java/org/distorted/examples/save/SaveWorkerThread.java
@@ -33,7 +33,7 @@ import java.lang.ref.WeakReference;
 import java.nio.ByteBuffer;
 import java.util.Vector;
 
-public class SaveWorkerThread extends Thread
+class SaveWorkerThread extends Thread
   {
   private static Vector<WorkLoad> mBuffers;
   private static SaveWorkerThread mThis=null;