commit abc3054d4ba93bc76b7dd971869ebd3c774a1a67 Author: Leszek Koltunski Date: Fri Nov 4 11:38:13 2016 +0000 Tidy up 'Girl' diff --git a/src/main/java/org/distorted/examples/girl/GirlActivity.java b/src/main/java/org/distorted/examples/girl/GirlActivity.java index 8fe9eb8..c16eba5 100644 --- a/src/main/java/org/distorted/examples/girl/GirlActivity.java +++ b/src/main/java/org/distorted/examples/girl/GirlActivity.java @@ -33,7 +33,6 @@ import android.widget.SeekBar.OnSeekBarChangeListener; public class GirlActivity extends Activity implements OnSeekBarChangeListener { - private SeekBar barSwing, barSize, barHips; private TextView textSwing, textSize, textHips; /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -49,9 +48,9 @@ public class GirlActivity extends Activity implements OnSeekBarChangeListener textSize = (TextView)findViewById(R.id.girlTextSize); textHips = (TextView)findViewById(R.id.girlTextHips); - barSwing = (SeekBar)findViewById(R.id.girlSeekSwing); - barSize = (SeekBar)findViewById(R.id.girlSeekSize); - barHips = (SeekBar)findViewById(R.id.girlSeekHips); + SeekBar barSwing = (SeekBar)findViewById(R.id.girlSeekSwing); + SeekBar barSize = (SeekBar)findViewById(R.id.girlSeekSize); + SeekBar barHips = (SeekBar)findViewById(R.id.girlSeekHips); barSwing.setOnSeekBarChangeListener(this); barSize.setOnSeekBarChangeListener(this); @@ -71,8 +70,8 @@ public class GirlActivity extends Activity implements OnSeekBarChangeListener @Override protected void onPause() { - GLSurfaceView mView = (GLSurfaceView) this.findViewById(R.id.girlSurfaceView); - mView.onPause(); + GLSurfaceView view = (GLSurfaceView) this.findViewById(R.id.girlSurfaceView); + view.onPause(); super.onPause(); } @@ -84,8 +83,8 @@ public class GirlActivity extends Activity implements OnSeekBarChangeListener { super.onResume(); - GLSurfaceView mView = (GLSurfaceView) this.findViewById(R.id.girlSurfaceView); - mView.onResume(); + GLSurfaceView view = (GLSurfaceView) this.findViewById(R.id.girlSurfaceView); + view.onResume(); } /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -103,11 +102,12 @@ public class GirlActivity extends Activity implements OnSeekBarChangeListener { int v; float s; - + GirlSurfaceView view = (GirlSurfaceView) this.findViewById(R.id.girlSurfaceView); + switch (bar.getId()) { case R.id.girlSeekSwing: v = progress/5; - GirlRenderer.setSwing(v); + view.getRenderer().setSwing(v); textSwing.setText("Swing: "+v); break; case R.id.girlSeekSize : if( progress> 50) @@ -118,11 +118,11 @@ public class GirlActivity extends Activity implements OnSeekBarChangeListener { s = 0.015f*progress + 0.25f; } - GirlRenderer.setSize(s); + view.getRenderer().setSize(s); textSize.setText("Size: "+(((int)(s*10))/10.0f)); break; case R.id.girlSeekHips : v = progress/5; - GirlRenderer.setHips(v); + view.getRenderer().setHips(v); textHips.setText("Hips: "+v); break; } diff --git a/src/main/java/org/distorted/examples/girl/GirlRenderer.java b/src/main/java/org/distorted/examples/girl/GirlRenderer.java index e2ad2c3..cfae3ae 100644 --- a/src/main/java/org/distorted/examples/girl/GirlRenderer.java +++ b/src/main/java/org/distorted/examples/girl/GirlRenderer.java @@ -50,20 +50,18 @@ class GirlRenderer implements GLSurfaceView.Renderer private DistortedBitmap mGirl; private Static2D pLeft, pRight, pHips; private Static4D Region, sinkRegion, HipsRegion; - private static Dynamic3D diL, diR; - private static Dynamic1D diHips, diSink; - private static Static3D v0,v1,v2,v3; - private static Static1D dBegin, dMiddle, dEnd, s0; - + private Dynamic3D diL, diR; + private Dynamic1D diHips, diSink; + private Static3D v0,v1,v2,v3; + private Static1D dBegin, dMiddle, dEnd, s0; private int bmpHeight, bmpWidth; - - private static int boobsSwing; - private static int hipsSwirl; - private static float boobsSink; + private int boobsSwing; + private int hipsSwirl; + private float boobsSink; /////////////////////////////////////////////////////////////////////////////////////////////////// - public GirlRenderer(GLSurfaceView v) + GirlRenderer(GLSurfaceView v) { mView = v; @@ -122,7 +120,7 @@ class GirlRenderer implements GLSurfaceView.Renderer /////////////////////////////////////////////////////////////////////////////////////////////////// - public static void setHips(int s) + void setHips(int s) { hipsSwirl = s; dBegin.set(-hipsSwirl); @@ -131,7 +129,7 @@ class GirlRenderer implements GLSurfaceView.Renderer /////////////////////////////////////////////////////////////////////////////////////////////////// - public static void setSize(float s) + void setSize(float s) { boobsSink = s; s0.set(boobsSink); @@ -139,7 +137,7 @@ class GirlRenderer implements GLSurfaceView.Renderer /////////////////////////////////////////////////////////////////////////////////////////////////// - public static void setSwing(int s) + void setSwing(int s) { boobsSwing = s; diff --git a/src/main/java/org/distorted/examples/girl/GirlSurfaceView.java b/src/main/java/org/distorted/examples/girl/GirlSurfaceView.java index 5c42060..5a328df 100644 --- a/src/main/java/org/distorted/examples/girl/GirlSurfaceView.java +++ b/src/main/java/org/distorted/examples/girl/GirlSurfaceView.java @@ -28,6 +28,8 @@ import android.util.AttributeSet; class GirlSurfaceView extends GLSurfaceView { + private GirlRenderer mRenderer; + /////////////////////////////////////////////////////////////////////////////////////////////////// public GirlSurfaceView(Context c, AttributeSet attrs) @@ -40,8 +42,17 @@ class GirlSurfaceView extends GLSurfaceView { setEGLConfigChooser(8, 8, 8, 8, 16, 0); } - - setRenderer(new GirlRenderer(this)); + + mRenderer = new GirlRenderer(this); + + setRenderer(mRenderer); } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + GirlRenderer getRenderer() + { + return mRenderer; + } }