/ - Diff - Distorted Android

« Previous | Next »

Revision cdd5e827

Added by Leszek Koltunski almost 8 years ago

ID cdd5e8277d693ac728f7d142c9633584bd3bb2c7
Parent 464e53fa
Child a8537f43

Some fixes for issues discovered by the Multiblur app.

       private static long mNextID =0;
       private long mID;
       private static DistortedFramebuffer mBufferFBO = new DistortedFramebuffer(1,1);
       private static DistortedFramebuffer mBufferFBO = new DistortedFramebuffer(1,1,true);
       private EffectQueueMatrix      mM;
       private EffectQueueFragment    mF;

       private int[] fboIds   = new int[1];
       private boolean mMarked;
       private boolean mDepthWanted;
       private boolean mDepthEnabled;
       private int mTexWidth, mTexHeight;
-...
           checkStatus("color");
+          }
         if( mDepthWanted && depthIds[0]==NOT_CREATED_YET ) // we need to create a new DEPTH attachment
         if( mDepthEnabled && depthIds[0]==NOT_CREATED_YET ) // we need to create a new DEPTH attachment
+          {
           GLES30.glGenTextures(1, depthIds, 0);
           GLES30.glBindTexture(GLES30.GL_TEXTURE_2D, depthIds[0]);
-...
           checkStatus("depth");
+          }
         if( !mDepthWanted && depthIds[0]!=NOT_CREATED_YET ) // we need to detach and destroy the DEPTH attachment.
         if( !mDepthEnabled && depthIds[0]!=NOT_CREATED_YET ) // we need to detach and destroy the DEPTH attachment.
+          {
           GLES30.glDeleteTextures(1, depthIds, 0);
           depthIds[0]=NOT_CREATED_YET;
-...
         for( DistortedFramebuffer fbo : mList)
+          {
           if( fbo.colorIds[0]!=DONT_CREATE ) fbo.colorIds[0] = NOT_CREATED_YET;
           if( fbo.mDepthWanted             ) fbo.depthIds[0] = NOT_CREATED_YET;
           if( fbo.mDepthEnabled) fbo.depthIds[0] = NOT_CREATED_YET;
+          }
+        }
-...
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     // PUBLIC API
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     /**
      * Create a new offscreen Framebuffer.
+     *
      * @param width Width of the COLOR attachment.
      * @param height Height of the COLOR attachment.
      * @param depthEnabled Add DEPTH attachment?
      */
       @SuppressWarnings("unused")
       public DistortedFramebuffer(int width, int height, boolean depthEnabled)
+        {
         mProjectionMatrix = new float[16];
         mHeight      = height;
         mWidth       = width;
         mTexHeight   = height;
         mTexWidth    = width;
         mFOV         = 60.0f;
         mX           = 0.0f;
         mY           = 0.0f;
         mMarked      = false;
         mDepthEnabled= depthEnabled;
         fboIds[0]  =-1;
         colorIds[0]= NOT_CREATED_YET;
         depthIds[0]= NOT_CREATED_YET;
         createProjection();
         mList.add(this);
+        }
     /**
      * Create a new offscreen Framebuffer.
+     *
-...
+        {
         mProjectionMatrix = new float[16];
         mHeight     = height;
         mWidth      = width;
         mTexHeight  = height;
         mTexWidth   = width;
         mFOV        = 60.0f;
         mX          = 0.0f;
         mY          = 0.0f;
         mMarked     = false;
         mDepthWanted= false;
         mHeight      = height;
         mWidth       = width;
         mTexHeight   = height;
         mTexWidth    = width;
         mFOV         = 60.0f;
         mX           = 0.0f;
         mY           = 0.0f;
         mMarked      = false;
         mDepthEnabled= false;
         fboIds[0]  =-1;
         colorIds[0]= NOT_CREATED_YET;
-...
+        {
         mProjectionMatrix = new float[16];
         mFOV        = 60.0f;
         mX          = 0.0f;
         mY          = 0.0f;
         mMarked     = false;
         mDepthWanted= true;
         mFOV         = 60.0f;
         mX           = 0.0f;
         mY           = 0.0f;
         mMarked      = false;
         mDepthEnabled= true;
         fboIds[0]  = fbo;
         colorIds[0]= DONT_CREATE;
-...
     /**
      * Create a new DEPTH buffer and attach it or (param=false) detach an existing DEPTh attachment and destroy it.
+     *
      * @param hasDepthAttachment <bold>true</bold> if we want to attach a new DEPTH buffer to the FBO.<br>
      *                           <bold>false</bold> if we want to detach the DEPTH attachment.
      * @param enable <bold>true</bold> if we want to attach a new DEPTH buffer to the FBO.<br>
      *               <bold>false</bold> if we want to detach the DEPTH attachment.
      */
       public void setDepthAttachment(boolean hasDepthAttachment)
       public void enableDepthAttachment(boolean enable)
+        {
         mDepthWanted = hasDepthAttachment;
         mDepthEnabled = enable;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
-...
      */
       public boolean hasDepth()
+        {
         return mDepthWanted;
         return mDepthEnabled;
+        }
+      }

         mQuadTextureInv.put(textureInv).position(0);
+        }
       private static DistortedFramebuffer mBufferFBO = new DistortedFramebuffer(1,1);
       private static DistortedFramebuffer mBufferFBO = new DistortedFramebuffer(1,1,true);
       private static float[] mMVPMatrix = new float[16];
       private static float[] mTmpMatrix = new float[16];
-...
         mBufferFBO.resizeFast( (int)w, (int)h);
         mBufferFBO.setAsOutput();
         GLES30.glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
         GLES30.glClear( GLES30.GL_DEPTH_BUFFER_BIT | GLES30.GL_COLOR_BUFFER_BIT);
         GLES30.glViewport(0, 0, (int)w, (int)h);
         Matrix.setIdentityM(mTmpMatrix, 0);

Also available in: Unified diff

Project

General

Profile

Distorted Android

Revision cdd5e827

Added by Leszek Koltunski almost 8 years ago