commit 6979a0e0f116553c04e614690873d8919c57fc18 Author: Leszek Koltunski Date: Sun Jan 10 01:05:45 2021 +0100 Remove all the calls to DistortedLibrary.setMax() (except for app 'Check', which explictly checks this API) diff --git a/src/main/java/org/distorted/examples/aroundtheworld/AroundTheWorldRenderer.java b/src/main/java/org/distorted/examples/aroundtheworld/AroundTheWorldRenderer.java index 6e37cef..0f3d760 100644 --- a/src/main/java/org/distorted/examples/aroundtheworld/AroundTheWorldRenderer.java +++ b/src/main/java/org/distorted/examples/aroundtheworld/AroundTheWorldRenderer.java @@ -135,9 +135,6 @@ class AroundTheWorldRenderer implements GLSurfaceView.Renderer, DistortedLibrary mScreen.detachAll(); mScreen.attach(mTexture, mEffects, mMesh); - DistortedLibrary.setMax(EffectType.VERTEX ,13); - DistortedLibrary.setMax(EffectType.FRAGMENT, 9); - VertexEffectScale.enable(); VertexEffectDistort.enable(); VertexEffectSink.enable(); diff --git a/src/main/java/org/distorted/examples/deferredjob/DeferredJobRenderer.java b/src/main/java/org/distorted/examples/deferredjob/DeferredJobRenderer.java index c3dea5b..2dee40f 100644 --- a/src/main/java/org/distorted/examples/deferredjob/DeferredJobRenderer.java +++ b/src/main/java/org/distorted/examples/deferredjob/DeferredJobRenderer.java @@ -132,7 +132,6 @@ class DeferredJobRenderer implements GLSurfaceView.Renderer, DistortedLibrary.Ex mScreen.detachAll(); mScreen.attach(mTexture,mEffects,mMesh); - DistortedLibrary.setMax(EffectType.VERTEX, 11); VertexEffectRotate.enable(); DistortedLibrary.onSurfaceCreated(mView.getContext(),this); diff --git a/src/main/java/org/distorted/examples/earth/EarthRenderer.java b/src/main/java/org/distorted/examples/earth/EarthRenderer.java index 6853461..a41a3ef 100644 --- a/src/main/java/org/distorted/examples/earth/EarthRenderer.java +++ b/src/main/java/org/distorted/examples/earth/EarthRenderer.java @@ -69,7 +69,6 @@ class EarthRenderer implements GLSurfaceView.Renderer, DistortedLibrary.Exceptio private static final int LEVEL = 40; private static final float FOV = 30.0f; private static final float NEAR = 0.1f; - private static final int MAX_EFF = 20; private static final float SCALE = 1.10f; private GLSurfaceView mView; @@ -267,7 +266,7 @@ class EarthRenderer implements GLSurfaceView.Renderer, DistortedLibrary.Exceptio { is.close(); } - catch(IOException e) { } + catch(IOException ignored) { } } mTexture.setTexture(bitmap); @@ -278,9 +277,6 @@ class EarthRenderer implements GLSurfaceView.Renderer, DistortedLibrary.Exceptio Effect.enableEffects(EffectType.FRAGMENT); Effect.enableEffects(EffectType.VERTEX); - DistortedLibrary.setMax(EffectType.VERTEX , MAX_EFF); - DistortedLibrary.setMax(EffectType.FRAGMENT, MAX_EFF); - DistortedLibrary.onSurfaceCreated(mView.getContext(), this); } diff --git a/src/main/java/org/distorted/examples/generic/GenericRenderer.java b/src/main/java/org/distorted/examples/generic/GenericRenderer.java index 85efe1b..03db63f 100644 --- a/src/main/java/org/distorted/examples/generic/GenericRenderer.java +++ b/src/main/java/org/distorted/examples/generic/GenericRenderer.java @@ -315,9 +315,6 @@ class GenericRenderer implements GLSurfaceView.Renderer, DistortedLibrary.Except mCenterTexture.setTexture(bitmapC); mRegionTexture.setTexture(bitmapR); - DistortedLibrary.setMax(EffectType.VERTEX ,10); - DistortedLibrary.setMax(EffectType.FRAGMENT,10); - Effect.enableEffects(EffectType.VERTEX); Effect.enableEffects(EffectType.FRAGMENT); Effect.enableEffects(EffectType.POSTPROCESS); diff --git a/src/main/java/org/distorted/examples/girl/GirlRenderer.java b/src/main/java/org/distorted/examples/girl/GirlRenderer.java index 6285ebc..f733a56 100644 --- a/src/main/java/org/distorted/examples/girl/GirlRenderer.java +++ b/src/main/java/org/distorted/examples/girl/GirlRenderer.java @@ -205,8 +205,6 @@ class GirlRenderer implements GLSurfaceView.Renderer, DistortedLibrary.Exception mScreen.detachAll(); mScreen.attach(mTexture,mEffects,mMesh); - DistortedLibrary.setMax(EffectType.VERTEX ,6); - VertexEffectScale.enable(); VertexEffectDistort.enable(); VertexEffectSink.enable(); diff --git a/src/main/java/org/distorted/examples/listener/ListenerRenderer.java b/src/main/java/org/distorted/examples/listener/ListenerRenderer.java index 31e3eed..134c7c6 100644 --- a/src/main/java/org/distorted/examples/listener/ListenerRenderer.java +++ b/src/main/java/org/distorted/examples/listener/ListenerRenderer.java @@ -28,7 +28,6 @@ import javax.microedition.khronos.opengles.GL10; import org.distorted.examples.R; -import org.distorted.library.effect.EffectType; import org.distorted.library.effect.MatrixEffectScale; import org.distorted.library.effect.VertexEffectDistort; import org.distorted.library.main.DistortedLibrary; @@ -46,7 +45,7 @@ import android.graphics.BitmapFactory; import android.opengl.GLSurfaceView; /////////////////////////////////////////////////////////////////////////////////////////////////// -// Show how to use the setMax, notifyWhenFinished / effectFinished APIs +// Show how to use the notifyWhenFinished / effectFinished APIs class ListenerRenderer implements GLSurfaceView.Renderer, EffectListener, DistortedLibrary.ExceptionListener { @@ -162,7 +161,7 @@ class ListenerRenderer implements GLSurfaceView.Renderer, EffectListener, Distor { is.close(); } - catch(IOException e) { } + catch(IOException ignored) { } } mBmpRatio = (float)bitmap.getHeight()/bitmap.getWidth(); @@ -173,14 +172,6 @@ class ListenerRenderer implements GLSurfaceView.Renderer, EffectListener, Distor mScreen.detachAll(); mScreen.attach(mTexture,mEffects,mMesh); - // Normally we can only hold no more than 5 (see EffectType.reset()) Vertex - // effects at any given time. Here we want 12, so we need to increase the default. - // We need to call this before we call onCreate; best done here. - // After onCreate we can also call this but only to decrease this value! - // - // One more than we have bubbles at any given time because it can sometimes - // happen that the old bubble is not yet removed when we add a new one. - DistortedLibrary.setMax(EffectType.VERTEX,NUM_CONCURRENT_BUBBLES+1); VertexEffectDistort.enable(); DistortedLibrary.onSurfaceCreated(mView.getContext(), this); diff --git a/src/main/java/org/distorted/examples/meshfile/MeshFileRenderer.java b/src/main/java/org/distorted/examples/meshfile/MeshFileRenderer.java index 76ef874..6d0d8e1 100644 --- a/src/main/java/org/distorted/examples/meshfile/MeshFileRenderer.java +++ b/src/main/java/org/distorted/examples/meshfile/MeshFileRenderer.java @@ -131,12 +131,9 @@ class MeshFileRenderer implements GLSurfaceView.Renderer, DistortedLibrary.Excep if( mTexture==null ) mTexture = new DistortedTexture(); VertexEffectDisappear.enable(); - VertexEffectRotate.enable(); VertexEffectDeform.enable(); - DistortedLibrary.setMax(EffectType.VERTEX, 16); - DistortedLibrary.onSurfaceCreated(mView.getContext(), this); } diff --git a/src/main/java/org/distorted/examples/meshjoin/MeshJoinRenderer.java b/src/main/java/org/distorted/examples/meshjoin/MeshJoinRenderer.java index 0ffbb9b..ea15749 100644 --- a/src/main/java/org/distorted/examples/meshjoin/MeshJoinRenderer.java +++ b/src/main/java/org/distorted/examples/meshjoin/MeshJoinRenderer.java @@ -129,7 +129,6 @@ class MeshJoinRenderer implements GLSurfaceView.Renderer, DistortedLibrary.Excep mScreen.detachAll(); mScreen.attach(mTexture,mEffects,mMesh); - DistortedLibrary.setMax(EffectType.VERTEX, 11); VertexEffectSink.enable(); DistortedLibrary.onSurfaceCreated(mView.getContext(), this); diff --git a/src/main/java/org/distorted/examples/singlemesh/SingleMeshRenderer.java b/src/main/java/org/distorted/examples/singlemesh/SingleMeshRenderer.java index 8861278..2a5fe0d 100644 --- a/src/main/java/org/distorted/examples/singlemesh/SingleMeshRenderer.java +++ b/src/main/java/org/distorted/examples/singlemesh/SingleMeshRenderer.java @@ -182,7 +182,6 @@ class SingleMeshRenderer implements GLSurfaceView.Renderer, DistortedLibrary.Exc mScreen.detachAll(); mScreen.attach(mTexture,mEffects,mMesh); - DistortedLibrary.setMax(EffectType.VERTEX, 15); VertexEffectRotate.enable(); DistortedLibrary.onSurfaceCreated(mView.getContext(), this);