Project

General

Profile

« Previous | Next » 

Revision 3eb6f354

Added by Leszek Koltunski over 4 years ago

Merge branch 'empty-matrix-effects-in-the-center' into modern-empty-matrix-effects-in-the-center

  1. Conflicts:
  2. src/main/AndroidManifest.xml
  3. src/main/java/org/distorted/examples/TableOfContents.java
  4. src/main/java/org/distorted/examples/aroundtheworld/AroundTheWorldRenderer.java
  5. src/main/java/org/distorted/examples/bean/BeanRenderer.java
  6. src/main/java/org/distorted/examples/catanddog/CatAndDogRenderer.java
  7. src/main/java/org/distorted/examples/deform/DeformRenderer.java
  8. src/main/java/org/distorted/examples/earth/EarthRenderer.java
  9. src/main/java/org/distorted/examples/effects3d/Effects3DActivity.java
  10. src/main/java/org/distorted/examples/effects3d/Effects3DActivity2.java
  11. src/main/java/org/distorted/examples/effects3d/Effects3DEffect.java
  12. src/main/java/org/distorted/examples/effects3d/Effects3DRenderer.java
  13. src/main/java/org/distorted/examples/effects3d/Effects3DSurfaceView.java
  14. src/main/java/org/distorted/examples/effects3d/Effects3DTab.java
  15. src/main/java/org/distorted/examples/effects3d/Effects3DTabViewPager.java
  16. src/main/java/org/distorted/examples/flag/FlagRenderer.java
  17. src/main/java/org/distorted/examples/generic/Effects3DActivity.java
  18. src/main/java/org/distorted/examples/generic/Effects3DActivity2.java
  19. src/main/java/org/distorted/examples/generic/Effects3DEffect.java
  20. src/main/java/org/distorted/examples/generic/Effects3DRenderer.java
  21. src/main/java/org/distorted/examples/generic/Effects3DSurfaceView.java
  22. src/main/java/org/distorted/examples/generic/Effects3DTab.java
  23. src/main/java/org/distorted/examples/generic/Effects3DTabViewPager.java
  24. src/main/java/org/distorted/examples/generic/GenericActivity.java
  25. src/main/java/org/distorted/examples/generic/GenericActivity2.java
  26. src/main/java/org/distorted/examples/generic/GenericEffect.java
  27. src/main/java/org/distorted/examples/generic/GenericRenderer.java
  28. src/main/java/org/distorted/examples/generic/GenericSurfaceView.java
  29. src/main/java/org/distorted/examples/generic/GenericTab.java
  30. src/main/java/org/distorted/examples/glow/GlowRenderer.java
  31. src/main/java/org/distorted/examples/inflate/InflateRenderer.java
  32. src/main/java/org/distorted/examples/listener/ListenerRenderer.java
  33. src/main/java/org/distorted/examples/meshjoin/MeshJoinActivity.java
  34. src/main/java/org/distorted/examples/mirror/MirrorRenderer.java
  35. src/main/java/org/distorted/examples/movingglow/MovingGlowRenderer.java
  36. src/main/java/org/distorted/examples/multiblur/MultiblurRenderer.java
  37. src/main/java/org/distorted/examples/objecttree/ObjectTreeRenderer.java
  38. src/main/java/org/distorted/examples/olimpic/OlimpicRenderer.java
  39. src/main/java/org/distorted/examples/postprocesstree/PostprocessTreeRenderer.java
  40. src/main/java/org/distorted/examples/quaternion/QuaternionRenderer.java
  41. src/main/java/org/distorted/examples/rubik/RubikRenderer.java
  42. src/main/java/org/distorted/examples/sink/SinkRenderer.java
  43. src/main/java/org/distorted/examples/starwars/StarWarsRenderer.java
  44. src/main/java/org/distorted/examples/stencil/StencilRenderer.java
  45. src/main/java/org/distorted/examples/transparency/TransparencyRenderer.java
  46. src/main/java/org/distorted/examples/triblur/TriblurRenderer.java
  47. src/main/java/org/distorted/examples/wind/WindEffectsManager.java
  48. src/main/java/org/distorted/examples/wind/WindRenderer.java
  49. src/main/res/layout/genericlayout.xml

View differences:

src/main/java/org/distorted/library/effectqueue/EffectQueueMatrix.java
146 146 
  void send(int width, int height, float distance, float mipmap, float[] projection, float halfX, float halfY, float halfZ, int variant)
147 147 
    {
148 148 
    Matrix.setIdentityM(mViewMatrix, 0);
149 
    Matrix.translateM(mViewMatrix, 0, -width*0.5f, -height*0.5f, -distance);
149 
    //Matrix.translateM(mViewMatrix, 0, -width*0.5f, -height*0.5f, -distance);
150 

  		




  
  151
  
    
    Matrix.translateM(mViewMatrix, 0, 0,0, -distance);


  		




  
  152
  
    

  		




  150
  153
  
    
    if( mipmap!=1 ) Matrix.scaleM(mViewMatrix, 0, mipmap, mipmap, mipmap);


  		




  151
  154
  
    

  		




  152
  155
  
    
    for(int i=mNumEffects-1; i>=0; i--) ((MatrixEffect)mEffects[i]).apply(mViewMatrix,mUniforms,i);


  		




  153
  156
  
    

  		




  154
  
  
    
    Matrix.translateM(mViewMatrix, 0, halfX,halfY,halfZ);


  		




  
  157
  
    
  //  Matrix.translateM(mViewMatrix, 0, halfX,halfY,halfZ);


  		




  155
  158
  
    
    Matrix.multiplyMM(mMVPMatrix, 0, projection, 0, mViewMatrix, 0);


  		




  156
  159
  
    

  		




  157
  160
  
    
    GLES31.glUniform3f( mObjDH[variant] , halfX, halfY, halfZ);


  		












Also available in:  Unified diff