/ - Diff - Distorted Android

« Previous | Next »

Revision a4b182d4

Added by Leszek Koltunski over 6 years ago

ID a4b182d481d762b518cf8dcc67c9c47426f21950
Parent 3493ef61
Child 61441ce2

Introduce possibility that an OutputSurface is backed up by a larger texture than necessary and the 'cloneSize()' method.

src/main/java/org/distorted/library/main/DistortedFramebuffer.java
54	54	GLES31.glTexParameteri(GLES31.GL_TEXTURE_2D, GLES31.GL_TEXTURE_WRAP_T, GLES31.GL_REPEAT);
55	55	GLES31.glTexParameterf(GLES31.GL_TEXTURE_2D, GLES31.GL_TEXTURE_MIN_FILTER, GLES31.GL_NEAREST);
56	56	GLES31.glTexParameterf(GLES31.GL_TEXTURE_2D, GLES31.GL_TEXTURE_MAG_FILTER, GLES31.GL_LINEAR);
57		GLES31.glTexImage2D(GLES31.GL_TEXTURE_2D, 0, GLES31.GL_RGBA, mWidth, mHeight, 0, GLES31.GL_RGBA, GLES31.GL_UNSIGNED_BYTE, null);
	57	GLES31.glTexImage2D(GLES31.GL_TEXTURE_2D, 0, GLES31.GL_RGBA, mRealWidth, mRealHeight, 0, GLES31.GL_RGBA, GLES31.GL_UNSIGNED_BYTE, null);
58	58	}
59	59	GLES31.glFramebufferTexture2D(GLES31.GL_FRAMEBUFFER, GLES31.GL_COLOR_ATTACHMENT0, GLES31.GL_TEXTURE_2D, mColorH[0], 0);
60	60	GLES31.glBindTexture(GLES31.GL_TEXTURE_2D, 0);
...	...
73	73
74	74	if( mDepthStencil==DEPTH_NO_STENCIL )
75	75	{
76		GLES31.glTexImage2D(GLES31.GL_TEXTURE_2D, 0, GLES31.GL_DEPTH_COMPONENT, mWidth, mHeight, 0, GLES31.GL_DEPTH_COMPONENT, GLES31.GL_UNSIGNED_INT, null);
	76	GLES31.glTexImage2D(GLES31.GL_TEXTURE_2D, 0, GLES31.GL_DEPTH_COMPONENT, mRealWidth, mRealHeight, 0, GLES31.GL_DEPTH_COMPONENT, GLES31.GL_UNSIGNED_INT, null);
77	77	}
78	78	else if( mDepthStencil==BOTH_DEPTH_STENCIL )
79	79	{
80		GLES31.glTexImage2D(GLES31.GL_TEXTURE_2D, 0, GLES31.GL_DEPTH24_STENCIL8, mWidth, mHeight, 0, GLES31.GL_DEPTH_STENCIL, GLES31.GL_UNSIGNED_INT_24_8, null);
	80	GLES31.glTexImage2D(GLES31.GL_TEXTURE_2D, 0, GLES31.GL_DEPTH24_STENCIL8, mRealWidth, mRealHeight, 0, GLES31.GL_DEPTH_STENCIL, GLES31.GL_UNSIGNED_INT_24_8, null);
81	81	}
82	82
83	83	GLES31.glBindTexture(GLES31.GL_TEXTURE_2D, 0);

      * A Surface that we can set as an Input (take its rectangle of pixels and skin a Mesh with it).
      */
     // This really ought to be an abstract class instead, but effing Java has no multiple inheritance...
     public interface DistortedInputSurface
+    {
     /**

       private int mDebugLevel;
       protected int mRealWidth;   // the Surface can be backed up with a texture that is
       protected int mRealHeight;  // larger than the viewport we have to it.
                                   // mWidth,mHeight are the sizes of the Viewport, those -
                                   // sizes of the backing up texture.
       ////////////////////////////////////////////////////////////////////////////////
       // section dealing with Shader Storage Buffer Object (for counting transparency)
       private static final int FRAME_DELAY = 3;
-...
+        {
         super(width,height,createColor,numcolors,type);
         mRealWidth = width;
         mRealHeight= height;
         mProjectionMatrix = new float[16];
         mFOV = 60.0f;
-...
           mBuffer[j].mMipmap = mipmap;
           mBuffer[j].mNear   = mNear;  // copy mNear as well (for blitting- see PostprocessEffect.apply() )
           mBuffer[j].glClearColor(1.0f,1.0f,1.0f,0.0f);
           mipmap *= EffectQuality.MULTIPLIER;
+          }
-...
+          }
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       private void cloneSize(DistortedOutputSurface from)
+        {
         mWidth = from.mWidth;
         mHeight= from.mHeight;
         createProjection();
         int maxw = mWidth >mRealWidth  ? mWidth :mRealWidth ;
         int maxh = mHeight>mRealHeight ? mHeight:mRealHeight;
         if( maxw>mRealWidth || maxh>mRealHeight )
+          {
           mRealWidth = maxw;
           mRealHeight= maxh;
           recreateSurface();
           createSurface();
+          }
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       private int blitWithDepth(long currTime, DistortedOutputSurface buffer)
-...
+              {
               android.util.Log.d("surface", "id " + mSurfaceID +
                   (mType == TYPE_USER ? " USER" : (mType == TYPE_SYST ? " SYST" : " TREE")) +
                   " (" + mWidth + "x" + mHeight + ") last frame: " + (value - mLastValue[mLastIndex])
                   "viewport: (" + mWidth + "x" + mHeight + ") last frame: " + (value - mLastValue[mLastIndex])
                   + " avg: " + (mAvgSum/RUNNING_AVERAGE)
               );
+              }
-...
+        {
         if( mWidth!=width || mHeight!=height )
+          {
           mWidth = width;
           mHeight= height;
           mWidth = mRealWidth = width;
           mHeight= mRealHeight= height;
           createProjection();

Also available in: Unified diff

Project

General

Profile

Distorted Android

Revision a4b182d4

Added by Leszek Koltunski over 6 years ago