commit 0a098d35387fdcdd4bb25e4f992813a2bd43cbc9
Author: Leszek Koltunski <leszek@koltunski.pl>
Date:   Sat Apr 7 00:28:45 2018 +0100

    Improve the 'PostprocessTree' app. Shows bugs in postprocessing.

diff --git a/src/main/java/org/distorted/examples/postprocesstree/PostprocessTreeActivity.java b/src/main/java/org/distorted/examples/postprocesstree/PostprocessTreeActivity.java
index 8c73811..6fb2730 100644
--- a/src/main/java/org/distorted/examples/postprocesstree/PostprocessTreeActivity.java
+++ b/src/main/java/org/distorted/examples/postprocesstree/PostprocessTreeActivity.java
@@ -85,9 +85,9 @@ public class PostprocessTreeActivity extends Activity implements SeekBar.OnSeekB
 
       switch (bar.getId())
         {
-        case R.id.blurSeek: int level = view.getRenderer().setBlur(progress);
-                            mText.setText(getString(R.string.blur_placeholder,level));
-                            break;
+        case R.id.postprocesstreeSeek: int level = view.getRenderer().setBlur(progress);
+                                       mText.setText(getString(R.string.blur_placeholder,level));
+                                       break;
         }
       }
 
diff --git a/src/main/java/org/distorted/examples/postprocesstree/PostprocessTreeRenderer.java b/src/main/java/org/distorted/examples/postprocesstree/PostprocessTreeRenderer.java
index f15af07..9cb4deb 100644
--- a/src/main/java/org/distorted/examples/postprocesstree/PostprocessTreeRenderer.java
+++ b/src/main/java/org/distorted/examples/postprocesstree/PostprocessTreeRenderer.java
@@ -56,8 +56,8 @@ class PostprocessTreeRenderer implements GLSurfaceView.Renderer
    private DistortedTexture mLeaf;
    private DistortedScreen mScreen;
    private int mScreenW, mScreenH;
-   private Static3D mMove, mInnerScale, mOuterScale;
-   private Static1D mRadiusSta;
+   private Static3D mMove, mScale;
+   private Static1D mRadius;
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -65,20 +65,22 @@ class PostprocessTreeRenderer implements GLSurfaceView.Renderer
       {     
       mView = v;
 
-      mScreenW = 9*LEAF_SIZE;
-      mScreenH = 9*LEAF_SIZE;
+      final int OUTER = 9;
+      final int INNER = 4;
 
-      mRadiusSta = new Static1D(5);
+      mScreenW = OUTER*LEAF_SIZE;
+      mScreenH = OUTER*LEAF_SIZE;
+
+      mRadius = new Static1D(5);
       Dynamic1D radiusDyn = new Dynamic1D();
-      radiusDyn.add(mRadiusSta);
+      radiusDyn.add(mRadius);
+      PostprocessEffectBlur blurEffect = new PostprocessEffectBlur(radiusDyn);
 
       mLeaf = new DistortedTexture(LEAF_SIZE,LEAF_SIZE);
 
       MeshFlat mesh = new MeshFlat(1,1);
       mMove = new Static3D(0,0,0);
-
-      mInnerScale= new Static3D(1,1,1);
-      mOuterScale= new Static3D(1,1,1);
+      mScale= new Static3D(1,1,1);
 
       DistortedEffects rootEffects  = new DistortedEffects();
       DistortedEffects innerEffects = new DistortedEffects();
@@ -87,48 +89,46 @@ class PostprocessTreeRenderer implements GLSurfaceView.Renderer
 
       DistortedNode root = new DistortedNode(new DistortedTexture(mScreenW,mScreenH), rootEffects, mesh);
 
-      DistortedNode[] innerLeafNodes = new DistortedNode[NUM_LEAVES];
-      DistortedNode[] outerLeafNodes = new DistortedNode[NUM_LEAVES];
-
       rootEffects.apply(new MatrixEffectMove(mMove));
-      rootEffects.apply(new MatrixEffectScale(mOuterScale));
+      rootEffects.apply(new MatrixEffectScale(mScale));
+      //rootEffects.apply(blurEffect);
+
+      Dynamic1D rotate = new Dynamic1D(5000,0.0f);
+      rotate.setMode(Dynamic1D.MODE_JUMP);
+      rotate.add(new Static1D(  0));
+      rotate.add(new Static1D(360));
 
-      Dynamic1D rot = new Dynamic1D(5000,0.0f);
-      rot.setMode(Dynamic1D.MODE_JUMP);
-      rot.add(new Static1D(  0));
-      rot.add(new Static1D(360));
+      Static3D outerCenter = new Static3D(OUTER*LEAF_SIZE/2, OUTER*LEAF_SIZE/2, 0);
+      Static3D innerCenter = new Static3D(INNER*LEAF_SIZE/2, INNER*LEAF_SIZE/2, 0);
 
-      Static3D center = new Static3D(3*LEAF_SIZE/2, 3*LEAF_SIZE/2, 0);
       Static3D axis   = new Static3D(0,0,1);
-      Static3D innerMoveVector = new Static3D(0,  LEAF_SIZE,0);
-      Static3D outerMoveVector = new Static3D(0,3*LEAF_SIZE,0);
+      Static3D innerMoveVector = new Static3D(            0, (INNER-1)*LEAF_SIZE/2, 0);
+      Static3D outerMoveVector = new Static3D(3*LEAF_SIZE/2, (OUTER-1)*LEAF_SIZE/2, 0);
 
       for(int j=0; j<NUM_LEAVES; j++)
         {
         outerLeafEffects[j] = new DistortedEffects();
-        outerLeafEffects[j].apply( new MatrixEffectRotate(new Static1D(j*(360/NUM_LEAVES)), axis, center) );
+        outerLeafEffects[j].apply( new MatrixEffectRotate(new Static1D(j*(360/NUM_LEAVES)), axis, outerCenter) );
         outerLeafEffects[j].apply(new MatrixEffectMove(outerMoveVector));
-        outerLeafNodes[j] = new DistortedNode( mLeaf, outerLeafEffects[j], mesh);
 
-        root.attach(outerLeafNodes[j]);
+        root.attach(mLeaf, outerLeafEffects[j], mesh);
         }
 
-      innerEffects.apply( new MatrixEffectMove(new Static3D( mScreenW/2, mScreenH/2, 0)) );
-      innerEffects.apply( new MatrixEffectRotate(rot, axis, center) );
-      rootEffects.apply(new MatrixEffectScale(mInnerScale));
+      innerEffects.apply( new MatrixEffectMove(new Static3D( (OUTER-INNER)*LEAF_SIZE/2,(OUTER-INNER)*LEAF_SIZE/2, 0)) );
+      innerEffects.apply( new MatrixEffectRotate(rotate, axis, innerCenter) );
       innerEffects.apply( new FragmentEffectChroma(new Static1D(0.5f), new Static3D(1,0,0) ) );
+      innerEffects.apply(blurEffect);
 
-      DistortedNode innerNode = new DistortedNode( new DistortedTexture(3*LEAF_SIZE,3*LEAF_SIZE), innerEffects, mesh);
+      DistortedNode innerNode = new DistortedNode( new DistortedTexture(INNER*LEAF_SIZE,INNER*LEAF_SIZE), innerEffects, mesh);
       root.attach(innerNode);
 
       for(int j=0; j<NUM_LEAVES; j++)
         {
         innerLeafEffects[j] = new DistortedEffects();
-        innerLeafEffects[j].apply( new MatrixEffectRotate(new Static1D(j*(360/NUM_LEAVES)), axis, center) );
+        innerLeafEffects[j].apply( new MatrixEffectRotate(new Static1D(j*(360/NUM_LEAVES)), axis, innerCenter) );
         innerLeafEffects[j].apply(new MatrixEffectMove(innerMoveVector));
-        innerLeafNodes[j] = new DistortedNode( mLeaf, innerLeafEffects[j], mesh);
 
-        innerNode.attach(innerLeafNodes[j]);
+        innerNode.attach( mLeaf, innerLeafEffects[j], mesh );
         }
 
       mScreen = new DistortedScreen();
@@ -140,7 +140,7 @@ class PostprocessTreeRenderer implements GLSurfaceView.Renderer
    int setBlur(int blur)
      {
      int radius = blur/2;
-     mRadiusSta.set(radius);
+     mRadius.set(radius);
      return radius;
      }
 
@@ -155,25 +155,22 @@ class PostprocessTreeRenderer implements GLSurfaceView.Renderer
     
    public void onSurfaceChanged(GL10 glUnused, int width, int height)
      {
-     float iFactor, oFactor;
+     float factor;
 
      if( (float)mScreenH/mScreenW > (float)height/width )
        {
        int w = (height*mScreenW)/mScreenH;
-       oFactor = (float)height/mScreenH;
-       iFactor = 0.3f*oFactor;
+       factor = (float)height/mScreenH;
        mMove.set((width-w)/2 ,0, 0);
        }
      else
        {
        int h = (width*mScreenH)/mScreenW;
-       oFactor = (float)width/mScreenW;
-       iFactor = 0.3f*oFactor;
+       factor = (float)width/mScreenW;
        mMove.set(0,(height-h)/2,0);
        }
 
-     mOuterScale.set(oFactor,oFactor,oFactor);
-     mInnerScale.set(iFactor,iFactor,iFactor);
+     mScale.set(factor,factor,factor);
 
      mScreen.resize(width, height);
      }