/ - Diff - Distorted Android

« Previous | Next »

Revision a436ccc5

Added by Leszek Koltunski over 8 years ago

ID a436ccc58e0cc056c9583123354005faf9cb666e
Parent af27df87
Child 63b6561a

1. Make it possible to enable/disable DEPTH test when rendering to a Screen
2. Using this, remove the 'Root' Node from StarWars.

      */
     public class DistortedFramebuffer extends DistortedOutputSurface implements DistortedInputSurface
+      {
       private int[] mDepthH = new int[1];
       private int[] mFBOH   = new int[1];
       private boolean mDepthEnabled;
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     // Must be called from a thread holding OpenGL Context
-...
     // create 'system' Framebuffers, i.e. those that are used internally by the library.
     // Those do not get removed in onDestroy();
       public DistortedFramebuffer(boolean depthEnabled, int width, int height)
       DistortedFramebuffer(boolean depthEnabled, int width, int height)
+        {
         super(width,height,NOT_CREATED_YET,true);
         mDepthEnabled= depthEnabled;
         mFBOH[0]     = NOT_CREATED_YET;
         mDepthH[0]   = NOT_CREATED_YET;
         super(width,height,NOT_CREATED_YET,NOT_CREATED_YET,true, depthEnabled);
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
-...
       @SuppressWarnings("unused")
       public DistortedFramebuffer(int width, int height, boolean depthEnabled)
+        {
         super(width,height,NOT_CREATED_YET,false);
         mDepthEnabled= depthEnabled;
         mFBOH[0]     = NOT_CREATED_YET;
         mDepthH[0]   = NOT_CREATED_YET;
         super(width,height,NOT_CREATED_YET,NOT_CREATED_YET,false, depthEnabled);
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
-...
       @SuppressWarnings("unused")
       public DistortedFramebuffer(int width, int height)
+        {
         super(width,height,NOT_CREATED_YET,false);
         mDepthEnabled= false;
         mFBOH[0]     = NOT_CREATED_YET;
         mDepthH[0]   = NOT_CREATED_YET;
         super(width,height,NOT_CREATED_YET,NOT_CREATED_YET,false,false);
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     /**
      * Bind the underlying rectangle of pixels as a OpenGL Texture.
+     *
      * @returns <code>true</code> if successful.
      * @return <code>true</code> if successful.
      */
       public boolean setAsInput()
+        {
-...
         return false;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     /**
      * Bind this Surface as a Framebuffer we can render to.
      */
       public void setAsOutput()
+        {
         GLES30.glBindFramebuffer(GLES30.GL_FRAMEBUFFER, mFBOH[0]);
         if( mDepthH[0]!=NOT_CREATED_YET )
+          {
           GLES30.glEnable(GLES30.GL_DEPTH_TEST);
           GLES30.glDepthMask(true);
+          }
         else
+          {
           GLES30.glDisable(GLES30.GL_DEPTH_TEST);
           GLES30.glDepthMask(false);
+          }
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     /**
      * Create a new DEPTH buffer and attach it or (param=false) detach an existing DEPTh attachment and recreate it.
+     *
      * @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 enableDepthAttachment(boolean enable)
+        {
         if( mDepthEnabled!=enable )
+          {
           mDepthEnabled = enable;
           moveToToDo();
+          }
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     /**
      * Return the ID of the Texture (COLOR attachment 0) that's backing this FBO.
-...
+        {
         return mColorH[0];
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     /**
      * Return true if the FBO contains a DEPTH attachment.
+     *
      * @return <bold>true</bold> if the FBO contains a DEPTH attachment.
      */
       public boolean hasDepth()
+        {
         return mDepthEnabled;
+        }
+      }

     package org.distorted.library;
     import android.opengl.GLES30;
     import android.opengl.Matrix;
     import java.util.ArrayList;
-...
       float mDistance;
       float[] mProjectionMatrix;
       boolean mDepthEnabled;
       int[] mDepthH = new int[1];
       int[] mFBOH   = new int[1];
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       DistortedOutputSurface(int width, int height, int color, boolean system)
       DistortedOutputSurface(int width, int height, int color, int fbo, boolean system, boolean depth)
+        {
         super(width,height,color,system);
-...
         mX   =  0.0f;
         mY   =  0.0f;
         mDepthEnabled= depth;
         mFBOH[0]     = fbo;
         mDepthH[0]   = color;
         createProjection();
+        }
-...
     /**
      * Bind this Surface as a Framebuffer we can render to.
      */
       public abstract void setAsOutput();
       public void setAsOutput()
+        {
         GLES30.glBindFramebuffer(GLES30.GL_FRAMEBUFFER, mFBOH[0]);
         if( mDepthEnabled && mDepthH[0]!=NOT_CREATED_YET )
+          {
           GLES30.glEnable(GLES30.GL_DEPTH_TEST);
           GLES30.glDepthMask(true);
+          }
         else
+          {
           GLES30.glDisable(GLES30.GL_DEPTH_TEST);
           GLES30.glDepthMask(false);
+          }
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     /**
-...
+          }
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     /**
      * Create a new DEPTH buffer and attach it or (param=false) detach an existing DEPTH attachment and recreate it.
+     *
      * @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 enableDepth(boolean enable)
+        {
         if( mDepthEnabled!=enable )
+          {
           mDepthEnabled = enable;
           moveToToDo();
+          }
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     /**
      * Return true if the Surface contains a DEPTH attachment.
+     *
      * @return <bold>true</bold> if the FBO contains a DEPTH attachment.
      */
       public boolean hasDepth()
+        {
         return mDepthEnabled;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     /**
      * Adds a new child to the last position in the list of our Surface's children.

     package org.distorted.library;
     import android.opengl.GLES30;
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     /**
      * Class which represents the Screen.
-...
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     // here we don't manage underlying OpenGL assets ourselves
       void create()  {}
       void delete()  {}
       void create()   {}
       void delete()   {}
       void recreate() {}
     ///////////////////////////////////////////////////////////////////////////////////////////////////
-...
      */
       public DistortedScreen()
+        {
         super(0,0,DONT_CREATE,false);
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     /**
      * Bind this Surface as a Framebuffer we can render to.
      */
       public void setAsOutput()
+        {
         GLES30.glBindFramebuffer(GLES30.GL_FRAMEBUFFER, 0);
         GLES30.glEnable(GLES30.GL_DEPTH_TEST);
         GLES30.glDepthMask(true);
         super(0,0,DONT_CREATE,0,false,true);
+        }
+      }

Also available in: Unified diff

Project

General

Profile

Distorted Android

Revision a436ccc5

Added by Leszek Koltunski over 8 years ago