commit fe3c72ce4e2f52a56bcc96e3e874b40dd8e20db9 Author: Leszek Koltunski Date: Fri Nov 4 10:29:22 2016 +0000 remote unneeded 'static' variables and methods from the 'Dynamic' app diff --git a/src/main/java/org/distorted/examples/dynamic/DynamicActivity.java b/src/main/java/org/distorted/examples/dynamic/DynamicActivity.java index 697aa16..5e71570 100644 --- a/src/main/java/org/distorted/examples/dynamic/DynamicActivity.java +++ b/src/main/java/org/distorted/examples/dynamic/DynamicActivity.java @@ -73,16 +73,16 @@ public class DynamicActivity extends Activity implements OnSeekBarChangeListener { super.onResume(); - GLSurfaceView mView = (GLSurfaceView) this.findViewById(R.id.dynamicSurfaceView); - mView.onResume(); + GLSurfaceView view = (GLSurfaceView) this.findViewById(R.id.dynamicSurfaceView); + view.onResume(); } /////////////////////////////////////////////////////////////////// @Override protected void onPause() { - GLSurfaceView mView = (GLSurfaceView) this.findViewById(R.id.dynamicSurfaceView); - mView.onPause(); + GLSurfaceView view = (GLSurfaceView) this.findViewById(R.id.dynamicSurfaceView); + view.onPause(); super.onPause(); } @@ -106,55 +106,63 @@ public class DynamicActivity extends Activity implements OnSeekBarChangeListener public void Loop(View v) { - DynamicSurfaceView.setMode(Dynamic1D.MODE_LOOP); + DynamicSurfaceView view = (DynamicSurfaceView) this.findViewById(R.id.dynamicSurfaceView); + view.setMode(Dynamic1D.MODE_LOOP); } /////////////////////////////////////////////////////////////////// public void Path(View v) { - DynamicSurfaceView.setMode(Dynamic1D.MODE_PATH); + DynamicSurfaceView view = (DynamicSurfaceView) this.findViewById(R.id.dynamicSurfaceView); + view.setMode(Dynamic1D.MODE_PATH); } /////////////////////////////////////////////////////////////////// public void Jump(View v) { - DynamicSurfaceView.setMode(Dynamic1D.MODE_JUMP); + DynamicSurfaceView view = (DynamicSurfaceView) this.findViewById(R.id.dynamicSurfaceView); + view.setMode(Dynamic1D.MODE_JUMP); } /////////////////////////////////////////////////////////////////// public void Dim1D(View v) { - DynamicSurfaceView.setDimension(DynamicSurfaceView.DIM_1D); + DynamicSurfaceView view = (DynamicSurfaceView) this.findViewById(R.id.dynamicSurfaceView); + view.setDimension(DynamicSurfaceView.DIM_1D); } /////////////////////////////////////////////////////////////////// public void Dim2D(View v) { - DynamicSurfaceView.setDimension(DynamicSurfaceView.DIM_2D); + DynamicSurfaceView view = (DynamicSurfaceView) this.findViewById(R.id.dynamicSurfaceView); + view.setDimension(DynamicSurfaceView.DIM_2D); } /////////////////////////////////////////////////////////////////// public void Dim3DXY(View v) { - DynamicSurfaceView.setDimension(DynamicSurfaceView.DIM_3DXY); + DynamicSurfaceView view = (DynamicSurfaceView) this.findViewById(R.id.dynamicSurfaceView); + view.setDimension(DynamicSurfaceView.DIM_3DXY); } /////////////////////////////////////////////////////////////////// public void Dim3DXZ(View v) { - DynamicSurfaceView.setDimension(DynamicSurfaceView.DIM_3DXZ); + DynamicSurfaceView view = (DynamicSurfaceView) this.findViewById(R.id.dynamicSurfaceView); + view.setDimension(DynamicSurfaceView.DIM_3DXZ); } /////////////////////////////////////////////////////////////////// public void onProgressChanged(SeekBar bar, int progress, boolean fromUser) { + DynamicSurfaceView view = (DynamicSurfaceView) this.findViewById(R.id.dynamicSurfaceView); int id = bar.getId(); if( id == R.id.dynamicSeekDuration ) @@ -162,7 +170,7 @@ public class DynamicActivity extends Activity implements OnSeekBarChangeListener float v = progress*200; int i = (int)(v/100); float t = i/10.0f; - DynamicSurfaceView.setDuration((int)v); + view.setDuration((int)v); textD.setText("Duration: "+(int)t+" s"); } else @@ -174,7 +182,7 @@ public class DynamicActivity extends Activity implements OnSeekBarChangeListener case R.id.dynamicSeekNoise2 : progress2 = progress; break; } - DynamicSurfaceView.setNoise(progress0/100.0f,progress1/100.0f,progress2/100.0f); + view.setNoise(progress0/100.0f,progress1/100.0f,progress2/100.0f); textN.setText("Noise: "+(progress0/100.f)+" "+(progress1/100.f)+" "+(progress2/100.f)); } } diff --git a/src/main/java/org/distorted/examples/dynamic/DynamicRenderer.java b/src/main/java/org/distorted/examples/dynamic/DynamicRenderer.java index 7430392..c69147c 100644 --- a/src/main/java/org/distorted/examples/dynamic/DynamicRenderer.java +++ b/src/main/java/org/distorted/examples/dynamic/DynamicRenderer.java @@ -36,7 +36,7 @@ import org.distorted.library.Distorted; class DynamicRenderer implements GLSurfaceView.Renderer { - private GLSurfaceView mView; + private DynamicSurfaceView mView; private DistortedBitmap mBackground; private Canvas mCanvas; private Bitmap mBitmap; @@ -46,7 +46,7 @@ class DynamicRenderer implements GLSurfaceView.Renderer /////////////////////////////////////////////////////////////////////////////////////////////////// - DynamicRenderer(GLSurfaceView v) + DynamicRenderer(DynamicSurfaceView v) { mPaint = new Paint(); mPaint.setAntiAlias(true); @@ -83,7 +83,7 @@ class DynamicRenderer implements GLSurfaceView.Renderer mCanvas = new Canvas(mBitmap); Distorted.onSurfaceChanged(texW,texH); - DynamicSurfaceView.onSurfaceChanged(texW,texH); + mView.onSurfaceChanged(texW,texH); } /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -95,7 +95,7 @@ class DynamicRenderer implements GLSurfaceView.Renderer long time = System.currentTimeMillis(); mCanvas.drawRect(0, 0, texW, texH, mPaint); - DynamicSurfaceView.drawCurve(mCanvas,time); + mView.drawCurve(mCanvas,time); mBackground.setBitmap(mBitmap); mBackground.draw(time); } diff --git a/src/main/java/org/distorted/examples/dynamic/DynamicSurfaceView.java b/src/main/java/org/distorted/examples/dynamic/DynamicSurfaceView.java index 758b41f..1d04933 100644 --- a/src/main/java/org/distorted/examples/dynamic/DynamicSurfaceView.java +++ b/src/main/java/org/distorted/examples/dynamic/DynamicSurfaceView.java @@ -44,34 +44,34 @@ public class DynamicSurfaceView extends GLSurfaceView public static final int DIM_3DXY = 2; public static final int DIM_3DXZ = 3; - private static final int NUM_POINTS = 500; + private static final int NUM_POINTS = 250; private static final int MAX_POINTS = 6; private static final Object lock = new Object(); - private static Dynamic1D di1D; - private static Dynamic2D di2D; - private static Dynamic3D di3D; + private Dynamic1D di1D; + private Dynamic2D di2D; + private Dynamic3D di3D; - private static Paint mPaint; - private static int moving; - private static int mDuration; - private static int mPosition; - private static float mNoise0, mNoise1, mNoise2; + private Paint mPaint; + private int moving; + private int mDuration; + private int mPosition; + private float mNoise0, mNoise1, mNoise2; - private static int mSize1, mSize2, mSizeT, mAvg; + private int mSize1, mSize2, mSizeT, mAvg; - private static int currentDim= DIM_2D; + private int currentDim= DIM_2D; - private static Static1D p1D; - private static Static2D p2D; - private static Static3D p3D; + private Static1D p1D; + private Static2D p2D; + private Static3D p3D; - private static Static1D p1N; - private static Static2D p2N; - private static Static3D p3N; + private Static1D p1N; + private Static2D p2N; + private Static3D p3N; - private static float[] mPoints = new float[3*NUM_POINTS]; + private float[] mPoints = new float[3*NUM_POINTS]; /////////////////////////////////////////////////////////////////// @@ -116,7 +116,7 @@ public class DynamicSurfaceView extends GLSurfaceView /////////////////////////////////////////////////////////////////////////////////////////////////// - public static void onSurfaceChanged(int width,int height) + public void onSurfaceChanged(int width,int height) { mAvg = (width+height)/2; @@ -131,7 +131,7 @@ public class DynamicSurfaceView extends GLSurfaceView /////////////////////////////////////////////////////////////////// - public static void setMode(int mode) + public void setMode(int mode) { di1D.setMode(mode); di2D.setMode(mode); @@ -140,7 +140,7 @@ public class DynamicSurfaceView extends GLSurfaceView /////////////////////////////////////////////////////////////////// - public static void setDuration(int duration) + public void setDuration(int duration) { mDuration = duration; @@ -151,7 +151,7 @@ public class DynamicSurfaceView extends GLSurfaceView /////////////////////////////////////////////////////////////////// - public static void setNoise(float noise0, float noise1, float noise2) + public void setNoise(float noise0, float noise1, float noise2) { mNoise0 = noise0; mNoise1 = noise1; @@ -168,7 +168,7 @@ public class DynamicSurfaceView extends GLSurfaceView /////////////////////////////////////////////////////////////////// - public static void setDimension(int dim) + public void setDimension(int dim) { if( currentDim != dim ) { @@ -190,7 +190,7 @@ public class DynamicSurfaceView extends GLSurfaceView /////////////////////////////////////////////////////////////////// - public static void drawCurve(Canvas c, long time) + public void drawCurve(Canvas c, long time) { if ( ++mPosition >= NUM_POINTS ) mPosition=0; @@ -207,7 +207,7 @@ public class DynamicSurfaceView extends GLSurfaceView /////////////////////////////////////////////////////////////////// - private static void clearPoints() + private void clearPoints() { for(int i=0; i<3*NUM_POINTS; i++) { @@ -217,7 +217,7 @@ public class DynamicSurfaceView extends GLSurfaceView /////////////////////////////////////////////////////////////////// - private static void drawCurve1D(Canvas c, long time) + private void drawCurve1D(Canvas c, long time) { int len = di1D.getNumPoints(); mPaint.setColor(0xff000000); @@ -250,7 +250,7 @@ public class DynamicSurfaceView extends GLSurfaceView /////////////////////////////////////////////////////////////////// - private static void drawCurve2D(Canvas c, long time) + private void drawCurve2D(Canvas c, long time) { int len = di2D.getNumPoints(); mPaint.setColor(0xff000000); @@ -286,7 +286,7 @@ public class DynamicSurfaceView extends GLSurfaceView /////////////////////////////////////////////////////////////////// - private static void drawCurve3D(Canvas c, long time) + private void drawCurve3D(Canvas c, long time) { int len = di3D.getNumPoints(); mPaint.setColor(0xff000000);