/ - Diff - Distorted Android

« Previous | Next »

Revision 88c7b603

Added by Leszek Koltunski almost 6 years ago

ID 88c7b603197e34a72ff4d579dba78ed49594b768
Parent b52f9415
Child 9ab3b712

Reengineer DistortedScreen

     public class DistortedFramebuffer extends DistortedOutputSurface implements DistortedInputSurface
+      {
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       void prepareDebug(long time) {}
       void renderDebug(long time)  {}
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     // Must be called from a thread holding OpenGL Context

      */
     public abstract class DistortedOutputSurface extends DistortedSurface implements DistortedMaster.Slave
+    {
     //////////// DEBUG FLAGS /////////////////////////////////////////////
     /**
      * When rendering a Screen, show FPS in the upper-left corner?
      */
     public static final int DEBUG_FPS = 1;
     //////////// END DEBUG FLAGS /////////////////////////////////////////
     /**
      * Do not create DEPTH or STENCIL attachment
      */
-...
       private int mClear;
       float mMipmap;
       private int mDebugLevel;
       int mRealWidth;   // the Surface can be backed up with a texture that is
       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.
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       abstract void prepareDebug(long time);
       abstract void renderDebug(long time);
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       DistortedOutputSurface(int width, int height, int createColor, int numcolors, int depthStencil, int fbo, int type)
-...
         mDepthStencilH[0]= 0;
         mTime = 0;
         mDebugLevel = 0;
         mClearR = 0.0f;
         mClearG = 0.0f;
-...
         DistortedRenderState.enableStencil();
         // we cannot compare DEPTH24_STENCIL8 format to DEPTH32 which oitRender's fragment shader expects. Remount!
         if( mDepthStencil==BOTH_DEPTH_STENCIL )
+          {
           GLES31.glBindFramebuffer(GLES31.GL_FRAMEBUFFER, mFBOH[0]);
           GLES31.glFramebufferTexture2D(GLES31.GL_FRAMEBUFFER, GLES31.GL_DEPTH_STENCIL_ATTACHMENT, GLES31.GL_TEXTURE_2D, 0, 0);
           GLES31.glFramebufferTexture2D(GLES31.GL_FRAMEBUFFER, GLES31.GL_DEPTH_ATTACHMENT, GLES31.GL_TEXTURE_2D, mDepthStencilH[0], 0);
+          }
         DistortedEffects.oitRender(this, buffer.getWidthCorrection(), buffer.getHeightCorrection() );
         if( mDepthStencil==BOTH_DEPTH_STENCIL )
+          {
           GLES31.glBindFramebuffer(GLES31.GL_FRAMEBUFFER, mFBOH[0]);
           GLES31.glFramebufferTexture2D(GLES31.GL_FRAMEBUFFER, GLES31.GL_DEPTH_ATTACHMENT, GLES31.GL_TEXTURE_2D, 0, 0);
           GLES31.glFramebufferTexture2D(GLES31.GL_FRAMEBUFFER, GLES31.GL_DEPTH_STENCIL_ATTACHMENT, GLES31.GL_TEXTURE_2D, mDepthStencilH[0], 0);
+          }
         GLES31.glActiveTexture(GLES31.GL_TEXTURE1);
         GLES31.glBindTexture(GLES31.GL_TEXTURE_2D, 0);
-...
+          }
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       void clear()
+        {
         DistortedRenderState.colorDepthStencilOn();
         GLES31.glClearColor(mClearR, mClearG, mClearB, mClearA);
         GLES31.glClearDepthf(mClearDepth);
         GLES31.glClearStencil(mClearStencil);
         GLES31.glClear(mClear);
         DistortedRenderState.colorDepthStencilRestore();
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     // Render all children, one by one. If there are no postprocessing effects, just render to THIS.
     // Otherwise, render to a buffer and on each change of Postprocessing Bucket, apply the postprocessing
-...
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     // PUBLIC API
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     /**
      * Make the library show various debugging information.
      * <p>
      * Currently only DEBUG_FPS - show FPS in the upper-left corner of every Screen - is defined.
+     *
      * @param bitmask 0, or a bitmask of DEBUG_** flags to enable (currently only DEBUG_FPS defined)
      */
       public void setDebug(int bitmask)
+        {
         if( this instanceof DistortedScreen )
           mDebugLevel = bitmask;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     /**
      * Draws all the attached children to this OutputSurface.
      * <p>
-...
      */
       public int render(long time)
+        {
         if( mDebugLevel!=0 ) prepareDebug(time);
         // change tree topology (attach and detach children)
     /*
         boolean changed1 =
-...
         setAsOutput(time);
         numRenders += renderChildren(time,mNumChildren,mChildren);
         if( mDebugLevel != 0 ) renderDebug(time);
         return numRenders;
+        }
-...
         if( mTime!=time )
+          {
           mTime = time;
           DistortedRenderState.colorDepthStencilOn();
           GLES31.glClearColor(mClearR, mClearG, mClearB, mClearA);
           GLES31.glClearDepthf(mClearDepth);
           GLES31.glClearStencil(mClearStencil);
           GLES31.glClear(mClear);
           DistortedRenderState.colorDepthStencilRestore();
           clear();
+          }
+        }

      * <p>
      * User is able to render to it just like to a DistortedFramebuffer.
      */
     public class DistortedScreen extends DistortedOutputSurface
     public class DistortedScreen extends DistortedFramebuffer
+      {
       ///// DEBUGGING ONLY /////////////////////////
       private boolean mShowFPS;
       private static final int NUM_FRAMES  = 100;
       private MeshObject fpsMesh;
-...
       private Bitmap fpsBitmap;
       private Paint mPaint;
       private int fpsH, fpsW;
       private String fpsString = "";
       private String fpsString;
       private long lastTime=0;
       private long[] durations;
       private int currDuration;
       private static MatrixEffectMove mMoveEffect = new MatrixEffectMove( new Static3D(5,5,0) );
       private boolean mInitialized;
       ///// END DEBUGGING //////////////////////////
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     // here we don't manage underlying OpenGL assets ourselves
       void create()   {}
       void delete()   {}
       void recreate() {}
     // PUBLIC API
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     /**
      * Create a new Screen. Initially 1x1 in size.
      * <p>
      * Has to be followed by a 'resize()' to set the size.
      */
       public DistortedScreen()
+        {
         super(1,1,1,BOTH_DEPTH_STENCIL);
         mShowFPS = false;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     /**
      * Draws all the attached children to this OutputSurface.
      * <p>
      * Must be called from a thread holding OpenGL Context.
+     *
      * @param time Current time, in milliseconds. This will be passed to all the Effects stored in the children Nodes.
      * @return Number of objects rendered.
      */
       public int render(long time)
+        {
         if( mShowFPS )
+          {
           if( lastTime==0 ) lastTime = time;
       private void initialize()
           currDuration++;
           if (currDuration >= NUM_FRAMES) currDuration = 0;
           durations[NUM_FRAMES] += ((time - lastTime) - durations[currDuration]);
           durations[currDuration] = time - lastTime;
           fpsString = "" + ((int)(10000.0f*NUM_FRAMES/durations[NUM_FRAMES]))/10.0f;
           mPaint.setColor(0xffffffff);
           fpsCanvas.drawRect(0, 0, fpsW, fpsH, mPaint);
           mPaint.setColor(0xff000000);
           fpsCanvas.drawText(fpsString, fpsW/2, 0.75f*fpsH, mPaint);
           fpsTexture.setTexture(fpsBitmap);
           lastTime = time;
+          }
         int numrender = super.render(time);
         GLES31.glBindFramebuffer(GLES31.GL_FRAMEBUFFER, 0);
         clear();
         setAsInput();
         GLES31.glColorMask(true,true,true,true);
         GLES31.glDepthMask(false);
         GLES31.glDisable(GLES31.GL_STENCIL_TEST);
         GLES31.glDisable(GLES31.GL_DEPTH_TEST);
         DistortedEffects.blitPriv(this);
         if( mShowFPS && fpsTexture.setAsInput())
+          {
           fpsEffects.drawPriv(fpsW / 2.0f, fpsH / 2.0f, fpsMesh, this, time, 0);
+          }
         return numrender+1;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     /**
      * Make the library show Frames Per Second in the upper-left corner.
      * <p>
      */
       public void showFPS()
+        {
         mShowFPS = true;
         fpsW = 120;
         fpsH =  70;
         fpsString = "";
         fpsBitmap = Bitmap.createBitmap(fpsW,fpsH, Bitmap.Config.ARGB_8888);
         fpsMesh = new MeshFlat(1,1);
         fpsTexture = new DistortedTexture(fpsW,fpsH);
-...
         for(int i=0; i<NUM_FRAMES+1; i++) durations[i]=16;  // Assume FPS will be
         durations[NUM_FRAMES] = NUM_FRAMES*16;              // close to 1000/16 ~ 60
         mInitialized=true;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       void prepareDebug(long time)
+        {
         if( !mInitialized ) initialize();
         if( lastTime==0 ) lastTime = time;
         currDuration++;
         if (currDuration >= NUM_FRAMES) currDuration = 0;
         durations[NUM_FRAMES] += ((time - lastTime) - durations[currDuration]);
         durations[currDuration] = time - lastTime;
         fpsString = "" + ((int)(10000.0f*NUM_FRAMES/durations[NUM_FRAMES]))/10.0f;
         mPaint.setColor(0xffffffff);
         fpsCanvas.drawRect(0, 0, fpsW, fpsH, mPaint);
         mPaint.setColor(0xff000000);
         fpsCanvas.drawText(fpsString, fpsW/2, 0.75f*fpsH, mPaint);
         fpsTexture.setTexture(fpsBitmap);
         lastTime = time;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       void renderDebug(long time)
+        {
         if (fpsTexture.setAsInput())
+          {
           setAsOutput(time);
           GLES31.glColorMask(true,true,true,true);
           GLES31.glDepthMask(false);
           GLES31.glDisable(GLES31.GL_STENCIL_TEST);
           GLES31.glDisable(GLES31.GL_DEPTH_TEST);
           fpsEffects.drawPriv(fpsW/2.0f, fpsH/2.0f, fpsMesh, this, time, 0);
+          }
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     // PUBLIC API
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     /**
      * Create a new Screen.
      * <p>
      * Has to be followed by a 'resize()' to set the size.
      */
       public DistortedScreen()
+        {
         // Screen also has to be created (3rd arg 'NOT_CREATED_YET') because of the SSBO inside OutputSurface.
         super(0,0,NOT_CREATED_YET,1,DEPTH_NO_STENCIL,0,TYPE_USER);
         mInitialized = false;
+        }
+      }

Also available in: Unified diff

Project

General

Profile

Distorted Android

Revision 88c7b603

Added by Leszek Koltunski almost 6 years ago