commit e2c784bde913f9ea91d0234424a6639b5be56408 Author: Leszek Koltunski Date: Fri Nov 4 11:25:45 2016 +0000 Tidy up 'Flag' diff --git a/src/main/java/org/distorted/examples/flag/FlagActivity.java b/src/main/java/org/distorted/examples/flag/FlagActivity.java index 193905d..74631d4 100644 --- a/src/main/java/org/distorted/examples/flag/FlagActivity.java +++ b/src/main/java/org/distorted/examples/flag/FlagActivity.java @@ -33,13 +33,11 @@ import org.distorted.library.type.Static5D; public class FlagActivity extends Activity implements SeekBar.OnSeekBarChangeListener { - private SeekBar barAmplitude, barLength, barAngleA, barAngleB; private TextView textAmplitude, textLength, textAngleA, textAngleB; - private SeekBar barNoiseAmplitude, barNoiseLength, barNoiseAngleA, barNoiseAngleB; private TextView textNoiseAmplitude, textNoiseLength, textNoiseAngleA, textNoiseAngleB; - - private Static5D noise; + private Static5D mNoise; private String mStr; + /////////////////////////////////////////////////////////////////////////////////////////////////// @Override @@ -48,18 +46,17 @@ public class FlagActivity extends Activity implements SeekBar.OnSeekBarChangeLis super.onCreate(savedState); setContentView(R.layout.flaglayout); - noise = new Static5D(0,0,0,0,0); - mStr = new String(); + mNoise = new Static5D(0,0,0,0,0); textAmplitude = (TextView)findViewById(R.id.flagAmplitude); textLength = (TextView)findViewById(R.id.flagLength); textAngleA = (TextView)findViewById(R.id.flagAngleA); textAngleB = (TextView)findViewById(R.id.flagAngleB); - barAmplitude = (SeekBar)findViewById(R.id.flagSeekAmplitude); - barLength = (SeekBar)findViewById(R.id.flagSeekLength); - barAngleA = (SeekBar)findViewById(R.id.flagSeekAngleA); - barAngleB = (SeekBar)findViewById(R.id.flagSeekAngleB); + SeekBar barAmplitude = (SeekBar)findViewById(R.id.flagSeekAmplitude); + SeekBar barLength = (SeekBar)findViewById(R.id.flagSeekLength); + SeekBar barAngleA = (SeekBar)findViewById(R.id.flagSeekAngleA); + SeekBar barAngleB = (SeekBar)findViewById(R.id.flagSeekAngleB); barAmplitude.setOnSeekBarChangeListener(this); barLength.setOnSeekBarChangeListener(this); @@ -76,20 +73,20 @@ public class FlagActivity extends Activity implements SeekBar.OnSeekBarChangeLis textNoiseAngleA = (TextView)findViewById(R.id.flagNoiseAngleA); textNoiseAngleB = (TextView)findViewById(R.id.flagNoiseAngleB); - barNoiseAmplitude = (SeekBar)findViewById(R.id.flagSeekNoiseAmplitude); - barNoiseLength = (SeekBar)findViewById(R.id.flagSeekNoiseLength); - barNoiseAngleA = (SeekBar)findViewById(R.id.flagSeekNoiseAngleA); - barNoiseAngleB = (SeekBar)findViewById(R.id.flagSeekNoiseAngleB); + SeekBar barNoiseAmplitude = (SeekBar)findViewById(R.id.flagSeekNoiseAmplitude); + SeekBar barNoiseLength = (SeekBar)findViewById(R.id.flagSeekNoiseLength); + SeekBar barNoiseAngleA = (SeekBar)findViewById(R.id.flagSeekNoiseAngleA); + SeekBar barNoiseAngleB = (SeekBar)findViewById(R.id.flagSeekNoiseAngleB); barNoiseAmplitude.setOnSeekBarChangeListener(this); barNoiseLength.setOnSeekBarChangeListener(this); barNoiseAngleA.setOnSeekBarChangeListener(this); barNoiseAngleB.setOnSeekBarChangeListener(this); - barNoiseAmplitude.setProgress( (int)noise.getX() ); - barNoiseLength.setProgress ( (int)noise.getY() ); - barNoiseAngleA.setProgress ( (int)noise.getW() ); - barNoiseAngleB.setProgress ( (int)noise.getV() ); + barNoiseAmplitude.setProgress( (int)mNoise.getX() ); + barNoiseLength.setProgress ( (int)mNoise.getY() ); + barNoiseAngleA.setProgress ( (int)mNoise.getW() ); + barNoiseAngleB.setProgress ( (int)mNoise.getV() ); textNoiseAmplitude.setText("Noise 0.00"); textNoiseLength.setText("Noise 0.00"); @@ -150,8 +147,8 @@ public class FlagActivity extends Activity implements SeekBar.OnSeekBarChangeLis case R.id.flagSeekAmplitude : renderer.setAmplitude(progress); textAmplitude.setText("Amplitude "+progress); break; - case R.id.flagSeekNoiseAmplitude: noise.set1((float)progress/100); - renderer.setNoise(noise); + case R.id.flagSeekNoiseAmplitude: mNoise.set1((float)progress/100); + renderer.setNoise(mNoise); convert(progress); textNoiseAmplitude.setText("Noise "+mStr ); break; @@ -159,8 +156,8 @@ public class FlagActivity extends Activity implements SeekBar.OnSeekBarChangeLis renderer.setLength(progress); textLength.setText("Length "+progress); break; - case R.id.flagSeekNoiseLength : noise.set2((float)progress/100); - renderer.setNoise(noise); + case R.id.flagSeekNoiseLength : mNoise.set2((float)progress/100); + renderer.setNoise(mNoise); convert(progress); textNoiseLength.setText("Noise "+mStr ); break; @@ -168,8 +165,8 @@ public class FlagActivity extends Activity implements SeekBar.OnSeekBarChangeLis renderer.setAngleA(progress); textAngleA.setText("Alpha "+progress); break; - case R.id.flagSeekNoiseAngleA : noise.set4((float)progress/100); - renderer.setNoise(noise); + case R.id.flagSeekNoiseAngleA : mNoise.set4((float)progress/100); + renderer.setNoise(mNoise); convert(progress); textNoiseAngleA.setText("Noise "+mStr ); break; @@ -177,8 +174,8 @@ public class FlagActivity extends Activity implements SeekBar.OnSeekBarChangeLis renderer.setAngleB(progress); textAngleB.setText("Beta "+progress); break; - case R.id.flagSeekNoiseAngleB : noise.set5((float)progress/100); - renderer.setNoise(noise); + case R.id.flagSeekNoiseAngleB : mNoise.set5((float)progress/100); + renderer.setNoise(mNoise); convert(progress); textNoiseAngleB.setText("Noise "+mStr ); break; diff --git a/src/main/java/org/distorted/examples/flag/FlagRenderer.java b/src/main/java/org/distorted/examples/flag/FlagRenderer.java index 3a29163..f804267 100644 --- a/src/main/java/org/distorted/examples/flag/FlagRenderer.java +++ b/src/main/java/org/distorted/examples/flag/FlagRenderer.java @@ -55,7 +55,6 @@ class FlagRenderer implements GLSurfaceView.Renderer private Static5D mWaveSta1, mWaveSta2; Static4D mQuat1, mQuat2; - int mScreenMin; ///////////////////////////////////////////////////////////////////////////////////////////////////