/ - Diff - Distorted Android

« Previous | Next »

Revision 8c327653

Added by Leszek Koltunski almost 9 years ago

ID 8c32765362d8bbbfd33b8e079945433d8de31736
Parent 05403bba
Child 8337fa41

First attempt at making it possible to dynamically add and remove DEPTH attachments from an FBO.

src/main/java/org/distorted/library/Distorted.java
112	112	mainProgram.bindAndEnableAttributes();
113	113	mMainProgramAttributes = mainProgram.getAttributes();
114	114
115		GLES20.glEnable (GLES20.GL_DEPTH_TEST);
116	115	GLES20.glDepthFunc(GLES20.GL_LEQUAL);
117	116	GLES20.glEnable(GLES20.GL_BLEND);
118	117	GLES20.glBlendFunc(GLES20.GL_SRC_ALPHA, GLES20.GL_ONE_MINUS_SRC_ALPHA);

      */
     public class DistortedFramebuffer
+      {
       private static final int TEXTURE_FAILED_TO_CREATE = -1;
       private static final int TEXTURE_NOT_CREATED_YET  = -2;
       private static final int TEXTURE_DONT_CREATE      = -3;
       private static final int FAILED_TO_CREATE = -1;
       private static final int NOT_CREATED_YET  = -2;
       private static final int DONT_CREATE      = -3;
       private static boolean mListMarked = false;
       private static LinkedList<DistortedFramebuffer> mList = new LinkedList<>();
       private int[] texIds = new int[1];
       private int[] fboIds = new int[1];
       private int[] colorIds = new int[1];
       private int[] depthIds = new int[1];
       private int[] fboIds   = new int[1];
       private boolean mMarked;
       private boolean mDepthWanted;
       // Projection stuff
       private float mX, mY, mFOV;
-...
       boolean createFBO()
+        {
         if( texIds[0]==TEXTURE_NOT_CREATED_YET )
         if( colorIds[0]==NOT_CREATED_YET )
+          {
           GLES20.glGenTextures(1, texIds, 0);
           GLES20.glBindTexture(GLES20.GL_TEXTURE_2D, texIds[0]);
           GLES20.glGenTextures(1, colorIds, 0);
           GLES20.glBindTexture(GLES20.GL_TEXTURE_2D, colorIds[0]);
           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.glTexParameteri(GLES20.GL_TEXTURE_2D, GLES20.GL_TEXTURE_WRAP_S, GLES20.GL_REPEAT);
-...
           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, texIds[0], 0);
           GLES20.glFramebufferTexture2D(GLES20.GL_FRAMEBUFFER, GLES20.GL_COLOR_ATTACHMENT0, GLES20.GL_TEXTURE_2D, colorIds[0], 0);
           int status = GLES20.glCheckFramebufferStatus(GLES20.GL_FRAMEBUFFER);
           if(status != GLES20.GL_FRAMEBUFFER_COMPLETE)
+            {
             android.util.Log.e("DistortedFramebuffer", "failed to create framebuffer, error="+status);
             GLES20.glDeleteTextures(1, texIds, 0);
             GLES20.glDeleteTextures(1, colorIds, 0);
             GLES20.glDeleteFramebuffers(1, fboIds, 0);
             fboIds[0] = 0;
             texIds[0] = TEXTURE_FAILED_TO_CREATE;
             fboIds[0]   = 0;
             colorIds[0] = FAILED_TO_CREATE;
             return false;
+            }
-...
           //android.util.Log.e("FBO", "created ("+mWidth+","+mHeight+") "+fboIds[0]);
+          }
         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_S, GLES20.GL_REPEAT);
           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_FLOAT, null);
           GLES20.glBindFramebuffer(GLES20.GL_FRAMEBUFFER, fboIds[0]);
           GLES20.glFramebufferTexture2D(GLES20.GL_FRAMEBUFFER, GLES20.GL_DEPTH_ATTACHMENT, GLES20.GL_TEXTURE_2D, depthIds[0], 0);
           int status = GLES20.glCheckFramebufferStatus(GLES20.GL_FRAMEBUFFER);
           if(status != GLES20.GL_FRAMEBUFFER_COMPLETE)
+            {
             android.util.Log.e("DistortedFramebuffer", "failed to create depth, error="+status);
             GLES20.glDeleteTextures(1, colorIds, 0);
             GLES20.glDeleteFramebuffers(1, fboIds, 0);
             fboIds[0]   = 0;
             depthIds[0] = FAILED_TO_CREATE;
             return false;
+            }
+          }
         if( !mDepthWanted && depthIds[0]!=NOT_CREATED_YET ) // we need to detach and destroy the DEPTH attachment.
+          {
           GLES20.glDeleteTextures(1, depthIds, 0);
           depthIds[0]=NOT_CREATED_YET;
+          }
         return true;
+        }
-...
       private void deleteFBO()
+        {
         if( texIds[0]>=0 )
         if( colorIds[0]>=0 )
+          {
           //android.util.Log.e("FBO", "deleting ("+mWidth+","+mHeight+") "+fboIds[0]);
           GLES20.glDeleteTextures(1, texIds, 0);
           GLES20.glDeleteFramebuffers(1, fboIds, 0);
           if( depthIds[0]>=0 )
+            {
             GLES20.glDeleteTextures(1, depthIds, 0);
             depthIds[0]=NOT_CREATED_YET;
+            }
           GLES20.glDeleteTextures(1, colorIds, 0);
           colorIds[0] = NOT_CREATED_YET;
           GLES20.glDeleteFramebuffers(1, fboIds, 0);
           fboIds[0] = 0;
           texIds[0] = TEXTURE_NOT_CREATED_YET;
+          }
         mMarked = false;
-...
       void reset()
+        {
         if( texIds[0]!=TEXTURE_DONT_CREATE)
           texIds[0] = TEXTURE_NOT_CREATED_YET;
         if( colorIds[0]!=DONT_CREATE )
           colorIds[0] = NOT_CREATED_YET;
         if( mDepthWanted ) depthIds[0] = NOT_CREATED_YET;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
-...
       void setAsOutput()
+        {
         GLES20.glBindFramebuffer(GLES20.GL_FRAMEBUFFER, fboIds[0]);
         if( depthIds[0]!=NOT_CREATED_YET )
+          {
           GLES20.glEnable(GLES20.GL_DEPTH_TEST);
           GLES20.glDepthMask(true);
+          }
         else
+          {
           GLES20.glDisable(GLES20.GL_DEPTH_TEST);
           GLES20.glDepthMask(false);
+          }
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       void setAsInput()
+        {
         GLES20.glBindTexture(GLES20.GL_TEXTURE_2D, texIds[0]);
         GLES20.glBindTexture(GLES20.GL_TEXTURE_2D, colorIds[0]);
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
-...
+        {
         mProjectionMatrix = new float[16];
         mHeight  = height;
         mWidth   = width;
         fboIds[0]= -1;
         texIds[0]= TEXTURE_NOT_CREATED_YET;
         mFOV     = 60.0f;
         mX       = 0.0f;
         mY       = 0.0f;
         mMarked  = false;
         mHeight     = height;
         mWidth      = width;
         mFOV        = 60.0f;
         mX          = 0.0f;
         mY          = 0.0f;
         mMarked     = false;
         mDepthWanted= false;
         fboIds[0]  =-1;
         colorIds[0]= NOT_CREATED_YET;
         depthIds[0]= NOT_CREATED_YET;
         createProjection();
+        }
-...
+        {
         mProjectionMatrix = new float[16];
         fboIds[0]= fbo;
         texIds[0]= TEXTURE_DONT_CREATE;
         mFOV     = 60.0f;
         mX       = 0.0f;
         mY       = 0.0f;
         mMarked  = false;
         mFOV        = 60.0f;
         mX          = 0.0f;
         mY          = 0.0f;
         mMarked     = false;
         mDepthWanted= true;
         fboIds[0]  = fbo;
         colorIds[0]= DONT_CREATE;
         depthIds[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.
      */
       public void setDepthAttachment(boolean hasDepthAttachment)
+        {
         mDepthWanted = hasDepthAttachment;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     /**
      * Draw the (texture,mesh,effects) object to the Framebuffer.
      * <p>
-...
         tex.createTexture();
         tex.setAsInput();
         createFBO();
         GLES20.glBindFramebuffer(GLES20.GL_FRAMEBUFFER, fboIds[0]);
         setAsOutput();
         effects.drawPriv(tex.mHalfX, tex.mHalfY, mesh, this, time);
         DistortedFramebuffer.deleteAllMarked();
         DistortedTexture.deleteAllMarked();
-...
+        {
         fbo.createFBO();
         if( fbo.texIds[0]>0 )    // fbo created with the first constructor
         if( fbo.colorIds[0]>0 )    // fbo created with the first constructor
+          {
           createFBO();
           GLES20.glBindFramebuffer(GLES20.GL_FRAMEBUFFER, fboIds[0]);
           GLES20.glBindTexture(GLES20.GL_TEXTURE_2D, fbo.texIds[0]);
           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)
+        {
         createFBO();
         GLES20.glBindFramebuffer(GLES20.GL_FRAMEBUFFER, fboIds[0]);
         setAsOutput();
         dt.drawRecursive(time,this);
         DistortedFramebuffer.deleteAllMarked();
         DistortedTexture.deleteAllMarked();
-...
           createProjection();
           if( texIds[0]>0 ) markForDeletion();
           if( colorIds[0]>0 ) markForDeletion();
+          }
+        }
-...
      */
       public int getTextureID()
+        {
         return texIds[0];
         return colorIds[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 mDepthWanted;
+        }
+      }

src/main/java/org/distorted/library/DistortedTree.java
50	50	long ID;
51	51	int numPointingNodes;
52	52	int numRendered;
53		DistortedFramebuffer mDF;
	53	DistortedFramebuffer mFBO;
54	54
55	55	NodeData(long id)
56	56	{
57	57	ID = id;
58	58	numPointingNodes= 1;
59	59	numRendered = 0;
60		mDF = null;
	60	mFBO = null;
61	61	}
62	62	}
63	63
...	...
124	124
125	125	if( newList.size()>1 )
126	126	{
127		if( mData.mDF==null )
128		mData.mDF = new DistortedFramebuffer(mTexture.getWidth(), mTexture.getHeight());
	127	if( mData.mFBO ==null )
	128	mData.mFBO = new DistortedFramebuffer(mTexture.getWidth(), mTexture.getHeight());
129	129	}
130	130	else
131	131	{
132		if( mData.mDF!=null )
	132	if( mData.mFBO !=null )
133	133	{
134		mData.mDF.markForDeletion();
135		mData.mDF = null;
	134	mData.mFBO.markForDeletion();
	135	mData.mFBO = null;
136	136	}
137	137	else
138	138	{
...	...
160	160	{
161	161	tmp = mMapNodeID.get(key);
162	162
163		if( tmp.mDF != null )
	163	if( tmp.mFBO != null )
164	164	{
165		tmp.mDF.reset();
	165	tmp.mFBO.reset();
166	166	tmp.numRendered = 0;
167	167	}
168	168	}
...	...
212	212	}
213	213	else
214	214	{
215		mData.mDF.createFBO();
	215	mData.mFBO.createFBO();
216	216
217	217	if( mData.numRendered==0 )
218	218	{
219		mData.mDF.setAsOutput();
	219	mData.mFBO.setAsOutput();
220	220
221	221	GLES20.glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
222	222	GLES20.glClear( GLES20.GL_DEPTH_BUFFER_BIT \| GLES20.GL_COLOR_BUFFER_BIT);
223	223
224	224	if( mTexture.setAsInput() )
225		mEffects.drawNoEffectsPriv(mTexture.mHalfX, mTexture.mHalfY, mMesh, mData.mDF);
	225	mEffects.drawNoEffectsPriv(mTexture.mHalfX, mTexture.mHalfY, mMesh, mData.mFBO);
226	226
227	227	synchronized(this)
228	228	{
229	229	for(int i=0; i<mNumChildren[0]; i++)
230	230	{
231		mChildren.get(i).drawRecursive(currTime, mData.mDF);
	231	mChildren.get(i).drawRecursive(currTime, mData.mFBO);
232	232	}
233	233	}
234	234	}
...	...
237	237	mData.numRendered %= mData.numPointingNodes;
238	238
239	239	df.setAsOutput();
240		mData.mDF.setAsInput();
	240	mData.mFBO.setAsInput();
241	241	}
242	242
243	243	mEffects.drawPriv(mTexture.mHalfX, mTexture.mHalfY, mMesh, df, currTime);
...	...
476	476	return mTexture;
477	477	}
478	478
479		}
	479	///////////////////////////////////////////////////////////////////////////////////////////////////
	480	/**
	481	* Returns the DistortedFramebuffer object that's in the Node.
	482	*
	483	* @return The DistortedFramebuffer contained in the Node.
	484	*/
	485	public DistortedFramebuffer getFramebuffer()
	486	{
	487	return mData.mFBO;
	488	}
480	489
	490	}

Also available in: Unified diff

Project

General

Profile

Distorted Android

Revision 8c327653

Added by Leszek Koltunski almost 9 years ago