commit 95593730e8454a8687f302c1673f736292ca0a15 Author: Leszek Koltunski Date: Fri Jun 10 02:03:13 2016 +0100 Introduce ENUM EffectTypes diff --git a/src/main/java/org/distorted/examples/bean/BeanRenderer.java b/src/main/java/org/distorted/examples/bean/BeanRenderer.java index 3864d0a..2d2219c 100644 --- a/src/main/java/org/distorted/examples/bean/BeanRenderer.java +++ b/src/main/java/org/distorted/examples/bean/BeanRenderer.java @@ -9,6 +9,7 @@ import javax.microedition.khronos.opengles.GL10; import org.distorted.examples.R; +import org.distorted.library.EffectTypes; import org.distorted.library.Interpolator2D; import org.distorted.library.Distorted; import org.distorted.library.DistortedBitmap; @@ -83,7 +84,7 @@ class BeanRenderer implements GLSurfaceView.Renderer public void onSurfaceChanged(GL10 glUnused, int width, int height) { - mBean.abortAllEffects(Distorted.TYPE_PRE); + mBean.abortAllEffects(EffectTypes.MATRIX.type); if( bmpHeight/bmpWidth > height/width ) { diff --git a/src/main/java/org/distorted/examples/check/CheckRenderer.java b/src/main/java/org/distorted/examples/check/CheckRenderer.java index 678ac6d..ed76289 100644 --- a/src/main/java/org/distorted/examples/check/CheckRenderer.java +++ b/src/main/java/org/distorted/examples/check/CheckRenderer.java @@ -11,6 +11,7 @@ import org.distorted.examples.R; import org.distorted.library.Distorted; import org.distorted.library.DistortedBitmap; +import org.distorted.library.EffectTypes; import org.distorted.library.Float2D; import org.distorted.library.Float3D; @@ -60,7 +61,7 @@ class CheckRenderer implements GLSurfaceView.Renderer public void onSurfaceChanged(GL10 glUnused, int width, int height) { - mSuccess.abortAllEffects(Distorted.TYPE_PRE); + mSuccess.abortAllEffects(EffectTypes.MATRIX.type); if( bmpHeight/bmpWidth > height/width ) { diff --git a/src/main/java/org/distorted/examples/cubes/CubesRenderer.java b/src/main/java/org/distorted/examples/cubes/CubesRenderer.java index 0837243..40609ab 100644 --- a/src/main/java/org/distorted/examples/cubes/CubesRenderer.java +++ b/src/main/java/org/distorted/examples/cubes/CubesRenderer.java @@ -9,6 +9,7 @@ import javax.microedition.khronos.opengles.GL10; import org.distorted.examples.R; +import org.distorted.library.EffectTypes; import org.distorted.library.InterpolatorQuat; import org.distorted.library.DistortedCubes; import org.distorted.library.Float4D; @@ -78,7 +79,7 @@ class CubesRenderer implements GLSurfaceView.Renderer { mScreenMin = width height/width ) { diff --git a/src/main/java/org/distorted/examples/deform/DeformRenderer.java b/src/main/java/org/distorted/examples/deform/DeformRenderer.java index 6584eb6..ac5be2a 100644 --- a/src/main/java/org/distorted/examples/deform/DeformRenderer.java +++ b/src/main/java/org/distorted/examples/deform/DeformRenderer.java @@ -6,6 +6,7 @@ import javax.microedition.khronos.opengles.GL10; import org.distorted.library.Distorted; import org.distorted.library.DistortedBitmap; +import org.distorted.library.EffectTypes; import org.distorted.library.Interpolator2D; import org.distorted.library.Float3D; import org.distorted.library.Float4D; @@ -141,7 +142,7 @@ class DeformRenderer implements GLSurfaceView.Renderer } else { - stretch.abortAllEffects(Distorted.TYPE_FRAG|Distorted.TYPE_VERT); + stretch.abortAllEffects(EffectTypes.FRAGMENT.type|EffectTypes.VERTEX.type); stretch.abortEffect(shearID); } } @@ -202,7 +203,7 @@ class DeformRenderer implements GLSurfaceView.Renderer public void down(int x, int y) { - stretch.abortAllEffects(Distorted.TYPE_FRAG|Distorted.TYPE_VERT); + stretch.abortAllEffects(EffectTypes.FRAGMENT.type|EffectTypes.VERTEX.type); stretch.abortEffect(shearID); int xt = x-scrWidth/4; @@ -248,7 +249,7 @@ class DeformRenderer implements GLSurfaceView.Renderer public void up() { - stretch.abortAllEffects(Distorted.TYPE_FRAG|Distorted.TYPE_VERT); + stretch.abortAllEffects(EffectTypes.FRAGMENT.type|EffectTypes.VERTEX.type); stretch.abortEffect(shearID); float damp = -0.65f; diff --git a/src/main/java/org/distorted/examples/differentbitmaps/DifferentBitmapsRenderer.java b/src/main/java/org/distorted/examples/differentbitmaps/DifferentBitmapsRenderer.java index d65c051..ca5b887 100644 --- a/src/main/java/org/distorted/examples/differentbitmaps/DifferentBitmapsRenderer.java +++ b/src/main/java/org/distorted/examples/differentbitmaps/DifferentBitmapsRenderer.java @@ -11,6 +11,7 @@ import org.distorted.examples.R; import org.distorted.library.Distorted; import org.distorted.library.DistortedBitmap; +import org.distorted.library.EffectTypes; import org.distorted.library.Float2D; import org.distorted.library.Float4D; import org.distorted.library.Interpolator2D; @@ -92,7 +93,7 @@ class DifferentBitmapsRenderer implements GLSurfaceView.Renderer { for(int i=NUM-1; i>=0; i--) { - bmp[i].abortAllEffects(Distorted.TYPE_PRE); + bmp[i].abortAllEffects(EffectTypes.MATRIX.type); } if( bmpHeight/(NUM*bmpWidth) > height/width ) diff --git a/src/main/java/org/distorted/examples/differenteffects/DifferentEffectsRenderer.java b/src/main/java/org/distorted/examples/differenteffects/DifferentEffectsRenderer.java index 42493e8..12ccd27 100644 --- a/src/main/java/org/distorted/examples/differenteffects/DifferentEffectsRenderer.java +++ b/src/main/java/org/distorted/examples/differenteffects/DifferentEffectsRenderer.java @@ -11,6 +11,7 @@ import org.distorted.examples.R; import org.distorted.library.Distorted; import org.distorted.library.DistortedBitmap; +import org.distorted.library.EffectTypes; import org.distorted.library.Float2D; import org.distorted.library.Float3D; import org.distorted.library.Float4D; @@ -78,7 +79,7 @@ class DifferentEffectsRenderer implements GLSurfaceView.Renderer { for(int i=NUM-1; i>=0; i--) { - bmp[i].abortAllEffects(Distorted.TYPE_PRE); + bmp[i].abortAllEffects(EffectTypes.MATRIX.type); } if( bmpHeight/(NUM*bmpWidth) > height/width ) diff --git a/src/main/java/org/distorted/examples/effects3d/Effects3DRenderer.java b/src/main/java/org/distorted/examples/effects3d/Effects3DRenderer.java index 8f87ba4..f47740b 100644 --- a/src/main/java/org/distorted/examples/effects3d/Effects3DRenderer.java +++ b/src/main/java/org/distorted/examples/effects3d/Effects3DRenderer.java @@ -10,6 +10,7 @@ import javax.microedition.khronos.opengles.GL10; import org.distorted.examples.R; import org.distorted.library.DistortedCubes; +import org.distorted.library.EffectTypes; import org.distorted.library.Float3D; import org.distorted.library.Float4D; import org.distorted.library.Interpolator3D; @@ -78,7 +79,7 @@ class Effects3DRenderer implements GLSurfaceView.Renderer public static void setMatrixEffects() { - mCube.abortAllEffects(Distorted.TYPE_PRE); + mCube.abortAllEffects(EffectTypes.MATRIX.type); for( int i=0; i<=order.length-1 ; i++ ) { diff --git a/src/main/java/org/distorted/examples/fbo/FBORenderer.java b/src/main/java/org/distorted/examples/fbo/FBORenderer.java index c70f937..cfd6162 100644 --- a/src/main/java/org/distorted/examples/fbo/FBORenderer.java +++ b/src/main/java/org/distorted/examples/fbo/FBORenderer.java @@ -12,6 +12,7 @@ import org.distorted.examples.R; import org.distorted.library.DistortedNode; import org.distorted.library.Distorted; import org.distorted.library.DistortedBitmap; +import org.distorted.library.EffectTypes; import org.distorted.library.Float2D; import android.graphics.Bitmap; @@ -50,7 +51,7 @@ class FBORenderer implements GLSurfaceView.Renderer public void onSurfaceChanged(GL10 glUnused, int width, int height) { - mLisa.abortAllEffects(Distorted.TYPE_PRE); + mLisa.abortAllEffects(EffectTypes.MATRIX.type); if( lisaHeight/lisaWidth > height/width ) { diff --git a/src/main/java/org/distorted/examples/girl/GirlRenderer.java b/src/main/java/org/distorted/examples/girl/GirlRenderer.java index 8c8d585..1c50c1b 100644 --- a/src/main/java/org/distorted/examples/girl/GirlRenderer.java +++ b/src/main/java/org/distorted/examples/girl/GirlRenderer.java @@ -11,6 +11,7 @@ import org.distorted.examples.R; import org.distorted.library.Distorted; import org.distorted.library.DistortedBitmap; +import org.distorted.library.EffectTypes; import org.distorted.library.Float1D; import org.distorted.library.Float2D; import org.distorted.library.Float3D; @@ -148,7 +149,7 @@ class GirlRenderer implements GLSurfaceView.Renderer public void onSurfaceChanged(GL10 glUnused, int width, int height) { - mGirl.abortAllEffects(Distorted.TYPE_PRE); + mGirl.abortAllEffects(EffectTypes.MATRIX.type); if( bmpHeight/bmpWidth > height/width ) { diff --git a/src/main/java/org/distorted/examples/interpolator/InterpolatorRenderer.java b/src/main/java/org/distorted/examples/interpolator/InterpolatorRenderer.java index d0eb198..a49ce55 100644 --- a/src/main/java/org/distorted/examples/interpolator/InterpolatorRenderer.java +++ b/src/main/java/org/distorted/examples/interpolator/InterpolatorRenderer.java @@ -12,6 +12,7 @@ import android.opengl.GLSurfaceView; import org.distorted.library.DistortedBitmap; import org.distorted.library.Distorted; +import org.distorted.library.EffectTypes; /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -65,7 +66,7 @@ public class InterpolatorRenderer implements GLSurfaceView.Renderer public void onSurfaceChanged(GL10 glUnused, int width, int height) { - mBackground.abortAllEffects(Distorted.TYPE_PRE); + mBackground.abortAllEffects(EffectTypes.MATRIX.type); mBackground.scale((float)width/texWidth,(float)height/texHeight,1); Distorted.onSurfaceChanged(width, height); InterpolatorSurfaceView.setScreenSize(width,height); diff --git a/src/main/java/org/distorted/examples/listener/ListenerRenderer.java b/src/main/java/org/distorted/examples/listener/ListenerRenderer.java index d75741a..d2b85d4 100644 --- a/src/main/java/org/distorted/examples/listener/ListenerRenderer.java +++ b/src/main/java/org/distorted/examples/listener/ListenerRenderer.java @@ -12,6 +12,7 @@ import org.distorted.examples.R; import org.distorted.library.Distorted; import org.distorted.library.DistortedBitmap; +import org.distorted.library.EffectTypes; import org.distorted.library.Float2D; import org.distorted.library.Float3D; import org.distorted.library.Float4D; @@ -84,7 +85,7 @@ class ListenerRenderer implements GLSurfaceView.Renderer,EffectListener public void onSurfaceChanged(GL10 glUnused, int width, int height) { - water.abortAllEffects(Distorted.TYPE_PRE); + water.abortAllEffects(EffectTypes.MATRIX.type); if( bmpHeight/bmpWidth > height/width ) { diff --git a/src/main/java/org/distorted/examples/macroblock/MacroblockRenderer.java b/src/main/java/org/distorted/examples/macroblock/MacroblockRenderer.java index 929a7e5..9756ec3 100644 --- a/src/main/java/org/distorted/examples/macroblock/MacroblockRenderer.java +++ b/src/main/java/org/distorted/examples/macroblock/MacroblockRenderer.java @@ -9,6 +9,7 @@ import javax.microedition.khronos.opengles.GL10; import org.distorted.examples.R; import org.distorted.library.Distorted; import org.distorted.library.DistortedBitmap; +import org.distorted.library.EffectTypes; import org.distorted.library.Interpolator1D; import org.distorted.library.Interpolator3D; import org.distorted.library.Float1D; @@ -113,7 +114,7 @@ class MacroblockRenderer implements GLSurfaceView.Renderer diRotate.add(new Float1D( 0)); diRotate.add(new Float1D(360)); - macroblock.abortAllEffects(Distorted.TYPE_PRE); + macroblock.abortAllEffects(EffectTypes.MATRIX.type); macroblock.move(diMove); macroblock.scale(diScale); diff --git a/src/main/java/org/distorted/examples/monalisa/MonaLisaRenderer.java b/src/main/java/org/distorted/examples/monalisa/MonaLisaRenderer.java index 73ac158..6e7fe7f 100644 --- a/src/main/java/org/distorted/examples/monalisa/MonaLisaRenderer.java +++ b/src/main/java/org/distorted/examples/monalisa/MonaLisaRenderer.java @@ -10,6 +10,7 @@ import javax.microedition.khronos.opengles.GL10; import org.distorted.examples.R; import org.distorted.library.Distorted; import org.distorted.library.DistortedBitmap; +import org.distorted.library.EffectTypes; import org.distorted.library.Float2D; import org.distorted.library.Float3D; import org.distorted.library.Float4D; @@ -60,7 +61,7 @@ class MonaLisaRenderer implements GLSurfaceView.Renderer public void onSurfaceChanged(GL10 glUnused, int width, int height) { - monaLisa.abortAllEffects(Distorted.TYPE_PRE); + monaLisa.abortAllEffects(EffectTypes.MATRIX.type); if( bmpHeight/bmpWidth > height/width ) { diff --git a/src/main/java/org/distorted/examples/movingeffects/MovingEffectsRenderer.java b/src/main/java/org/distorted/examples/movingeffects/MovingEffectsRenderer.java index a217aec..187dc6a 100644 --- a/src/main/java/org/distorted/examples/movingeffects/MovingEffectsRenderer.java +++ b/src/main/java/org/distorted/examples/movingeffects/MovingEffectsRenderer.java @@ -12,6 +12,7 @@ import android.opengl.GLSurfaceView; import org.distorted.library.DistortedBitmap; import org.distorted.library.Distorted; +import org.distorted.library.EffectTypes; /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -80,7 +81,7 @@ public class MovingEffectsRenderer implements GLSurfaceView.Renderer public void onSurfaceChanged(GL10 glUnused, int width, int height) { - mBackground.abortAllEffects(Distorted.TYPE_PRE); + mBackground.abortAllEffects(EffectTypes.MATRIX.type); mBackground.scale((float)width/texWidth,(float)height/texHeight,1); Distorted.onSurfaceChanged(width, height); diff --git a/src/main/java/org/distorted/examples/movingeffects/MovingEffectsSurfaceView.java b/src/main/java/org/distorted/examples/movingeffects/MovingEffectsSurfaceView.java index 7cf3a1d..e7f1616 100644 --- a/src/main/java/org/distorted/examples/movingeffects/MovingEffectsSurfaceView.java +++ b/src/main/java/org/distorted/examples/movingeffects/MovingEffectsSurfaceView.java @@ -9,7 +9,7 @@ import android.os.Build; import android.view.MotionEvent; import android.util.AttributeSet; -import org.distorted.library.Distorted; +import org.distorted.library.EffectTypes; import org.distorted.library.Float2D; import org.distorted.library.Float3D; import org.distorted.library.Float4D; @@ -107,7 +107,7 @@ public class MovingEffectsSurfaceView extends GLSurfaceView synchronized(lock) { - MovingEffectsRenderer.mBackground.abortAllEffects(Distorted.TYPE_FRAG|Distorted.TYPE_VERT); + MovingEffectsRenderer.mBackground.abortAllEffects(EffectTypes.FRAGMENT.type|EffectTypes.VERTEX.type); MovingEffectsRenderer.mBackground.distort(di3D, dr, di2D); mCurrEffect = EFFECT_BUBBLE; } @@ -121,7 +121,7 @@ public class MovingEffectsSurfaceView extends GLSurfaceView synchronized(lock) { - MovingEffectsRenderer.mBackground.abortAllEffects(Distorted.TYPE_FRAG|Distorted.TYPE_VERT); + MovingEffectsRenderer.mBackground.abortAllEffects(EffectTypes.FRAGMENT.type|EffectTypes.VERTEX.type); MovingEffectsRenderer.mBackground.sink(10.0f, dr, di2D, 0, 0.5f); mCurrEffect = EFFECT_SINK; } @@ -135,7 +135,7 @@ public class MovingEffectsSurfaceView extends GLSurfaceView synchronized(lock) { - MovingEffectsRenderer.mBackground.abortAllEffects(Distorted.TYPE_FRAG|Distorted.TYPE_VERT); + MovingEffectsRenderer.mBackground.abortAllEffects(EffectTypes.FRAGMENT.type|EffectTypes.VERTEX.type); MovingEffectsRenderer.mBackground.macroblock(3, dr, di2D, 0, 0.5f); mCurrEffect = EFFECT_MACRO; } @@ -149,7 +149,7 @@ public class MovingEffectsSurfaceView extends GLSurfaceView synchronized(lock) { - MovingEffectsRenderer.mBackground.abortAllEffects(Distorted.TYPE_FRAG|Distorted.TYPE_VERT); + MovingEffectsRenderer.mBackground.abortAllEffects(EffectTypes.FRAGMENT.type|EffectTypes.VERTEX.type); MovingEffectsRenderer.mBackground.smooth_alpha(0.5f, dr, di2D, 0, 0.5f); mCurrEffect = EFFECT_TRANS; } @@ -163,7 +163,7 @@ public class MovingEffectsSurfaceView extends GLSurfaceView synchronized(lock) { - MovingEffectsRenderer.mBackground.abortAllEffects(Distorted.TYPE_FRAG|Distorted.TYPE_VERT); + MovingEffectsRenderer.mBackground.abortAllEffects(EffectTypes.FRAGMENT.type|EffectTypes.VERTEX.type); MovingEffectsRenderer.mBackground.swirl(30, dr, di2D, 0, 0.5f); mCurrEffect = EFFECT_SWIRL; } @@ -175,7 +175,7 @@ public class MovingEffectsSurfaceView extends GLSurfaceView { synchronized(lock) { - MovingEffectsRenderer.mBackground.abortAllEffects(Distorted.TYPE_FRAG|Distorted.TYPE_VERT); + MovingEffectsRenderer.mBackground.abortAllEffects(EffectTypes.FRAGMENT.type|EffectTypes.VERTEX.type); di2D.removeAll(); mCurrEffect = EFFECT_POINTS; } diff --git a/src/main/java/org/distorted/examples/olimpic/OlimpicRenderer.java b/src/main/java/org/distorted/examples/olimpic/OlimpicRenderer.java index d8d0f90..0546d5a 100644 --- a/src/main/java/org/distorted/examples/olimpic/OlimpicRenderer.java +++ b/src/main/java/org/distorted/examples/olimpic/OlimpicRenderer.java @@ -9,6 +9,7 @@ import javax.microedition.khronos.opengles.GL10; import org.distorted.examples.R; +import org.distorted.library.EffectTypes; import org.distorted.library.Interpolator1D; import org.distorted.library.DistortedNode; import org.distorted.library.Float3D; @@ -105,7 +106,7 @@ class OlimpicRenderer implements GLSurfaceView.Renderer int bmpWidth = bmp.getWidth(); int bmpHeight = bmp.getHeight(); - bmp.abortAllEffects(Distorted.TYPE_PRE); + bmp.abortAllEffects(EffectTypes.MATRIX.type); if( bmpHeight/bmpWidth > height/width ) { diff --git a/src/main/java/org/distorted/examples/plainmonalisa/RenderThread.java b/src/main/java/org/distorted/examples/plainmonalisa/RenderThread.java index 8ad6384..2abc290 100644 --- a/src/main/java/org/distorted/examples/plainmonalisa/RenderThread.java +++ b/src/main/java/org/distorted/examples/plainmonalisa/RenderThread.java @@ -14,6 +14,7 @@ import android.view.SurfaceView; import org.distorted.library.Distorted; import org.distorted.library.DistortedBitmap; +import org.distorted.library.EffectTypes; import org.distorted.library.Float2D; import org.distorted.library.Float3D; import org.distorted.library.Float4D; @@ -205,7 +206,7 @@ public class RenderThread extends Thread { Log.d(TAG, "surfaceChanged " + width + "x" + height); - monaLisa.abortAllEffects(Distorted.TYPE_PRE); + monaLisa.abortAllEffects(EffectTypes.MATRIX.type); if( bmpHeight/bmpWidth > height/width ) { diff --git a/src/main/java/org/distorted/examples/quaternion/QuaternionRenderer.java b/src/main/java/org/distorted/examples/quaternion/QuaternionRenderer.java index 38a3d63..4af2150 100644 --- a/src/main/java/org/distorted/examples/quaternion/QuaternionRenderer.java +++ b/src/main/java/org/distorted/examples/quaternion/QuaternionRenderer.java @@ -10,6 +10,7 @@ import javax.microedition.khronos.opengles.GL10; import org.distorted.examples.R; +import org.distorted.library.EffectTypes; import org.distorted.library.Interpolator; import org.distorted.library.InterpolatorQuat; import org.distorted.library.DistortedCubes; @@ -76,7 +77,7 @@ class QuaternionRenderer implements GLSurfaceView.Renderer public void onSurfaceChanged(GL10 glUnused, int width, int height) { - mCube.abortAllEffects(Distorted.TYPE_PRE); + mCube.abortAllEffects(EffectTypes.MATRIX.type); if( width > height ) { diff --git a/src/main/java/org/distorted/examples/scratchpad/ScratchpadRenderer.java b/src/main/java/org/distorted/examples/scratchpad/ScratchpadRenderer.java index 26fddbe..f996fb8 100644 --- a/src/main/java/org/distorted/examples/scratchpad/ScratchpadRenderer.java +++ b/src/main/java/org/distorted/examples/scratchpad/ScratchpadRenderer.java @@ -12,6 +12,7 @@ import android.opengl.GLSurfaceView; import org.distorted.library.DistortedBitmap; import org.distorted.library.Distorted; +import org.distorted.library.EffectTypes; /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -75,7 +76,7 @@ public class ScratchpadRenderer implements GLSurfaceView.Renderer public void onSurfaceChanged(GL10 glUnused, int width, int height) { - mBackground.abortAllEffects(Distorted.TYPE_PRE); + mBackground.abortAllEffects(EffectTypes.MATRIX.type); mBackground.scale((float)width/texWidth,(float)height/texHeight,1); Distorted.onSurfaceChanged(width,height); ScratchpadSurfaceView.setScreenSize(width,height); diff --git a/src/main/java/org/distorted/examples/sink/SinkRenderer.java b/src/main/java/org/distorted/examples/sink/SinkRenderer.java index 5b6b599..c488c51 100644 --- a/src/main/java/org/distorted/examples/sink/SinkRenderer.java +++ b/src/main/java/org/distorted/examples/sink/SinkRenderer.java @@ -11,6 +11,7 @@ import org.distorted.examples.R; import org.distorted.library.Distorted; import org.distorted.library.DistortedBitmap; +import org.distorted.library.EffectTypes; import org.distorted.library.Float2D; import org.distorted.library.Float4D; @@ -54,7 +55,7 @@ class SinkRenderer implements GLSurfaceView.Renderer public void onSurfaceChanged(GL10 glUnused, int width, int height) { - sinkBmp.abortAllEffects(Distorted.TYPE_PRE); + sinkBmp.abortAllEffects(EffectTypes.MATRIX.type); if( bmpHeight/bmpWidth > height/width ) {