/ - Diff - Distorted Android

      * @param width Width of the COLOR attachment.
      * @param height Height of the COLOR attachment.
      * @param depthStencil Add DEPTH or STENCIL attachment?
      *                     Valid values: NO_DEPTH_STENCIL, DEPTH_NO_STENCIL, BOTH_DEPTH_STENCIL.
      *                     Valid values: NO_DEPTH_NO_STENCIL, DEPTH_NO_STENCIL, BOTH_DEPTH_STENCIL.
      */
       @SuppressWarnings("unused")
       public DistortedFramebuffer(int width, int height, int depthStencil)
-...
       @SuppressWarnings("unused")
       public DistortedFramebuffer(int width, int height)
+        {
         super(width,height,NOT_CREATED_YET,NO_DEPTH_STENCIL,NOT_CREATED_YET,TYPE_USER);
         super(width,height,NOT_CREATED_YET, NO_DEPTH_NO_STENCIL,NOT_CREATED_YET,TYPE_USER);
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
-...
     /**
      * Enable.disable DEPTH and STENCIL buffers.
+     *
      * @param depthStencil Valid values: NO_DEPTH_STENCIL, DEPTH_NO_STENCIL, BOTH_DEPTH_STENCIL.
      * @param depthStencil Valid values: NO_DEPTH_NO_STENCIL, DEPTH_NO_STENCIL, BOTH_DEPTH_STENCIL.
      */
       public void enableDepthStencil(int depthStencil)
+        {
         if( depthStencil!=NO_DEPTH_STENCIL && mDepthStencilCreated==DONT_CREATE )
         if( depthStencil!= NO_DEPTH_NO_STENCIL && mDepthStencilCreated==DONT_CREATE )
+          {
           mDepthStencilCreated = NOT_CREATED_YET;
           mDepthStencil = depthStencil;
-...
           markForCreation();
+          }
         if( depthStencil==NO_DEPTH_STENCIL && mDepthStencilCreated!=DONT_CREATE )
         if( depthStencil== NO_DEPTH_NO_STENCIL && mDepthStencilCreated!=DONT_CREATE )
+          {
           mDepthStencilCreated = DONT_CREATE;
           mDepthStencil = depthStencil;

       private DistortedInputSurface mSurface;
       private DistortedRenderState mState;
       private NodeData mData;
       private int mFboW, mFboH, mFboDepthStencil;
       private class NodeData
+        {
-...
+          }
         else if( createNewFBO )
+          {
           newData.mFBO = new DistortedFramebuffer(DistortedFramebuffer.DEPTH_NO_STENCIL, DistortedSurface.TYPE_TREE, mSurface.getWidth(),mSurface.getHeight());
           int width  = mFboW <= 0 ? mSurface.getWidth()  : mFboW;
           int height = mFboH <= 0 ? mSurface.getHeight() : mFboH;
           newData.mFBO = new DistortedFramebuffer(mFboDepthStencil, DistortedSurface.TYPE_TREE, width, height);
           //android.util.Log.d("NODE", "creating new FBO "+newData.mFBO.getID() );
+          }
-...
           if( mData.mFBO==null )
+            {
             mData.mFBO = new DistortedFramebuffer(DistortedFramebuffer.DEPTH_NO_STENCIL, DistortedSurface.TYPE_TREE, mSurface.getWidth(),mSurface.getHeight());
             int width  = mFboW <= 0 ? mSurface.getWidth()  : mFboW;
             int height = mFboH <= 0 ? mSurface.getHeight() : mFboH;
             mData.mFBO = new DistortedFramebuffer(mFboDepthStencil, DistortedSurface.TYPE_TREE, width, height);
+            }
           mData.mFBO.setAsOutput(currTime);
-...
         mParent        = null;
         mSurfaceParent = null;
         mFboW            = 0;  // i.e. take this from
         mFboH            = 0;  // mSurface's dimensions
         mFboDepthStencil = DistortedFramebuffer.DEPTH_NO_STENCIL;
         ArrayList<Long> list = new ArrayList<>();
         list.add(mSurface.getID());
         list.add(-mEffects.getID());
-...
         mParent       = null;
         mSurfaceParent= null;
         mFboW            = node.mFboW;
         mFboH            = node.mFboH;
         mFboDepthStencil = node.mFboDepthStencil;
         if( (flags & Distorted.CLONE_SURFACE) != 0 )
+          {
           mSurface = node.mSurface;
-...
+            }
           else if( node.mSurface instanceof DistortedFramebuffer )
+            {
             int depthStencil = DistortedFramebuffer.NO_DEPTH_STENCIL;
             int depthStencil = DistortedFramebuffer.NO_DEPTH_NO_STENCIL;
             if( ((DistortedFramebuffer) node.mSurface).hasDepth() )
+              {
-...
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     /**
      * Returns the DistortedFramebuffer object that's in the Node.
+     *
      * @return The DistortedFramebuffer contained in the Node.
      * Resizes the DistortedFramebuffer object that we render this Node to.
      */
       public DistortedFramebuffer getFramebuffer()
       public void resize(int width, int height)
+        {
         return mData.mFBO;
         mFboW = width;
         mFboH = height;
         if ( mData.mFBO !=null )
+          {
           // TODO: potentially allocate a new NodeData if we have to
           mData.mFBO.resize(width,height);
+          }
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     /**
      * Enables/disables DEPTH and STENCIL buffers in the Framebuffer object that we render this Node to.
      */
       public void enableDepthStencil(int depthStencil)
+        {
         mFboDepthStencil = depthStencil;
         if ( mData.mFBO !=null )
+          {
           // TODO: potentially allocate a new NodeData if we have to
           mData.mFBO.enableDepthStencil(depthStencil);
+          }
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////

     /**
      * Do not create DEPTH or STENCIL attachment
      */
       public static final int NO_DEPTH_STENCIL = 0;
       public static final int NO_DEPTH_NO_STENCIL = 0;
     /**
      * Create DEPTH, but not STENCIL
      */
       public static final int DEPTH_NO_STENCIL = 1;
       public static final int DEPTH_NO_STENCIL    = 1;
     /**
      * Create both DEPTH and STENCIL
      */
       public static final int BOTH_DEPTH_STENCIL= 2;
       public static final int BOTH_DEPTH_STENCIL  = 2;
       private static final int ATTACH = 0;
       private static final int DETACH = 1;
-...
       private float mClearR, mClearG, mClearB, mClearA;
       private float mClearDepth;
       private int mClearStencil;
       private int mClear;
     //private String sNew="", sOld="";
-...
         mFOV = 60.0f;
         mNear=  0.5f;
         mDepthStencilCreated= (depthStencil==NO_DEPTH_STENCIL ? DONT_CREATE:NOT_CREATED_YET);
         mDepthStencilCreated= (depthStencil== NO_DEPTH_NO_STENCIL ? DONT_CREATE:NOT_CREATED_YET);
         mDepthStencil = depthStencil;
         mFBOH[0]         = fbo;
-...
         mClearA = 0.0f;
         mClearDepth = 1.0f;
         mClearStencil = 0;
         mClear = GLES30.GL_DEPTH_BUFFER_BIT | GLES30.GL_COLOR_BUFFER_BIT;
         mBuffer1 = new DistortedFramebuffer[EffectQuality.LENGTH];
-...
               for(int j=0; j<EffectQuality.LENGTH; j++)
+                {
                 mBuffer1[j] = new DistortedFramebuffer( mDepthStencil   , DistortedObject.TYPE_SYST,
                 mBuffer1[j] = new DistortedFramebuffer( mDepthStencil     , DistortedObject.TYPE_SYST,
                                                         (int)(mWidth*mipmap), (int)(mHeight*mipmap) );
                 mBuffer2[j] = new DistortedFramebuffer( NO_DEPTH_STENCIL, DistortedObject.TYPE_SYST,
                 mBuffer2[j] = new DistortedFramebuffer(NO_DEPTH_NO_STENCIL, DistortedObject.TYPE_SYST,
                                                         (int)(mWidth*mipmap), (int)(mHeight*mipmap) );
                 mBuffer1[j].mMipmap = mipmap;
                 mipmap *= EffectQuality.MULTIPLIER;
-...
         if( mTime!=time )
+          {
           mTime = time;
           DistortedRenderState.colorDepthOn();
           DistortedRenderState.colorDepthStencilOn();
           GLES30.glClearColor(mClearR, mClearG, mClearB, mClearA);
           GLES30.glClearDepthf(mClearDepth);
           GLES30.glClearStencil(mClearStencil);
           GLES30.glClear(mClear);
+          }
+        }
-...
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     /**
      * Set the Depth value of GLES30.glClearDepthf() to set up depth with which to clear
      * the Depth buffer of Surface at the beginning of each frame.
      * Uses glClearDepthf() to set up a value with which to clear
      * the Depth buffer of our Surface at the beginning of each frame.
+     *
      * @param d the Depth. Default: 1.0f
      */
-...
         mClearDepth = d;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     /**
      * Uses glClearStencil() to set up a value with which to clear the
      * Stencil buffer of our Surface at the beginning of each frame.
+     *
      * @param s the Stencil. Default: 0
      */
       public void glClearStencil(int s)
+        {
         mClearStencil = s;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     /**
      * Which buffers to Clear at the beginning of each frame?

      */
     class DistortedRenderState
+    {
       // TODO: figure this out dynamically; this assumes 8 bit stencil buffer.
       private static final int STENCIL_MASK = (1<<8)-1;
       private static int sColorMaskR, sColorMaskG, sColorMaskB, sColorMaskA;   //
       private static int sDepthMask;                                           //
       private static int sStencilMask;                                         //
-...
         mBlendDst   = GLES30.GL_ONE_MINUS_SRC_ALPHA;
         mStencilTest     = 0;
         mStencilMask     = 0x11111111;
         mStencilMask     = STENCIL_MASK;
         mStencilFuncFunc = GLES30.GL_NEVER;
         mStencilFuncRef  = 0;
         mStencilFuncMask = 0x11111111;
         mStencilFuncMask = STENCIL_MASK;
         mStencilOpSfail  = GLES30.GL_KEEP;
         mStencilOpDpfail = GLES30.GL_KEEP;
         mStencilOpDppass = GLES30.GL_KEEP;
-...
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       static void colorDepthOn()
       static void colorDepthStencilOn()
+        {
         if( sColorMaskR!=1 || sColorMaskG!=1 || sColorMaskB!=1 || sColorMaskA!=1 )
+          {
-...
           sDepthMask = 1;
           GLES30.glDepthMask(true);
+          }
         if( sStencilMask!= STENCIL_MASK )
+          {
           sStencilMask = STENCIL_MASK;
           GLES30.glStencilMask(sStencilMask);
+          }
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////

Project

General

Profile

Distorted Android

Revision 23eecbd9

Added by Leszek Koltunski over 8 years ago