commit c9ff05c172ba3252efea689de80f2d01f73b46a6
Author: leszek <leszek@koltunski.pl>
Date:   Sun Jun 11 23:56:27 2017 +0100

    Some progress with Effect classes.
    
    13 apps compile now.

diff --git a/src/main/java/org/distorted/examples/sink/SinkRenderer.java b/src/main/java/org/distorted/examples/sink/SinkRenderer.java
index 854a627..20b23bc 100644
--- a/src/main/java/org/distorted/examples/sink/SinkRenderer.java
+++ b/src/main/java/org/distorted/examples/sink/SinkRenderer.java
@@ -27,13 +27,15 @@ import javax.microedition.khronos.opengles.GL10;
 
 import org.distorted.examples.R;
 
+import org.distorted.library.effect.EffectName;
+import org.distorted.library.effect.MatrixEffectMove;
+import org.distorted.library.effect.MatrixEffectScale;
+import org.distorted.library.effect.VertexEffectSink;
 import org.distorted.library.main.Distorted;
 import org.distorted.library.main.DistortedEffects;
 import org.distorted.library.main.DistortedScreen;
-import org.distorted.library.EffectNames;
 import org.distorted.library.main.MeshFlat;
 import org.distorted.library.main.DistortedTexture;
-import org.distorted.library.EffectTypes;
 import org.distorted.library.type.Dynamic1D;
 import org.distorted.library.type.Static1D;
 import org.distorted.library.type.Static3D;
@@ -52,7 +54,8 @@ class SinkRenderer implements GLSurfaceView.Renderer
   private DistortedTexture mTexture;
   private MeshFlat mMesh;
   private int bmpHeight, bmpWidth;
-    
+  private Static3D mScale, mMove;
+
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
   SinkRenderer(GLSurfaceView v)
@@ -64,7 +67,13 @@ class SinkRenderer implements GLSurfaceView.Renderer
     sink.add(new Static1D(0.2f));
 
     mEffects = new DistortedEffects();
-    mEffects.sink( sink, new Static3D(297, 320, 0), null);
+    VertexEffectSink sinkEffect = new VertexEffectSink(sink, new Static3D(297, 320, 0), null);
+    mEffects.apply(sinkEffect);
+
+    mScale = new Static3D(1,1,1);
+    mMove  = new Static3D(0,0,0);
+    mEffects.apply(new MatrixEffectMove(mMove));
+    mEffects.apply(new MatrixEffectScale(mScale));
 
     mScreen = new DistortedScreen(mView);
     }
@@ -80,23 +89,19 @@ class SinkRenderer implements GLSurfaceView.Renderer
     
   public void onSurfaceChanged(GL10 glUnused, int width, int height) 
     { 
-    mEffects.abortEffects(EffectTypes.MATRIX);
-         
     if( (float)bmpHeight/bmpWidth > (float)height/width )
       {
       int w = (height*bmpWidth)/bmpHeight;
       float factor = (float)height/bmpHeight;
-
-      mEffects.move( new Static3D((width-w)/2,0,0) );
-      mEffects.scale( factor );
+      mMove.set((width-w)/2,0,0);
+      mScale.set(factor,factor,factor);
       }
     else
       {
       int h = (width*bmpHeight)/bmpWidth;
       float factor = (float)width/bmpWidth;
-
-      mEffects.move( new Static3D(0,(height-h)/2,0) );
-      mEffects.scale( factor );
+      mMove.set(0,(height-h)/2,0);
+      mScale.set(factor,factor,factor);
       }
       
     mScreen.resize(width, height);
@@ -132,7 +137,7 @@ class SinkRenderer implements GLSurfaceView.Renderer
     mScreen.detachAll();
     mScreen.attach(mTexture,mEffects,mMesh);
 
-    DistortedEffects.enableEffect(EffectNames.SINK);
+    DistortedEffects.enableEffect(EffectName.SINK);
 
     try
       {