Project

General

Profile

« Previous | Next » 

Revision 8664ea2e

Added by Leszek Koltunski about 4 years ago

Fixes for the merge.

View differences:

src/main/java/org/distorted/examples/mirror/MirrorRenderer.java
95 95
      mEffectsMirror.apply( new MatrixEffectScale(mScaleMirror));
96 96
      mEffectsOffscreen1.apply( new MatrixEffectScale( new Static3D(MIRROR_SCALE,MIRROR_SCALE,MIRROR_SCALE)));
97 97
      mEffectsOffscreen2.apply( new MatrixEffectMove(mMoveOffscreen2) );
98
      mEffectsHead.apply( new MatrixEffectMove(mHeadPosition) );
99 98
      mEffectsHead.apply( new MatrixEffectScale(mScaleHead) );
99
      mEffectsHead.apply( new MatrixEffectMove(mHeadPosition) );
100 100
      mEffectsOffscreen1.apply(new FragmentEffectBrightness(new Static1D(MIRROR_BRIGHTNESS)));
101 101
      }
102 102

  
......
157 157

  
158 158
        float headScale = HEAD_SCALE *mScreenH/ mHeadH;
159 159
        mScaleHead.set(headScale,headScale,headScale);
160
        mHeadPosition.set1( mScreenH*MIRROR_MARGIN*mMirrorW/mMirrorH );
161 160

  
162 161
        float scaleW = (float)mScreenW/mMirrorW;
163 162
        float scaleH = (float)mScreenH/mMirrorH;
......
165 164
        mScaleMirror.set( scaleW, scaleH, 1.0f);
166 165

  
167 166
        mMoveOffscreen2.set( (MIRROR_MOVE_H-0.5f+0.5f*MIRROR_SCALE)*mScreenW, (MIRROR_MOVE_V-0.5f+0.5f*MIRROR_SCALE)*mScreenH*mMirrorW/mMirrorH, 0);
168
        mHeadPosition.set2( (0.5f*HEAD_SCALE - 0.5f + MIRROR_MARGIN*mMirrorW/mMirrorH)*mScreenH );
169

  
167
        mHeadPosition.set1( (0.5f*HEAD_SCALE - 0.5f + MIRROR_MARGIN*mMirrorW/mMirrorH)*mScreenH );
170 168
        setPosition(mX);
171 169

  
172 170
        mOffScreen1.attach( mTextureMirror, mEffectsMirror    , mQuadMirror );

Also available in: Unified diff