commit 2c2616f13434949d864554438163e0d9c693a5e3
Author: Leszek Koltunski <leszek@distoretedandroid.org>
Date:   Fri Dec 16 15:58:16 2016 +0000

    Mirror: replace the Head bitmap.

diff --git a/src/main/java/org/distorted/examples/mirror/MirrorRenderer.java b/src/main/java/org/distorted/examples/mirror/MirrorRenderer.java
index ce3c1a6..26c8d31 100644
--- a/src/main/java/org/distorted/examples/mirror/MirrorRenderer.java
+++ b/src/main/java/org/distorted/examples/mirror/MirrorRenderer.java
@@ -43,23 +43,23 @@ import javax.microedition.khronos.opengles.GL10;
 
 class MirrorRenderer implements GLSurfaceView.Renderer
 {
-   private static final float MIRROR_SCALE = 0.60f;  // each next mirror will be 60% of the size
-   private static final float GIRL_SCALE   = 0.30f;  // Girl's height will be 30% of the height of the mirror
+   private static final float MIRROR_SCALE = 0.60f;  // each next mirror will be 60% of the size or the previous
+   private static final float HEAD_SCALE   = 0.30f;  // Head's height will be 30% of the height of the mirror
    private static final float MIRROR_MARGIN= 0.11f;  // The frame of the mirror takes up 11% of its width
    private static final float MIRROR_MOVE  = 0.13f;  // Each next mirror is moved to the right by 13% of
                                                      // the length of the previous one
 
    private GLSurfaceView mView;
-   private DistortedEffects mEffectsMirror, mEffectsGirl, mEffectsNull;
+   private DistortedEffects mEffectsMirror, mEffectsHead, mEffectsNull;
    private DistortedEffects mEffectsOffscreen1, mEffectsOffscreen2;
-   private DistortedTexture mTextureMirror, mTextureGirl;
+   private DistortedTexture mTextureMirror, mTextureHead;
    private DistortedFramebuffer mScreen, mOffScreen1, mOffScreen2;
    private GridFlat mQuad;
-   private Static3D mGirlPosition;
-   private Dynamic3D mGirlDyn;
+   private Static3D mHeadPosition;
+   private Dynamic3D mHeadDyn;
    private int mX;
 
-   private int mMirrorW, mMirrorH, mGirlW, mGirlH;
+   private int mMirrorW, mMirrorH, mHeadW, mHeadH;
    private int mScreenW, mScreenH;
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -71,16 +71,16 @@ class MirrorRenderer implements GLSurfaceView.Renderer
       mScreen  = new DistortedFramebuffer(0);
 
       mEffectsMirror    = new DistortedEffects();
-      mEffectsGirl      = new DistortedEffects();
+      mEffectsHead      = new DistortedEffects();
       mEffectsOffscreen1= new DistortedEffects();
       mEffectsOffscreen2= new DistortedEffects();
       mEffectsNull      = new DistortedEffects();
 
       mX = MirrorActivity.INIT_POSITION;
 
-      mGirlPosition = new Static3D(0,0,0);
-      mGirlDyn      = new Dynamic3D();
-      mGirlDyn.add(mGirlPosition);
+      mHeadPosition = new Static3D(0,0,0);
+      mHeadDyn = new Dynamic3D();
+      mHeadDyn.add(mHeadPosition);
       }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -89,9 +89,9 @@ class MirrorRenderer implements GLSurfaceView.Renderer
       {
       mX = pos;
 
-      float girlW = (GIRL_SCALE*mScreenH*mGirlW) / (mScreenW*mGirlH);
+      float headW = (HEAD_SCALE *mScreenH* mHeadW) / (mScreenW* mHeadH);
 
-      mGirlPosition.set1(mX*(1.0f-2*MIRROR_MARGIN-girlW)*mScreenW / 100.0f + MIRROR_MARGIN*mScreenW);
+      mHeadPosition.set1(mX*(1.0f-2*MIRROR_MARGIN-headW)*mScreenW / 100.0f + MIRROR_MARGIN*mScreenW);
       }
    
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -112,7 +112,7 @@ class MirrorRenderer implements GLSurfaceView.Renderer
 
       mOffScreen1.renderTo( mTextureMirror, mQuad, mEffectsMirror    , time );
       mOffScreen1.renderTo( mOffScreen2   , mQuad, mEffectsOffscreen2, time );
-      mOffScreen1.renderTo( mTextureGirl  , mQuad, mEffectsGirl      , time );
+      mOffScreen1.renderTo( mTextureHead  , mQuad, mEffectsHead      , time );
       mOffScreen2.renderTo( mOffScreen1   , mQuad, mEffectsOffscreen1, time );
       mScreen.renderTo    ( mOffScreen1   , mQuad, mEffectsNull      , time );
       }
@@ -129,7 +129,7 @@ class MirrorRenderer implements GLSurfaceView.Renderer
         mOffScreen1 = new DistortedFramebuffer(mScreenW,mScreenH);
         mOffScreen2 = new DistortedFramebuffer( (int)(MIRROR_SCALE*mScreenW), (int)(MIRROR_SCALE*mScreenH) );
 
-        mEffectsGirl.abortAllEffects();
+        mEffectsHead.abortAllEffects();
         mEffectsMirror.abortAllEffects();
         mEffectsOffscreen1.abortAllEffects();
         mEffectsOffscreen2.abortAllEffects();
@@ -138,10 +138,10 @@ class MirrorRenderer implements GLSurfaceView.Renderer
         mEffectsOffscreen1.scale(MIRROR_SCALE);
         mEffectsOffscreen2.move( new Static3D( MIRROR_MOVE*mScreenW, MIRROR_MOVE*mScreenH*mMirrorW/mMirrorH, 0) );
 
-        mEffectsGirl.move(mGirlDyn);
-        float girlScale = GIRL_SCALE*mScreenH/mGirlH;
-        mEffectsGirl.scale(girlScale);
-        mGirlPosition.set2( mScreenH*(1.0f-MIRROR_MARGIN*mMirrorW/mMirrorH) - girlScale*mGirlH);
+        mEffectsHead.move(mHeadDyn);
+        float headScale = HEAD_SCALE *mScreenH/ mHeadH;
+        mEffectsHead.scale(headScale);
+        mHeadPosition.set2( mScreenH*(1.0f-MIRROR_MARGIN*mMirrorW/mMirrorH) - headScale* mHeadH);
         setPosition(mX);
 
         mScreen.resize(mScreenW,mScreenH);
@@ -155,35 +155,35 @@ class MirrorRenderer implements GLSurfaceView.Renderer
       GLES20.glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
 
       InputStream isM = mView.getContext().getResources().openRawResource(R.raw.mirror);
-      InputStream isG = mView.getContext().getResources().openRawResource(R.raw.face);
+      InputStream isH = mView.getContext().getResources().openRawResource(R.raw.messi);
 
-      Bitmap bitmapM, bitmapG;
+      Bitmap bitmapM, bitmapH;
 
       try
         {
         bitmapM = BitmapFactory.decodeStream(isM);
-        bitmapG = BitmapFactory.decodeStream(isG);
+        bitmapH = BitmapFactory.decodeStream(isH);
         }
       finally
         {
         try
           {
           isM.close();
-          isG.close();
+          isH.close();
           }
         catch(IOException e) { }
         }
 
       mMirrorW = bitmapM.getWidth();
       mMirrorH = bitmapM.getHeight();
-      mGirlW   = bitmapG.getWidth();
-      mGirlH   = bitmapG.getHeight();
+      mHeadW   = bitmapH.getWidth();
+      mHeadH   = bitmapH.getHeight();
 
       mTextureMirror = new DistortedTexture(mMirrorW,mMirrorH);
-      mTextureGirl   = new DistortedTexture(mGirlW, mGirlH);
+      mTextureHead   = new DistortedTexture(mHeadW, mHeadH);
 
       mTextureMirror.setTexture(bitmapM);
-      mTextureGirl.setTexture(bitmapG);
+      mTextureHead.setTexture(bitmapH);
 
       try
         {
diff --git a/src/main/res/raw/messi.png b/src/main/res/raw/messi.png
new file mode 100644
index 0000000..529614a
Binary files /dev/null and b/src/main/res/raw/messi.png differ