commit a8c3ada7eac24db95754de84068c9053c36f8b0c
Author: Leszek Koltunski <leszek@distoretedandroid.org>
Date:   Fri Jun 10 12:30:25 2016 +0100

    Improve aborting Effects.

diff --git a/src/main/java/org/distorted/examples/bean/BeanRenderer.java b/src/main/java/org/distorted/examples/bean/BeanRenderer.java
index 2d2219c..a17248f 100644
--- a/src/main/java/org/distorted/examples/bean/BeanRenderer.java
+++ b/src/main/java/org/distorted/examples/bean/BeanRenderer.java
@@ -84,7 +84,7 @@ class BeanRenderer implements GLSurfaceView.Renderer
     
     public void onSurfaceChanged(GL10 glUnused, int width, int height) 
       { 
-      mBean.abortAllEffects(EffectTypes.MATRIX.type);
+      mBean.abortEffects(EffectTypes.MATRIX);
          
       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 ed76289..bb9d9ac 100644
--- a/src/main/java/org/distorted/examples/check/CheckRenderer.java
+++ b/src/main/java/org/distorted/examples/check/CheckRenderer.java
@@ -61,7 +61,7 @@ class CheckRenderer implements GLSurfaceView.Renderer
     
     public void onSurfaceChanged(GL10 glUnused, int width, int height) 
       { 
-      mSuccess.abortAllEffects(EffectTypes.MATRIX.type);
+      mSuccess.abortEffects(EffectTypes.MATRIX);
       
       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 40609ab..619add5 100644
--- a/src/main/java/org/distorted/examples/cubes/CubesRenderer.java
+++ b/src/main/java/org/distorted/examples/cubes/CubesRenderer.java
@@ -79,7 +79,7 @@ class CubesRenderer implements GLSurfaceView.Renderer
       {
       mScreenMin = width<height ? width:height;
     	
-      mCubes.abortAllEffects(EffectTypes.MATRIX.type);
+      mCubes.abortEffects(EffectTypes.MATRIX);
 
       if( mRows/mCols > 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 ac5be2a..1038847 100644
--- a/src/main/java/org/distorted/examples/deform/DeformRenderer.java
+++ b/src/main/java/org/distorted/examples/deform/DeformRenderer.java
@@ -142,7 +142,8 @@ class DeformRenderer implements GLSurfaceView.Renderer
         }
       else
         {
-        stretch.abortAllEffects(EffectTypes.FRAGMENT.type|EffectTypes.VERTEX.type);
+        stretch.abortEffects(EffectTypes.VERTEX);
+        stretch.abortEffects(EffectTypes.FRAGMENT);
         stretch.abortEffect(shearID);
         }
       }
@@ -203,7 +204,8 @@ class DeformRenderer implements GLSurfaceView.Renderer
 
     public void down(int x, int y)
       {
-      stretch.abortAllEffects(EffectTypes.FRAGMENT.type|EffectTypes.VERTEX.type);
+      stretch.abortEffects(EffectTypes.VERTEX);
+      stretch.abortEffects(EffectTypes.FRAGMENT);
       stretch.abortEffect(shearID);
 
       int xt = x-scrWidth/4;
@@ -249,7 +251,8 @@ class DeformRenderer implements GLSurfaceView.Renderer
 
     public void up()
       {
-      stretch.abortAllEffects(EffectTypes.FRAGMENT.type|EffectTypes.VERTEX.type);
+      stretch.abortEffects(EffectTypes.VERTEX);
+      stretch.abortEffects(EffectTypes.FRAGMENT);
       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 ca5b887..6e35e65 100644
--- a/src/main/java/org/distorted/examples/differentbitmaps/DifferentBitmapsRenderer.java
+++ b/src/main/java/org/distorted/examples/differentbitmaps/DifferentBitmapsRenderer.java
@@ -93,7 +93,7 @@ class DifferentBitmapsRenderer implements GLSurfaceView.Renderer
       {  
       for(int i=NUM-1; i>=0; i--) 
         {   
-        bmp[i].abortAllEffects(EffectTypes.MATRIX.type);
+        bmp[i].abortEffects(EffectTypes.MATRIX);
         }
       
       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 12ccd27..6520f49 100644
--- a/src/main/java/org/distorted/examples/differenteffects/DifferentEffectsRenderer.java
+++ b/src/main/java/org/distorted/examples/differenteffects/DifferentEffectsRenderer.java
@@ -79,7 +79,7 @@ class DifferentEffectsRenderer implements GLSurfaceView.Renderer
       { 
       for(int i=NUM-1; i>=0; i--) 
         {   
-        bmp[i].abortAllEffects(EffectTypes.MATRIX.type);
+        bmp[i].abortEffects(EffectTypes.MATRIX);
         }
       
       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 f47740b..aaa8aed 100644
--- a/src/main/java/org/distorted/examples/effects3d/Effects3DRenderer.java
+++ b/src/main/java/org/distorted/examples/effects3d/Effects3DRenderer.java
@@ -79,7 +79,7 @@ class Effects3DRenderer implements GLSurfaceView.Renderer
 
     public static void setMatrixEffects()
       {
-      mCube.abortAllEffects(EffectTypes.MATRIX.type);
+      mCube.abortEffects(EffectTypes.MATRIX);
 	
       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 cfd6162..0723824 100644
--- a/src/main/java/org/distorted/examples/fbo/FBORenderer.java
+++ b/src/main/java/org/distorted/examples/fbo/FBORenderer.java
@@ -51,7 +51,7 @@ class FBORenderer implements GLSurfaceView.Renderer
     
     public void onSurfaceChanged(GL10 glUnused, int width, int height) 
       { 
-      mLisa.abortAllEffects(EffectTypes.MATRIX.type);
+      mLisa.abortEffects(EffectTypes.MATRIX);
          
       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 1c50c1b..e8ff312 100644
--- a/src/main/java/org/distorted/examples/girl/GirlRenderer.java
+++ b/src/main/java/org/distorted/examples/girl/GirlRenderer.java
@@ -149,7 +149,7 @@ class GirlRenderer implements GLSurfaceView.Renderer
     
     public void onSurfaceChanged(GL10 glUnused, int width, int height) 
       { 
-      mGirl.abortAllEffects(EffectTypes.MATRIX.type);
+      mGirl.abortEffects(EffectTypes.MATRIX);
       
       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 a49ce55..42863fd 100644
--- a/src/main/java/org/distorted/examples/interpolator/InterpolatorRenderer.java
+++ b/src/main/java/org/distorted/examples/interpolator/InterpolatorRenderer.java
@@ -66,7 +66,7 @@ public class InterpolatorRenderer implements GLSurfaceView.Renderer
 
    public void onSurfaceChanged(GL10 glUnused, int width, int height)
      {
-     mBackground.abortAllEffects(EffectTypes.MATRIX.type);
+     mBackground.abortEffects(EffectTypes.MATRIX);
      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 d2b85d4..0708d34 100644
--- a/src/main/java/org/distorted/examples/listener/ListenerRenderer.java
+++ b/src/main/java/org/distorted/examples/listener/ListenerRenderer.java
@@ -47,9 +47,9 @@ class ListenerRenderer implements GLSurfaceView.Renderer,EffectListener
 
    private long randomizeNewBubble()
       {
-      int radius   = (int)((0.10f + 0.70f*mRnd.nextFloat())*bmpWidth);            // pop up a bubble of size (radius,height)
+      int radius   = (int)(( 0.10f + 0.70f*mRnd.nextFloat())*bmpWidth);           // pop up a bubble of size (radius,height)
       int height   = (int)((-0.10f + 0.20f*mRnd.nextFloat())*bmpWidth);           // 
-      int pointx   = mRnd.nextInt( (int)(0.8f*bmpWidth)) + (int)(0.1f*bmpWidth);  // at a random place on the bitmap (but not near the edge)
+      int pointx   = mRnd.nextInt( (int)(0.8f*bmpWidth ))+ (int)(0.1f*bmpWidth ); // at a random place on the bitmap (but not near the edge)
       int pointy   = mRnd.nextInt( (int)(0.8f*bmpHeight))+ (int)(0.1f*bmpHeight); // 
       int duration = 1000 + mRnd.nextInt(3000);                                   // for anytime from 3 to 4 seconds 
         
@@ -85,7 +85,7 @@ class ListenerRenderer implements GLSurfaceView.Renderer,EffectListener
     
     public void onSurfaceChanged(GL10 glUnused, int width, int height) 
       { 
-      water.abortAllEffects(EffectTypes.MATRIX.type);
+      water.abortEffects(EffectTypes.MATRIX);
          
       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 9756ec3..e28a684 100644
--- a/src/main/java/org/distorted/examples/macroblock/MacroblockRenderer.java
+++ b/src/main/java/org/distorted/examples/macroblock/MacroblockRenderer.java
@@ -114,7 +114,7 @@ class MacroblockRenderer implements GLSurfaceView.Renderer
       diRotate.add(new Float1D(  0));
       diRotate.add(new Float1D(360));
       
-      macroblock.abortAllEffects(EffectTypes.MATRIX.type);
+      macroblock.abortEffects(EffectTypes.MATRIX);
 
       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 6e7fe7f..8fb7da2 100644
--- a/src/main/java/org/distorted/examples/monalisa/MonaLisaRenderer.java
+++ b/src/main/java/org/distorted/examples/monalisa/MonaLisaRenderer.java
@@ -61,7 +61,7 @@ class MonaLisaRenderer implements GLSurfaceView.Renderer
     
     public void onSurfaceChanged(GL10 glUnused, int width, int height) 
       { 
-      monaLisa.abortAllEffects(EffectTypes.MATRIX.type);
+      monaLisa.abortEffects(EffectTypes.MATRIX);
          
       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 187dc6a..ffca3b4 100644
--- a/src/main/java/org/distorted/examples/movingeffects/MovingEffectsRenderer.java
+++ b/src/main/java/org/distorted/examples/movingeffects/MovingEffectsRenderer.java
@@ -81,7 +81,7 @@ public class MovingEffectsRenderer implements GLSurfaceView.Renderer
 
    public void onSurfaceChanged(GL10 glUnused, int width, int height)
      {
-     mBackground.abortAllEffects(EffectTypes.MATRIX.type);
+     mBackground.abortEffects(EffectTypes.MATRIX);
      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 e7f1616..ad27856 100644
--- a/src/main/java/org/distorted/examples/movingeffects/MovingEffectsSurfaceView.java
+++ b/src/main/java/org/distorted/examples/movingeffects/MovingEffectsSurfaceView.java
@@ -107,7 +107,8 @@ public class MovingEffectsSurfaceView extends GLSurfaceView
       
       synchronized(lock)
         {
-        MovingEffectsRenderer.mBackground.abortAllEffects(EffectTypes.FRAGMENT.type|EffectTypes.VERTEX.type);
+        MovingEffectsRenderer.mBackground.abortEffects(EffectTypes.VERTEX);
+        MovingEffectsRenderer.mBackground.abortEffects(EffectTypes.FRAGMENT);
         MovingEffectsRenderer.mBackground.distort(di3D, dr, di2D);
         mCurrEffect = EFFECT_BUBBLE;
         }
@@ -121,8 +122,9 @@ public class MovingEffectsSurfaceView extends GLSurfaceView
          
       synchronized(lock)
         {
-        MovingEffectsRenderer.mBackground.abortAllEffects(EffectTypes.FRAGMENT.type|EffectTypes.VERTEX.type);
-        MovingEffectsRenderer.mBackground.sink(10.0f, dr, di2D, 0, 0.5f);  
+        MovingEffectsRenderer.mBackground.abortEffects(EffectTypes.VERTEX);
+        MovingEffectsRenderer.mBackground.abortEffects(EffectTypes.FRAGMENT);
+        MovingEffectsRenderer.mBackground.sink(10.0f, dr, di2D, 0, 0.5f);
         mCurrEffect = EFFECT_SINK;
         }
       }
@@ -135,7 +137,8 @@ public class MovingEffectsSurfaceView extends GLSurfaceView
          
       synchronized(lock)
         {
-        MovingEffectsRenderer.mBackground.abortAllEffects(EffectTypes.FRAGMENT.type|EffectTypes.VERTEX.type);
+        MovingEffectsRenderer.mBackground.abortEffects(EffectTypes.VERTEX);
+        MovingEffectsRenderer.mBackground.abortEffects(EffectTypes.FRAGMENT);
         MovingEffectsRenderer.mBackground.macroblock(3, dr, di2D, 0, 0.5f);  
         mCurrEffect = EFFECT_MACRO;
         }
@@ -149,7 +152,8 @@ public class MovingEffectsSurfaceView extends GLSurfaceView
       
       synchronized(lock)
         {
-        MovingEffectsRenderer.mBackground.abortAllEffects(EffectTypes.FRAGMENT.type|EffectTypes.VERTEX.type);
+        MovingEffectsRenderer.mBackground.abortEffects(EffectTypes.VERTEX);
+        MovingEffectsRenderer.mBackground.abortEffects(EffectTypes.FRAGMENT);
         MovingEffectsRenderer.mBackground.smooth_alpha(0.5f, dr, di2D, 0, 0.5f);  
         mCurrEffect = EFFECT_TRANS;
         }
@@ -163,7 +167,8 @@ public class MovingEffectsSurfaceView extends GLSurfaceView
       
       synchronized(lock)
         {
-        MovingEffectsRenderer.mBackground.abortAllEffects(EffectTypes.FRAGMENT.type|EffectTypes.VERTEX.type);
+        MovingEffectsRenderer.mBackground.abortEffects(EffectTypes.VERTEX);
+        MovingEffectsRenderer.mBackground.abortEffects(EffectTypes.FRAGMENT);
         MovingEffectsRenderer.mBackground.swirl(30, dr, di2D, 0, 0.5f);  
         mCurrEffect = EFFECT_SWIRL;
         }
@@ -175,7 +180,8 @@ public class MovingEffectsSurfaceView extends GLSurfaceView
       {
       synchronized(lock)
         {
-        MovingEffectsRenderer.mBackground.abortAllEffects(EffectTypes.FRAGMENT.type|EffectTypes.VERTEX.type);
+        MovingEffectsRenderer.mBackground.abortEffects(EffectTypes.VERTEX);
+        MovingEffectsRenderer.mBackground.abortEffects(EffectTypes.FRAGMENT);
         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 0546d5a..497aa7f 100644
--- a/src/main/java/org/distorted/examples/olimpic/OlimpicRenderer.java
+++ b/src/main/java/org/distorted/examples/olimpic/OlimpicRenderer.java
@@ -106,7 +106,7 @@ class OlimpicRenderer implements GLSurfaceView.Renderer
       int bmpWidth  = bmp.getWidth();
       int bmpHeight = bmp.getHeight();
      
-      bmp.abortAllEffects(EffectTypes.MATRIX.type);
+      bmp.abortEffects(EffectTypes.MATRIX);
       
       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 2abc290..51c4d1a 100644
--- a/src/main/java/org/distorted/examples/plainmonalisa/RenderThread.java
+++ b/src/main/java/org/distorted/examples/plainmonalisa/RenderThread.java
@@ -206,7 +206,7 @@ public class RenderThread extends Thread
     {
     Log.d(TAG, "surfaceChanged " + width + "x" + height);
 
-    monaLisa.abortAllEffects(EffectTypes.MATRIX.type);
+    monaLisa.abortEffects(EffectTypes.MATRIX);
 
     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 4af2150..0f7fc76 100644
--- a/src/main/java/org/distorted/examples/quaternion/QuaternionRenderer.java
+++ b/src/main/java/org/distorted/examples/quaternion/QuaternionRenderer.java
@@ -77,7 +77,7 @@ class QuaternionRenderer implements GLSurfaceView.Renderer
     
     public void onSurfaceChanged(GL10 glUnused, int width, int height) 
       {
-      mCube.abortAllEffects(EffectTypes.MATRIX.type);
+      mCube.abortEffects(EffectTypes.MATRIX);
 
       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 f996fb8..3185472 100644
--- a/src/main/java/org/distorted/examples/scratchpad/ScratchpadRenderer.java
+++ b/src/main/java/org/distorted/examples/scratchpad/ScratchpadRenderer.java
@@ -76,7 +76,7 @@ public class ScratchpadRenderer implements GLSurfaceView.Renderer
 
    public void onSurfaceChanged(GL10 glUnused, int width, int height)
      {
-     mBackground.abortAllEffects(EffectTypes.MATRIX.type);
+     mBackground.abortEffects(EffectTypes.MATRIX);
      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 c488c51..6f913d3 100644
--- a/src/main/java/org/distorted/examples/sink/SinkRenderer.java
+++ b/src/main/java/org/distorted/examples/sink/SinkRenderer.java
@@ -55,7 +55,7 @@ class SinkRenderer implements GLSurfaceView.Renderer
     
     public void onSurfaceChanged(GL10 glUnused, int width, int height) 
       { 
-      sinkBmp.abortAllEffects(EffectTypes.MATRIX.type);
+      sinkBmp.abortEffects(EffectTypes.MATRIX);
          
       if( bmpHeight/bmpWidth > height/width )
         {