commit c0f2788997dd9699628b661001072cdbd8864de5 Author: Leszek Koltunski Date: Wed Jul 22 10:53:00 2020 +0100 We need to pause an Activity in the following way: 1) Activity.onPause() 2) View.onPause() 3) Library.onPause() otherwise sometimes there are artifacts when pausing! diff --git a/src/main/java/org/distorted/examples/aroundtheworld/AroundTheWorldActivity.java b/src/main/java/org/distorted/examples/aroundtheworld/AroundTheWorldActivity.java index 2329db0..8c525d5 100644 --- a/src/main/java/org/distorted/examples/aroundtheworld/AroundTheWorldActivity.java +++ b/src/main/java/org/distorted/examples/aroundtheworld/AroundTheWorldActivity.java @@ -56,10 +56,10 @@ public class AroundTheWorldActivity extends Activity @Override protected void onPause() { + super.onPause(); AroundTheWorldSurfaceView view = findViewById(R.id.aroundTheWorldSurfaceView); view.onPause(); DistortedLibrary.onPause(); - super.onPause(); } /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -68,7 +68,6 @@ public class AroundTheWorldActivity extends Activity protected void onResume() { super.onResume(); - AroundTheWorldSurfaceView view = findViewById(R.id.aroundTheWorldSurfaceView); view.onResume(); } diff --git a/src/main/java/org/distorted/examples/bean/BeanActivity.java b/src/main/java/org/distorted/examples/bean/BeanActivity.java index a79338e..1191b6f 100644 --- a/src/main/java/org/distorted/examples/bean/BeanActivity.java +++ b/src/main/java/org/distorted/examples/bean/BeanActivity.java @@ -45,9 +45,9 @@ public class BeanActivity extends Activity @Override protected void onPause() { - DistortedLibrary.onPause(); - mView.onPause(); super.onPause(); + mView.onPause(); + DistortedLibrary.onPause(); } /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/examples/blur/BlurActivity.java b/src/main/java/org/distorted/examples/blur/BlurActivity.java index 44e8a06..f2b7033 100644 --- a/src/main/java/org/distorted/examples/blur/BlurActivity.java +++ b/src/main/java/org/distorted/examples/blur/BlurActivity.java @@ -53,10 +53,10 @@ public class BlurActivity extends Activity implements OnSeekBarChangeListener @Override protected void onPause() { + super.onPause(); GLSurfaceView view = findViewById(R.id.blurSurfaceView); view.onPause(); DistortedLibrary.onPause(); - super.onPause(); } /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -84,11 +84,10 @@ public class BlurActivity extends Activity implements OnSeekBarChangeListener { BlurSurfaceView view = findViewById(R.id.blurSurfaceView); - switch (bar.getId()) + if (bar.getId() == R.id.blurSeek) { - case R.id.blurSeek: int level = view.getRenderer().setBlur(progress); - textBlur.setText(getString(R.string.blur_placeholder,level)); - break; + int level = view.getRenderer().setBlur(progress); + textBlur.setText(getString(R.string.blur_placeholder,level)); } } diff --git a/src/main/java/org/distorted/examples/catanddog/CatAndDogActivity.java b/src/main/java/org/distorted/examples/catanddog/CatAndDogActivity.java index e0f33a0..3ef08a6 100644 --- a/src/main/java/org/distorted/examples/catanddog/CatAndDogActivity.java +++ b/src/main/java/org/distorted/examples/catanddog/CatAndDogActivity.java @@ -45,9 +45,9 @@ public class CatAndDogActivity extends Activity @Override protected void onPause() { - DistortedLibrary.onPause(); - mView.onPause(); super.onPause(); + mView.onPause(); + DistortedLibrary.onPause(); } /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/examples/check/CheckActivity.java b/src/main/java/org/distorted/examples/check/CheckActivity.java index 09a72c5..637ca02 100644 --- a/src/main/java/org/distorted/examples/check/CheckActivity.java +++ b/src/main/java/org/distorted/examples/check/CheckActivity.java @@ -76,11 +76,10 @@ public class CheckActivity extends Activity @Override protected void onPause() { - GLSurfaceView mView = findViewById(R.id.checkSurfaceView); - if( mView!=null ) mView.onPause(); - - DistortedLibrary.onPause(); super.onPause(); + GLSurfaceView view = findViewById(R.id.checkSurfaceView); + if( view!=null ) view.onPause(); + DistortedLibrary.onPause(); } /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -89,9 +88,8 @@ public class CheckActivity extends Activity protected void onResume() { super.onResume(); - - GLSurfaceView mView = findViewById(R.id.checkSurfaceView); - if( mView!=null ) mView.onResume(); + GLSurfaceView view = findViewById(R.id.checkSurfaceView); + if( view!=null ) view.onResume(); } /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/examples/deferredjob/DeferredJobActivity.java b/src/main/java/org/distorted/examples/deferredjob/DeferredJobActivity.java index 44b4b7b..5f8965a 100644 --- a/src/main/java/org/distorted/examples/deferredjob/DeferredJobActivity.java +++ b/src/main/java/org/distorted/examples/deferredjob/DeferredJobActivity.java @@ -24,7 +24,6 @@ import android.opengl.GLSurfaceView; import android.os.Bundle; import android.view.View; import android.widget.Button; -import android.widget.CheckBox; import org.distorted.examples.R; import org.distorted.library.main.DistortedLibrary; @@ -45,10 +44,10 @@ public class DeferredJobActivity extends Activity @Override protected void onPause() { + super.onPause(); GLSurfaceView view = this.findViewById(R.id.deferredjobSurfaceView); view.onPause(); DistortedLibrary.onPause(); - super.onPause(); } /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/examples/deform/DeformActivity.java b/src/main/java/org/distorted/examples/deform/DeformActivity.java index 68c7b11..2c4b668 100644 --- a/src/main/java/org/distorted/examples/deform/DeformActivity.java +++ b/src/main/java/org/distorted/examples/deform/DeformActivity.java @@ -66,11 +66,10 @@ public class DeformActivity extends Activity implements OnSeekBarChangeListener @Override protected void onPause() { + super.onPause(); DeformSurfaceView view = findViewById(R.id.deformSurfaceView); - - DistortedLibrary.onPause(); view.onPause(); - super.onPause(); + DistortedLibrary.onPause(); } /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -79,7 +78,6 @@ public class DeformActivity extends Activity implements OnSeekBarChangeListener protected void onResume() { super.onResume(); - GLSurfaceView view = findViewById(R.id.deformSurfaceView); view.onResume(); } diff --git a/src/main/java/org/distorted/examples/differentbitmaps/DifferentBitmapsActivity.java b/src/main/java/org/distorted/examples/differentbitmaps/DifferentBitmapsActivity.java index 194e06d..d7f39ef 100644 --- a/src/main/java/org/distorted/examples/differentbitmaps/DifferentBitmapsActivity.java +++ b/src/main/java/org/distorted/examples/differentbitmaps/DifferentBitmapsActivity.java @@ -45,9 +45,9 @@ public class DifferentBitmapsActivity extends Activity @Override protected void onPause() { - DistortedLibrary.onPause(); - mView.onPause(); super.onPause(); + mView.onPause(); + DistortedLibrary.onPause(); } /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/examples/differenteffects/DifferentEffectsActivity.java b/src/main/java/org/distorted/examples/differenteffects/DifferentEffectsActivity.java index 66ca6f5..fab41d4 100644 --- a/src/main/java/org/distorted/examples/differenteffects/DifferentEffectsActivity.java +++ b/src/main/java/org/distorted/examples/differenteffects/DifferentEffectsActivity.java @@ -45,9 +45,9 @@ public class DifferentEffectsActivity extends Activity @Override protected void onPause() { - DistortedLibrary.onPause(); - mView.onPause(); super.onPause(); + mView.onPause(); + DistortedLibrary.onPause(); } /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/examples/dynamic/DynamicActivity.java b/src/main/java/org/distorted/examples/dynamic/DynamicActivity.java index 171140c..4138ae4 100644 --- a/src/main/java/org/distorted/examples/dynamic/DynamicActivity.java +++ b/src/main/java/org/distorted/examples/dynamic/DynamicActivity.java @@ -111,30 +111,31 @@ public class DynamicActivity extends Activity implements OnSeekBarChangeListener /////////////////////////////////////////////////////////////////////////////////////////////////// @Override - protected void onResume() + protected void onPause() { - super.onResume(); - + super.onPause(); + GLSurfaceView v1 = findViewById(R.id.dynamicSurfaceView); - v1.onResume(); + v1.onPause(); DynamicSpeedSurfaceView v2 = findViewById(R.id.dynamicSpeedSurfaceView); - v2.onResume(); + v2.onPause(); + + DistortedLibrary.onPause(); } /////////////////////////////////////////////////////////////////////////////////////////////////// @Override - protected void onPause() + protected void onResume() { + super.onResume(); + GLSurfaceView v1 = findViewById(R.id.dynamicSurfaceView); - v1.onPause(); + v1.onResume(); DynamicSpeedSurfaceView v2 = findViewById(R.id.dynamicSpeedSurfaceView); - v2.onPause(); - - DistortedLibrary.onPause(); - super.onPause(); + v2.onResume(); } - + /////////////////////////////////////////////////////////////////////////////////////////////////// @Override diff --git a/src/main/java/org/distorted/examples/earth/EarthActivity.java b/src/main/java/org/distorted/examples/earth/EarthActivity.java index a4427ef..e8da90a 100644 --- a/src/main/java/org/distorted/examples/earth/EarthActivity.java +++ b/src/main/java/org/distorted/examples/earth/EarthActivity.java @@ -65,14 +65,15 @@ public class EarthActivity extends Activity implements SeekBar.OnSeekBarChangeLi @Override protected void onPause() { - GLSurfaceView view = this.findViewById(R.id.earthSurfaceView); - if( view!=null ) view.onPause(); + super.onPause(); + + GLSurfaceView view = findViewById(R.id.earthSurfaceView); + view.onPause(); - EarthSurfaceViewPicker pick = this.findViewById(R.id.earthSurfaceViewPicker); - if( pick!=null ) pick.onPause(); + EarthSurfaceViewPicker pick = findViewById(R.id.earthSurfaceViewPicker); + pick.onPause(); DistortedLibrary.onPause(); - super.onPause(); } /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -82,11 +83,11 @@ public class EarthActivity extends Activity implements SeekBar.OnSeekBarChangeLi { super.onResume(); - GLSurfaceView view = this.findViewById(R.id.earthSurfaceView); - if( view!=null ) view.onResume(); + GLSurfaceView view = findViewById(R.id.earthSurfaceView); + view.onResume(); - EarthSurfaceViewPicker pick = this.findViewById(R.id.earthSurfaceViewPicker); - if( pick!=null ) pick.onResume(); + EarthSurfaceViewPicker pick = findViewById(R.id.earthSurfaceViewPicker); + pick.onResume(); } /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -105,7 +106,7 @@ public class EarthActivity extends Activity implements SeekBar.OnSeekBarChangeLi { super.onSaveInstanceState(savedInstanceState); - EarthSurfaceViewPicker pick = this.findViewById(R.id.earthSurfaceViewPicker); + EarthSurfaceViewPicker pick = findViewById(R.id.earthSurfaceViewPicker); pick.save(savedInstanceState); } @@ -116,7 +117,7 @@ public class EarthActivity extends Activity implements SeekBar.OnSeekBarChangeLi { super.onRestoreInstanceState(savedInstanceState); - EarthSurfaceViewPicker pick = this.findViewById(R.id.earthSurfaceViewPicker); + EarthSurfaceViewPicker pick = findViewById(R.id.earthSurfaceViewPicker); pick.restore(savedInstanceState); } @@ -124,11 +125,10 @@ public class EarthActivity extends Activity implements SeekBar.OnSeekBarChangeLi public void onProgressChanged(SeekBar bar, int progress, boolean fromUser) { - switch (bar.getId()) + if (bar.getId() == R.id.earthInflateLevel ) { - case R.id.earthInflateLevel: EarthSurfaceView view = this.findViewById(R.id.earthSurfaceView); - view.getRenderer().setLevel(progress); - break; + EarthSurfaceView view = findViewById(R.id.earthSurfaceView); + view.getRenderer().setLevel(progress); } } @@ -136,7 +136,7 @@ public class EarthActivity extends Activity implements SeekBar.OnSeekBarChangeLi public void onItemSelected(AdapterView parent, View view, int pos, long id) { - EarthSurfaceViewPicker mPick = this.findViewById(R.id.earthSurfaceViewPicker); + EarthSurfaceViewPicker mPick = findViewById(R.id.earthSurfaceViewPicker); mPick.setEffectMode(mEffectNames[pos]); } @@ -144,10 +144,10 @@ public class EarthActivity extends Activity implements SeekBar.OnSeekBarChangeLi public void Remove(View v) { - EarthSurfaceViewPicker mPick = this.findViewById(R.id.earthSurfaceViewPicker); + EarthSurfaceViewPicker mPick = findViewById(R.id.earthSurfaceViewPicker); mPick.clearPoints(); - EarthSurfaceView view = this.findViewById(R.id.earthSurfaceView); + EarthSurfaceView view = findViewById(R.id.earthSurfaceView); EarthRenderer renderer = view.getRenderer(); renderer.removeAll(); diff --git a/src/main/java/org/distorted/examples/effectqueue/EffectQueueActivity.java b/src/main/java/org/distorted/examples/effectqueue/EffectQueueActivity.java index 0ec8750..fa8fcc6 100644 --- a/src/main/java/org/distorted/examples/effectqueue/EffectQueueActivity.java +++ b/src/main/java/org/distorted/examples/effectqueue/EffectQueueActivity.java @@ -119,26 +119,24 @@ public class EffectQueueActivity extends Activity implements AdapterView.OnItemS /////////////////////////////////////////////////////////////////////////////////////////////////// @Override - protected void onResume() + protected void onPause() { - super.onResume(); - - GLSurfaceView mView = findViewById(R.id.effects2dSurfaceView); - mView.onResume(); + super.onPause(); + GLSurfaceView view = findViewById(R.id.effects2dSurfaceView); + view.onPause(); + DistortedLibrary.onPause(); } /////////////////////////////////////////////////////////////////////////////////////////////////// @Override - protected void onPause() + protected void onResume() { - GLSurfaceView mView = findViewById(R.id.effects2dSurfaceView); - mView.onPause(); - - DistortedLibrary.onPause(); - super.onPause(); + super.onResume(); + GLSurfaceView view = findViewById(R.id.effects2dSurfaceView); + view.onResume(); } - + /////////////////////////////////////////////////////////////////////////////////////////////////// @Override diff --git a/src/main/java/org/distorted/examples/flag/FlagActivity.java b/src/main/java/org/distorted/examples/flag/FlagActivity.java index aa1e96c..7486607 100644 --- a/src/main/java/org/distorted/examples/flag/FlagActivity.java +++ b/src/main/java/org/distorted/examples/flag/FlagActivity.java @@ -99,11 +99,10 @@ public class FlagActivity extends Activity implements SeekBar.OnSeekBarChangeLis @Override protected void onPause() { - GLSurfaceView mView = findViewById(R.id.flagSurfaceView); - mView.onPause(); - - DistortedLibrary.onPause(); super.onPause(); + GLSurfaceView view = findViewById(R.id.flagSurfaceView); + view.onPause(); + DistortedLibrary.onPause(); } /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -112,9 +111,8 @@ public class FlagActivity extends Activity implements SeekBar.OnSeekBarChangeLis protected void onResume() { super.onResume(); - - GLSurfaceView mView = findViewById(R.id.flagSurfaceView); - mView.onResume(); + GLSurfaceView view = findViewById(R.id.flagSurfaceView); + view.onResume(); } /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/examples/generic/GenericActivity2.java b/src/main/java/org/distorted/examples/generic/GenericActivity2.java index c995727..5e83a93 100644 --- a/src/main/java/org/distorted/examples/generic/GenericActivity2.java +++ b/src/main/java/org/distorted/examples/generic/GenericActivity2.java @@ -35,7 +35,6 @@ import org.distorted.library.main.DistortedLibrary; import org.distorted.library.main.DistortedEffects; import org.distorted.library.main.DistortedTexture; import org.distorted.library.mesh.MeshBase; -import org.distorted.library.type.Static3D; import org.distorted.library.type.Static4D; import java.io.IOException; @@ -116,7 +115,7 @@ public class GenericActivity2 extends AppCompatActivity { is.close(); } - catch(IOException e) { } + catch(IOException ignored) { } } } else @@ -280,11 +279,10 @@ public class GenericActivity2 extends AppCompatActivity @Override protected void onPause() { - GLSurfaceView mView = findViewById(R.id.genericSurfaceView); - if( mView!=null ) mView.onPause(); - - DistortedLibrary.onPause(); super.onPause(); + GLSurfaceView view = findViewById(R.id.genericSurfaceView); + view.onPause(); + DistortedLibrary.onPause(); } /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -293,8 +291,8 @@ public class GenericActivity2 extends AppCompatActivity protected void onResume() { super.onResume(); - GLSurfaceView mView = findViewById(R.id.genericSurfaceView); - if( mView!=null ) mView.onResume(); + GLSurfaceView view = findViewById(R.id.genericSurfaceView); + view.onResume(); } /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/examples/girl/GirlActivity.java b/src/main/java/org/distorted/examples/girl/GirlActivity.java index 4cf70d5..942f607 100644 --- a/src/main/java/org/distorted/examples/girl/GirlActivity.java +++ b/src/main/java/org/distorted/examples/girl/GirlActivity.java @@ -70,11 +70,10 @@ public class GirlActivity extends Activity implements OnSeekBarChangeListener @Override protected void onPause() { + super.onPause(); GLSurfaceView view = findViewById(R.id.girlSurfaceView); view.onPause(); - DistortedLibrary.onPause(); - super.onPause(); } /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -83,7 +82,6 @@ public class GirlActivity extends Activity implements OnSeekBarChangeListener protected void onResume() { super.onResume(); - GLSurfaceView view = findViewById(R.id.girlSurfaceView); view.onResume(); } diff --git a/src/main/java/org/distorted/examples/glow/GlowActivity.java b/src/main/java/org/distorted/examples/glow/GlowActivity.java index 2332f59..3131884 100644 --- a/src/main/java/org/distorted/examples/glow/GlowActivity.java +++ b/src/main/java/org/distorted/examples/glow/GlowActivity.java @@ -45,13 +45,13 @@ public class GlowActivity extends Activity implements SeekBar.OnSeekBarChangeLis super.onCreate(savedState); setContentView(R.layout.glowlayout); - textRadius = (TextView)findViewById(R.id.glowTextRadius); - SeekBar bar = (SeekBar)findViewById(R.id.glowSeekRadius); + textRadius = findViewById(R.id.glowTextRadius); + SeekBar bar = findViewById(R.id.glowSeekRadius); bar.setOnSeekBarChangeListener(this); if( savedState==null ) bar.setProgress(50); - textAlpha = (TextView)findViewById(R.id.glowTextAlpha); - bar = (SeekBar)findViewById(R.id.glowSeekAlpha); + textAlpha = findViewById(R.id.glowTextAlpha); + bar = findViewById(R.id.glowSeekAlpha); bar.setOnSeekBarChangeListener(this); if( savedState==null ) bar.setProgress(50); @@ -63,10 +63,10 @@ public class GlowActivity extends Activity implements SeekBar.OnSeekBarChangeLis @Override protected void onPause() { - GLSurfaceView view = (GLSurfaceView) this.findViewById(R.id.glowSurfaceView); + super.onPause(); + GLSurfaceView view = findViewById(R.id.glowSurfaceView); view.onPause(); DistortedLibrary.onPause(); - super.onPause(); } /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -75,7 +75,7 @@ public class GlowActivity extends Activity implements SeekBar.OnSeekBarChangeLis protected void onResume() { super.onResume(); - GLSurfaceView view = (GLSurfaceView) this.findViewById(R.id.glowSurfaceView); + GLSurfaceView view = findViewById(R.id.glowSurfaceView); view.onResume(); } @@ -121,7 +121,7 @@ public class GlowActivity extends Activity implements SeekBar.OnSeekBarChangeLis public void onProgressChanged(SeekBar bar, int progress, boolean fromUser) { - GlowSurfaceView view = (GlowSurfaceView) this.findViewById(R.id.glowSurfaceView); + GlowSurfaceView view = findViewById(R.id.glowSurfaceView); switch (bar.getId()) { @@ -146,7 +146,7 @@ public class GlowActivity extends Activity implements SeekBar.OnSeekBarChangeLis public void quality0(View v) { - GlowSurfaceView view = (GlowSurfaceView) this.findViewById(R.id.glowSurfaceView); + GlowSurfaceView view = findViewById(R.id.glowSurfaceView); GlowRenderer renderer = view.getRenderer(); renderer.setQuality(EffectQuality.HIGHEST); mQuality = EffectQuality.HIGHEST.ordinal(); @@ -156,7 +156,7 @@ public class GlowActivity extends Activity implements SeekBar.OnSeekBarChangeLis public void quality1(View v) { - GlowSurfaceView view = (GlowSurfaceView) this.findViewById(R.id.glowSurfaceView); + GlowSurfaceView view = findViewById(R.id.glowSurfaceView); GlowRenderer renderer = view.getRenderer(); renderer.setQuality(EffectQuality.HIGH); mQuality = EffectQuality.HIGH.ordinal(); @@ -166,7 +166,7 @@ public class GlowActivity extends Activity implements SeekBar.OnSeekBarChangeLis public void quality2(View v) { - GlowSurfaceView view = (GlowSurfaceView) this.findViewById(R.id.glowSurfaceView); + GlowSurfaceView view = findViewById(R.id.glowSurfaceView); GlowRenderer renderer = view.getRenderer(); renderer.setQuality(EffectQuality.MEDIUM); mQuality = EffectQuality.MEDIUM.ordinal(); @@ -176,7 +176,7 @@ public class GlowActivity extends Activity implements SeekBar.OnSeekBarChangeLis public void quality3(View v) { - GlowSurfaceView view = (GlowSurfaceView) this.findViewById(R.id.glowSurfaceView); + GlowSurfaceView view = findViewById(R.id.glowSurfaceView); GlowRenderer renderer = view.getRenderer(); renderer.setQuality(EffectQuality.LOW); mQuality = EffectQuality.LOW.ordinal(); diff --git a/src/main/java/org/distorted/examples/inflate/InflateActivity2.java b/src/main/java/org/distorted/examples/inflate/InflateActivity2.java index eba3f0e..4e346df 100644 --- a/src/main/java/org/distorted/examples/inflate/InflateActivity2.java +++ b/src/main/java/org/distorted/examples/inflate/InflateActivity2.java @@ -56,11 +56,10 @@ public class InflateActivity2 extends Activity implements SeekBar.OnSeekBarChang @Override protected void onPause() { - GLSurfaceView mView = this.findViewById(R.id.inflateSurfaceView); - if( mView!=null ) mView.onPause(); - - DistortedLibrary.onPause(); super.onPause(); + GLSurfaceView view = findViewById(R.id.inflateSurfaceView); + view.onPause(); + DistortedLibrary.onPause(); } /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -69,9 +68,8 @@ public class InflateActivity2 extends Activity implements SeekBar.OnSeekBarChang protected void onResume() { super.onResume(); - - GLSurfaceView mView = this.findViewById(R.id.inflateSurfaceView); - if( mView!=null ) mView.onResume(); + GLSurfaceView view = findViewById(R.id.inflateSurfaceView); + view.onResume(); } /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/examples/listener/ListenerActivity.java b/src/main/java/org/distorted/examples/listener/ListenerActivity.java index 322de67..f0f1419 100644 --- a/src/main/java/org/distorted/examples/listener/ListenerActivity.java +++ b/src/main/java/org/distorted/examples/listener/ListenerActivity.java @@ -45,9 +45,9 @@ public class ListenerActivity extends Activity @Override protected void onPause() { + super.onPause(); mView.onPause(); DistortedLibrary.onPause(); - super.onPause(); } /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/examples/meshfile/MeshFileActivity.java b/src/main/java/org/distorted/examples/meshfile/MeshFileActivity.java index 92dfc9f..2063ce6 100644 --- a/src/main/java/org/distorted/examples/meshfile/MeshFileActivity.java +++ b/src/main/java/org/distorted/examples/meshfile/MeshFileActivity.java @@ -69,10 +69,10 @@ public class MeshFileActivity extends Activity implements AdapterView.OnItemSele @Override protected void onPause() { - GLSurfaceView view = this.findViewById(R.id.meshfileSurfaceView); + super.onPause(); + GLSurfaceView view = findViewById(R.id.meshfileSurfaceView); view.onPause(); DistortedLibrary.onPause(); - super.onPause(); } /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -81,7 +81,7 @@ public class MeshFileActivity extends Activity implements AdapterView.OnItemSele protected void onResume() { super.onResume(); - GLSurfaceView view = this.findViewById(R.id.meshfileSurfaceView); + GLSurfaceView view = findViewById(R.id.meshfileSurfaceView); view.onResume(); if( mResource!=0 ) Open(null); diff --git a/src/main/java/org/distorted/examples/meshjoin/MeshJoinActivity.java b/src/main/java/org/distorted/examples/meshjoin/MeshJoinActivity.java index 1ecf7a2..2446417 100644 --- a/src/main/java/org/distorted/examples/meshjoin/MeshJoinActivity.java +++ b/src/main/java/org/distorted/examples/meshjoin/MeshJoinActivity.java @@ -44,10 +44,10 @@ public class MeshJoinActivity extends Activity @Override protected void onPause() { - GLSurfaceView view = this.findViewById(R.id.meshjoinSurfaceView); + super.onPause(); + GLSurfaceView view = findViewById(R.id.meshjoinSurfaceView); view.onPause(); DistortedLibrary.onPause(); - super.onPause(); } /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -56,7 +56,7 @@ public class MeshJoinActivity extends Activity protected void onResume() { super.onResume(); - GLSurfaceView view = this.findViewById(R.id.meshjoinSurfaceView); + GLSurfaceView view = findViewById(R.id.meshjoinSurfaceView); view.onResume(); } diff --git a/src/main/java/org/distorted/examples/mirror/MirrorActivity.java b/src/main/java/org/distorted/examples/mirror/MirrorActivity.java index fa95cd3..8419b2b 100644 --- a/src/main/java/org/distorted/examples/mirror/MirrorActivity.java +++ b/src/main/java/org/distorted/examples/mirror/MirrorActivity.java @@ -52,11 +52,10 @@ public class MirrorActivity extends Activity implements OnSeekBarChangeListener @Override protected void onPause() { + super.onPause(); GLSurfaceView view = findViewById(R.id.mirrorSurfaceView); view.onPause(); - DistortedLibrary.onPause(); - super.onPause(); } /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -83,11 +82,10 @@ public class MirrorActivity extends Activity implements OnSeekBarChangeListener public void onProgressChanged(SeekBar bar, int progress, boolean fromUser) { - switch (bar.getId()) + if (bar.getId() == R.id.mirrorSeek ) { - case R.id.mirrorSeek: MirrorSurfaceView view = findViewById(R.id.mirrorSurfaceView); - view.getRenderer().setPosition(progress); - break; + MirrorSurfaceView view = findViewById(R.id.mirrorSurfaceView); + view.getRenderer().setPosition(progress); } } diff --git a/src/main/java/org/distorted/examples/monalisa/MonaLisaActivity.java b/src/main/java/org/distorted/examples/monalisa/MonaLisaActivity.java index 74b4de0..977927c 100644 --- a/src/main/java/org/distorted/examples/monalisa/MonaLisaActivity.java +++ b/src/main/java/org/distorted/examples/monalisa/MonaLisaActivity.java @@ -45,9 +45,9 @@ public class MonaLisaActivity extends Activity @Override protected void onPause() { + super.onPause(); mView.onPause(); DistortedLibrary.onPause(); - super.onPause(); } /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/examples/movingeffects/MovingEffectsActivity.java b/src/main/java/org/distorted/examples/movingeffects/MovingEffectsActivity.java index c1ebc16..83218e9 100644 --- a/src/main/java/org/distorted/examples/movingeffects/MovingEffectsActivity.java +++ b/src/main/java/org/distorted/examples/movingeffects/MovingEffectsActivity.java @@ -70,28 +70,26 @@ public class MovingEffectsActivity extends Activity /////////////////////////////////////////////////////////////////// @Override - protected void onResume() + protected void onPause() { - super.onResume(); - + Abort(null); + + super.onPause(); GLSurfaceView view = findViewById(R.id.movingeffectsSurfaceView); - view.onResume(); + view.onPause(); + DistortedLibrary.onPause(); } /////////////////////////////////////////////////////////////////// @Override - protected void onPause() + protected void onResume() { - Abort(null); - + super.onResume(); GLSurfaceView view = findViewById(R.id.movingeffectsSurfaceView); - view.onPause(); - - DistortedLibrary.onPause(); - super.onPause(); + view.onResume(); } - + /////////////////////////////////////////////////////////////////// @Override diff --git a/src/main/java/org/distorted/examples/movingglow/MovingGlowActivity.java b/src/main/java/org/distorted/examples/movingglow/MovingGlowActivity.java index 6442420..200ddd7 100644 --- a/src/main/java/org/distorted/examples/movingglow/MovingGlowActivity.java +++ b/src/main/java/org/distorted/examples/movingglow/MovingGlowActivity.java @@ -44,9 +44,9 @@ public class MovingGlowActivity extends Activity @Override protected void onPause() { + super.onPause(); mView.onPause(); DistortedLibrary.onPause(); - super.onPause(); } /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/examples/multiblur/MultiblurActivity.java b/src/main/java/org/distorted/examples/multiblur/MultiblurActivity.java index b49a3b2..a0392b1 100644 --- a/src/main/java/org/distorted/examples/multiblur/MultiblurActivity.java +++ b/src/main/java/org/distorted/examples/multiblur/MultiblurActivity.java @@ -116,10 +116,10 @@ public class MultiblurActivity extends Activity implements SeekBar.OnSeekBarChan @Override protected void onPause() { - GLSurfaceView view = this.findViewById(R.id.multiblurSurfaceView); + super.onPause(); + GLSurfaceView view = findViewById(R.id.multiblurSurfaceView); view.onPause(); DistortedLibrary.onPause(); - super.onPause(); } /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/examples/objecttree/ObjectTreeActivity.java b/src/main/java/org/distorted/examples/objecttree/ObjectTreeActivity.java index 50e9c6c..63e3ad0 100644 --- a/src/main/java/org/distorted/examples/objecttree/ObjectTreeActivity.java +++ b/src/main/java/org/distorted/examples/objecttree/ObjectTreeActivity.java @@ -51,11 +51,10 @@ public class ObjectTreeActivity extends Activity @Override protected void onPause() { + super.onPause(); ObjectTreeSurfaceView view = findViewById(R.id.objecttreeSurfaceView); - view.onPause(); DistortedLibrary.onPause(); - super.onPause(); } /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -63,9 +62,8 @@ public class ObjectTreeActivity extends Activity @Override protected void onResume() { - ObjectTreeSurfaceView view = findViewById(R.id.objecttreeSurfaceView); - super.onResume(); + ObjectTreeSurfaceView view = findViewById(R.id.objecttreeSurfaceView); view.onResume(); } diff --git a/src/main/java/org/distorted/examples/olimpic/OlimpicActivity.java b/src/main/java/org/distorted/examples/olimpic/OlimpicActivity.java index e96ce17..7767f5a 100644 --- a/src/main/java/org/distorted/examples/olimpic/OlimpicActivity.java +++ b/src/main/java/org/distorted/examples/olimpic/OlimpicActivity.java @@ -141,10 +141,10 @@ public class OlimpicActivity extends Activity @Override protected void onPause() { + super.onPause(); GLSurfaceView view = findViewById(R.id.olimpicSurfaceView); view.onPause(); DistortedLibrary.onPause(); - super.onPause(); } /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/examples/postprocesstree/PostprocessTreeActivity.java b/src/main/java/org/distorted/examples/postprocesstree/PostprocessTreeActivity.java index 11794ae..e947c21 100644 --- a/src/main/java/org/distorted/examples/postprocesstree/PostprocessTreeActivity.java +++ b/src/main/java/org/distorted/examples/postprocesstree/PostprocessTreeActivity.java @@ -52,10 +52,10 @@ public class PostprocessTreeActivity extends Activity implements SeekBar.OnSeekB @Override protected void onPause() { + super.onPause(); GLSurfaceView view = findViewById(R.id.postprocesstreeSurfaceView); view.onPause(); DistortedLibrary.onPause(); - super.onPause(); } /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -83,11 +83,10 @@ public class PostprocessTreeActivity extends Activity implements SeekBar.OnSeekB { PostprocessTreeSurfaceView view = findViewById(R.id.postprocesstreeSurfaceView); - switch (bar.getId()) + if (bar.getId() == R.id.postprocesstreeSeek) { - case R.id.postprocesstreeSeek: int level = view.getRenderer().setBlur(progress); - mText.setText(getString(R.string.blur_placeholder,level)); - break; + int level = view.getRenderer().setBlur(progress); + mText.setText(getString(R.string.blur_placeholder,level)); } } diff --git a/src/main/java/org/distorted/examples/predeform/PredeformActivity2.java b/src/main/java/org/distorted/examples/predeform/PredeformActivity2.java index 9809e56..f8a288d 100644 --- a/src/main/java/org/distorted/examples/predeform/PredeformActivity2.java +++ b/src/main/java/org/distorted/examples/predeform/PredeformActivity2.java @@ -54,11 +54,10 @@ public class PredeformActivity2 extends Activity implements SeekBar.OnSeekBarCha @Override protected void onPause() { - GLSurfaceView mView = findViewById(R.id.predeformSurfaceView); - if( mView!=null ) mView.onPause(); - - DistortedLibrary.onPause(); super.onPause(); + GLSurfaceView view = findViewById(R.id.predeformSurfaceView); + view.onPause(); + DistortedLibrary.onPause(); } /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -67,9 +66,8 @@ public class PredeformActivity2 extends Activity implements SeekBar.OnSeekBarCha protected void onResume() { super.onResume(); - - GLSurfaceView mView = findViewById(R.id.predeformSurfaceView); - if( mView!=null ) mView.onResume(); + GLSurfaceView view = findViewById(R.id.predeformSurfaceView); + view.onResume(); } /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/examples/projection/ProjectionActivity.java b/src/main/java/org/distorted/examples/projection/ProjectionActivity.java index b7f9180..34ef6ae 100644 --- a/src/main/java/org/distorted/examples/projection/ProjectionActivity.java +++ b/src/main/java/org/distorted/examples/projection/ProjectionActivity.java @@ -69,11 +69,10 @@ public class ProjectionActivity extends Activity implements OnSeekBarChangeListe @Override protected void onPause() { - GLSurfaceView mView = findViewById(R.id.surfaceViewProjection); - mView.onPause(); - - DistortedLibrary.onPause(); super.onPause(); + GLSurfaceView view = findViewById(R.id.surfaceViewProjection); + view.onPause(); + DistortedLibrary.onPause(); } /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -82,9 +81,8 @@ public class ProjectionActivity extends Activity implements OnSeekBarChangeListe protected void onResume() { super.onResume(); - - GLSurfaceView mView = findViewById(R.id.surfaceViewProjection); - mView.onResume(); + GLSurfaceView view = findViewById(R.id.surfaceViewProjection); + view.onResume(); } /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/examples/quaternion/QuaternionActivity.java b/src/main/java/org/distorted/examples/quaternion/QuaternionActivity.java index 782edf5..fe3938a 100644 --- a/src/main/java/org/distorted/examples/quaternion/QuaternionActivity.java +++ b/src/main/java/org/distorted/examples/quaternion/QuaternionActivity.java @@ -45,9 +45,9 @@ public class QuaternionActivity extends Activity @Override protected void onPause() { + super.onPause(); mView.onPause(); DistortedLibrary.onPause(); - super.onPause(); } /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/examples/rubik/RubikActivity.java b/src/main/java/org/distorted/examples/rubik/RubikActivity.java index 9ae6fee..97acd15 100644 --- a/src/main/java/org/distorted/examples/rubik/RubikActivity.java +++ b/src/main/java/org/distorted/examples/rubik/RubikActivity.java @@ -51,10 +51,10 @@ public class RubikActivity extends Activity @Override protected void onPause() { + super.onPause(); GLSurfaceView view = findViewById(R.id.rubikSurfaceView); view.onPause(); DistortedLibrary.onPause(); - super.onPause(); } /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/examples/save/SaveActivity.java b/src/main/java/org/distorted/examples/save/SaveActivity.java index af77626..8a82c80 100644 --- a/src/main/java/org/distorted/examples/save/SaveActivity.java +++ b/src/main/java/org/distorted/examples/save/SaveActivity.java @@ -79,11 +79,10 @@ public class SaveActivity extends Activity implements SeekBar.OnSeekBarChangeLis @Override protected void onPause() { + super.onPause(); GLSurfaceView view = findViewById(R.id.saveSurfaceView); view.onPause(); - DistortedLibrary.onPause(); - super.onPause(); } /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -92,7 +91,6 @@ public class SaveActivity extends Activity implements SeekBar.OnSeekBarChangeLis protected void onResume() { super.onResume(); - GLSurfaceView view = findViewById(R.id.saveSurfaceView); view.onResume(); diff --git a/src/main/java/org/distorted/examples/singlemesh/SingleMeshActivity.java b/src/main/java/org/distorted/examples/singlemesh/SingleMeshActivity.java index 1c17055..e07f5e2 100644 --- a/src/main/java/org/distorted/examples/singlemesh/SingleMeshActivity.java +++ b/src/main/java/org/distorted/examples/singlemesh/SingleMeshActivity.java @@ -44,10 +44,10 @@ public class SingleMeshActivity extends Activity @Override protected void onPause() { - GLSurfaceView view = this.findViewById(R.id.singlemeshSurfaceView); + super.onPause(); + GLSurfaceView view = findViewById(R.id.singlemeshSurfaceView); view.onPause(); DistortedLibrary.onPause(); - super.onPause(); } /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -56,7 +56,7 @@ public class SingleMeshActivity extends Activity protected void onResume() { super.onResume(); - GLSurfaceView view = this.findViewById(R.id.singlemeshSurfaceView); + GLSurfaceView view = findViewById(R.id.singlemeshSurfaceView); view.onResume(); } diff --git a/src/main/java/org/distorted/examples/sink/SinkActivity.java b/src/main/java/org/distorted/examples/sink/SinkActivity.java index 2328667..30816a8 100644 --- a/src/main/java/org/distorted/examples/sink/SinkActivity.java +++ b/src/main/java/org/distorted/examples/sink/SinkActivity.java @@ -45,9 +45,9 @@ public class SinkActivity extends Activity @Override protected void onPause() { + super.onPause(); mView.onPause(); DistortedLibrary.onPause(); - super.onPause(); } /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/examples/starwars/StarWarsActivity.java b/src/main/java/org/distorted/examples/starwars/StarWarsActivity.java index cd5af2c..630b0c0 100644 --- a/src/main/java/org/distorted/examples/starwars/StarWarsActivity.java +++ b/src/main/java/org/distorted/examples/starwars/StarWarsActivity.java @@ -45,10 +45,10 @@ public class StarWarsActivity extends Activity @Override protected void onPause() { + super.onPause(); mView.onPause(); mView.getRenderer().onPause(); DistortedLibrary.onPause(); - super.onPause(); } /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/examples/stencil/StencilActivity.java b/src/main/java/org/distorted/examples/stencil/StencilActivity.java index c985887..256fe10 100644 --- a/src/main/java/org/distorted/examples/stencil/StencilActivity.java +++ b/src/main/java/org/distorted/examples/stencil/StencilActivity.java @@ -51,11 +51,10 @@ public class StencilActivity extends Activity @Override protected void onPause() { + super.onPause(); StencilSurfaceView view = findViewById(R.id.stencilSurfaceView); - view.onPause(); DistortedLibrary.onPause(); - super.onPause(); } /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -63,9 +62,8 @@ public class StencilActivity extends Activity @Override protected void onResume() { - StencilSurfaceView view = findViewById(R.id.stencilSurfaceView); - super.onResume(); + StencilSurfaceView view = findViewById(R.id.stencilSurfaceView); view.onResume(); } diff --git a/src/main/java/org/distorted/examples/surfaceview/SurfaceViewActivity.java b/src/main/java/org/distorted/examples/surfaceview/SurfaceViewActivity.java index 76a8f47..0df3d0a 100644 --- a/src/main/java/org/distorted/examples/surfaceview/SurfaceViewActivity.java +++ b/src/main/java/org/distorted/examples/surfaceview/SurfaceViewActivity.java @@ -45,9 +45,9 @@ public class SurfaceViewActivity extends Activity @Override protected void onPause() { + super.onPause(); mView.onPause(); DistortedLibrary.onPause(); - super.onPause(); } /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/examples/transparency/TransparencyActivity.java b/src/main/java/org/distorted/examples/transparency/TransparencyActivity.java index b8f889b..569a6d2 100644 --- a/src/main/java/org/distorted/examples/transparency/TransparencyActivity.java +++ b/src/main/java/org/distorted/examples/transparency/TransparencyActivity.java @@ -102,10 +102,10 @@ public class TransparencyActivity extends Activity implements SeekBar.OnSeekBarC @Override protected void onPause() { + super.onPause(); GLSurfaceView view = findViewById(R.id.transparencySurfaceView); view.onPause(); DistortedLibrary.onPause(); - super.onPause(); } /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/examples/triblur/TriblurActivity.java b/src/main/java/org/distorted/examples/triblur/TriblurActivity.java index 75180ec..c6013cb 100644 --- a/src/main/java/org/distorted/examples/triblur/TriblurActivity.java +++ b/src/main/java/org/distorted/examples/triblur/TriblurActivity.java @@ -123,10 +123,10 @@ public class TriblurActivity extends Activity implements SeekBar.OnSeekBarChange @Override protected void onPause() { + super.onPause(); GLSurfaceView view = findViewById(R.id.triblurSurfaceView); view.onPause(); DistortedLibrary.onPause(); - super.onPause(); } /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/examples/wind/WindActivity.java b/src/main/java/org/distorted/examples/wind/WindActivity.java index 8d0c612..6217d0d 100644 --- a/src/main/java/org/distorted/examples/wind/WindActivity.java +++ b/src/main/java/org/distorted/examples/wind/WindActivity.java @@ -20,7 +20,6 @@ package org.distorted.examples.wind; import android.app.Activity; -import android.opengl.GLSurfaceView; import android.os.Bundle; import android.widget.SeekBar; import android.widget.SeekBar.OnSeekBarChangeListener; @@ -56,11 +55,11 @@ public class WindActivity extends Activity implements OnSeekBarChangeListener @Override protected void onPause() { + super.onPause(); WindSurfaceView view = findViewById(R.id.windSurfaceView); view.onPause(); view.getRenderer().pauseWind(); DistortedLibrary.onPause(); - super.onPause(); } /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -87,12 +86,11 @@ public class WindActivity extends Activity implements OnSeekBarChangeListener public void onProgressChanged(SeekBar bar, int progress, boolean fromUser) { - switch (bar.getId()) + if (bar.getId() == R.id.windSeek) { - case R.id.windSeek:WindSurfaceView view = findViewById(R.id.windSurfaceView); - view.getRenderer().setWind(progress); - windText.setText(getString(R.string.wind_placeholder,progress)); - break; + WindSurfaceView view = findViewById(R.id.windSurfaceView); + view.getRenderer().setWind(progress); + windText.setText(getString(R.string.wind_placeholder,progress)); } }