/ - Diff - Distorted Android

« Previous | Next »

Revision 86eb00a9

Added by Leszek Koltunski almost 9 years ago

ID 86eb00a913a0d87c87e2a7c17c3ffbdcb64ffee1
Parent 47d838ca
Child bfe2c61b

Initial version of the first post-processing effect - BLUR - ready for the first app!

+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       static DistortedFramebuffer getFBO(int w, int h)
+        {
         // TODO: a static factory of Framebuffers.
         return null;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       static boolean isInitialized()
-...
         return (mMainProgramAttributes!=null);
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     /**
      * Release all internal memory caches (in particular the FBOs used as buffers for postprocessing)
      */
       public static void clean()
+        {
         // TODO
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     /**
      * When OpenGL context gets created, you need to call this method so that the library can initialise its internal data structures.
-...
         EffectMessageSender.stopSending();
         mMainProgramAttributes = null;
         mPostProgramAttributes = null;
+        }
+      }

       private static long mNextID =0;
       private long mID;
       private static DistortedFramebuffer mBufferFBO;
       private EffectQueueMatrix      mM;
       private EffectQueueFragment    mF;
       private EffectQueueVertex      mV;
-...
         mQuadPositions.put(positionData).position(0);
         mQuadTexture   = ByteBuffer.allocateDirect(TEX_DATA_SIZE     *dataLength*BYTES_PER_FLOAT).order(ByteOrder.nativeOrder()).asFloatBuffer();
         mQuadTexture.put(textureData).position(0);
         mBufferFBO = new DistortedFramebuffer(1,1);
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
-...
         float halfZ = halfInputW*mesh.zFactor;
         GLES20.glUseProgram(Distorted.mainProgramH);
         GLES20.glViewport(0, 0, df.mWidth, df.mHeight);
         if( mP.mNumEffects==0 )
+          {
           GLES20.glViewport(0, 0, df.mWidth, df.mHeight);
           mM.send(df,halfInputW,halfInputH,halfZ);
           mV.send(halfInputW,halfInputH,halfZ);
           mF.send(halfInputW,halfInputH);
-...
+          }
         else
+          {
           DistortedFramebuffer buffer = Distorted.getFBO(df.mWidth,df.mHeight);
           GLES20.glViewport(0, 0, buffer.mWidth, buffer.mHeight);
           buffer.setAsOutput();
           mBufferFBO.resizeFast(df.mWidth, df.mHeight);
           mBufferFBO.setAsOutput();
           mM.send(buffer,halfInputW,halfInputH,halfZ);
           mM.send(mBufferFBO,halfInputW,halfInputH,halfZ);
           mV.send(halfInputW,halfInputH,halfZ);
           mF.send(halfInputW,halfInputH);
-...
           GLES20.glUseProgram(Distorted.postProgramH);
           GLES20.glViewport(0, 0, df.mWidth, df.mHeight);
           buffer.setAsInput();
           mBufferFBO.setAsInput();
           df.setAsOutput();
           mP.send(halfInputW,halfInputH);

       private boolean mMarked;
       private boolean mDepthWanted;
       private int mTexWidth, mTexHeight;
       // Projection stuff
       private float mX, mY, mFOV;
       int mWidth,mHeight,mDepth;
-...
           GLES20.glTexParameteri(GLES20.GL_TEXTURE_2D, GLES20.GL_TEXTURE_WRAP_T, GLES20.GL_REPEAT);
           GLES20.glTexParameterf(GLES20.GL_TEXTURE_2D, GLES20.GL_TEXTURE_MIN_FILTER, GLES20.GL_NEAREST);
           GLES20.glTexParameterf(GLES20.GL_TEXTURE_2D, GLES20.GL_TEXTURE_MAG_FILTER, GLES20.GL_LINEAR);
           GLES20.glTexImage2D(GLES20.GL_TEXTURE_2D, 0, GLES20.GL_RGBA, mWidth, mHeight, 0, GLES20.GL_RGBA, GLES20.GL_UNSIGNED_BYTE, null);
           GLES20.glTexImage2D(GLES20.GL_TEXTURE_2D, 0, GLES20.GL_RGBA, mTexWidth, mTexHeight, 0, GLES20.GL_RGBA, GLES20.GL_UNSIGNED_BYTE, null);
           GLES20.glGenFramebuffers(1, fboIds, 0);
           GLES20.glBindFramebuffer(GLES20.GL_FRAMEBUFFER, fboIds[0]);
           GLES20.glFramebufferTexture2D(GLES20.GL_FRAMEBUFFER, GLES20.GL_COLOR_ATTACHMENT0, GLES20.GL_TEXTURE_2D, colorIds[0], 0);
           checkStatus("color");
           mList.add(this);
+          }
         if(  mDepthWanted && depthIds[0]==NOT_CREATED_YET ) // we need to create a new DEPTH attachment
         if( mDepthWanted && depthIds[0]==NOT_CREATED_YET ) // we need to create a new DEPTH attachment
+          {
           GLES20.glGenTextures(1, depthIds, 0);
           GLES20.glBindTexture(GLES20.GL_TEXTURE_2D, depthIds[0]);
-...
           GLES20.glTexParameteri(GLES20.GL_TEXTURE_2D, GLES20.GL_TEXTURE_WRAP_T, GLES20.GL_REPEAT);
           GLES20.glTexParameteri(GLES20.GL_TEXTURE_2D, GLES20.GL_TEXTURE_MIN_FILTER, GLES20.GL_NEAREST);
           GLES20.glTexParameteri(GLES20.GL_TEXTURE_2D, GLES20.GL_TEXTURE_MAG_FILTER, GLES20.GL_NEAREST);
           GLES20.glTexImage2D(GLES20.GL_TEXTURE_2D, 0, GLES20.GL_DEPTH_COMPONENT, mWidth, mHeight, 0, GLES20.GL_DEPTH_COMPONENT, GLES20.GL_UNSIGNED_SHORT, null);
           GLES20.glTexImage2D(GLES20.GL_TEXTURE_2D, 0, GLES20.GL_DEPTH_COMPONENT, mTexWidth, mTexHeight, 0, GLES20.GL_DEPTH_COMPONENT, GLES20.GL_UNSIGNED_SHORT, null);
           GLES20.glBindFramebuffer(GLES20.GL_FRAMEBUFFER, fboIds[0]);
           GLES20.glFramebufferTexture2D(GLES20.GL_FRAMEBUFFER, GLES20.GL_DEPTH_ATTACHMENT, GLES20.GL_TEXTURE_2D, depthIds[0], 0);
-...
+          }
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     // if new size fits into the size of the underlying Texture, just change the projection without
     // reallocating the Texture. Otherwise, we need to reallocate.
     //
     // Must be called form a thread holding the OpenGL context.
       void resizeFast(int width, int height)
+        {
         if( mWidth!=width || mHeight!=height )
+          {
           mWidth = width;
           mHeight= height;
           createProjection();
           if( mWidth>mTexWidth || mHeight>mTexHeight )
+            {
             mTexWidth = mWidth;
             mTexHeight= mHeight;
             deleteFBO();
             createFBO();
+            }
+          }
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     // PUBLIC API
     ///////////////////////////////////////////////////////////////////////////////////////////////////
-...
         mHeight     = height;
         mWidth      = width;
         mTexHeight  = height;
         mTexWidth   = width;
         mFOV        = 60.0f;
         mX          = 0.0f;
         mY          = 0.0f;
-...
         depthIds[0]= NOT_CREATED_YET;
         createProjection();
         mList.add(this);
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
-...
+        {
         tex.createTexture();
         tex.setAsInput();
         DistortedFramebuffer.deleteAllMarked();
         DistortedTexture.deleteAllMarked();
         createFBO();
         setAsOutput();
         effects.drawPriv(tex.mHalfX, tex.mHalfY, mesh, this, time);
         DistortedFramebuffer.deleteAllMarked();
         DistortedTexture.deleteAllMarked();
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
-...
         if( fbo.colorIds[0]>0 )    // fbo created with the first constructor
+          {
           DistortedFramebuffer.deleteAllMarked();
           DistortedTexture.deleteAllMarked();
           createFBO();
           setAsOutput();
           GLES20.glBindTexture(GLES20.GL_TEXTURE_2D, fbo.colorIds[0]);
           effects.drawPriv(fbo.mWidth/2, fbo.mHeight/2, mesh, this, time);
           DistortedFramebuffer.deleteAllMarked();
           DistortedTexture.deleteAllMarked();
+          }
+        }
-...
      */
       public void renderTo(DistortedTree dt, long time)
+        {
         DistortedFramebuffer.deleteAllMarked();
         DistortedTexture.deleteAllMarked();
         createFBO();
         setAsOutput();
         dt.drawRecursive(time,this);
         DistortedFramebuffer.deleteAllMarked();
         DistortedTexture.deleteAllMarked();
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
-...
+        {
         if( mWidth!=width || mHeight!=height )
+          {
           mWidth = width;
           mHeight= height;
           mWidth    = width;
           mHeight   = height;
           mTexWidth = width;
           mTexHeight= height;
           createProjection();

Also available in: Unified diff

Project

General

Profile

Distorted Android

Revision 86eb00a9

Added by Leszek Koltunski almost 9 years ago