/src/main/java/org/distorted/library/DistortedFramebuffer.java - Diff - Distorted Android

« Previous | Next »

Revision af4cc5db

Added by Leszek Koltunski about 7 years ago

ID af4cc5db958df58d1ea5f277ff8bf62396d86021
Parent c5369f1b
Child 29a06526

Simplify yesterday's refactoring.

      * User is able to create offscreen FBOs and both a) render to them b) use their COLOR0 attachment as
      * an input texture.
      */
     public class DistortedFramebuffer extends DistortedRenderable implements DistortedInputSurface, DistortedOutputSurface
     public class DistortedFramebuffer extends DistortedOutputSurface implements DistortedInputSurface
+      {
       private int[] mDepthH = new int[1];
       private int[] mFBOH   = new int[1];
       private boolean mDepthEnabled;
       private DistortedProjection mProjection;
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     // Must be called from a thread holding OpenGL Context
-...
     // if new size fits into the size of the underlying Texture, just change the projection without
     // reallocating the Texture. Otherwise, we need to reallocate.
     //
     // Must be called form a thread holding the OpenGL context.
     // Must be called from a thread holding the OpenGL context.
       void resizeFast(int width, int height)
+        {
         if( mProjection.resize(width,height) )
         if( mWidth!=width || mHeight!=height )
+          {
           mWidth = width;
           mHeight= height;
           createProjection();
           if( width> mSizeX || height> mSizeY)
+            {
             mSizeX = width;
-...
       public DistortedFramebuffer(int width, int height, boolean depthEnabled)
+        {
         super(width,height,NOT_CREATED_YET);
         mProjection  = new DistortedProjection(width,height);
         mDepthEnabled= depthEnabled;
         mFBOH[0]     = NOT_CREATED_YET;
         mDepthH[0]   = NOT_CREATED_YET;
-...
       public DistortedFramebuffer(int width, int height)
+        {
         super(width,height,NOT_CREATED_YET);
         mProjection  = new DistortedProjection(width,height);
         mDepthEnabled= false;
         mFBOH[0]     = NOT_CREATED_YET;
         mDepthH[0]   = NOT_CREATED_YET;
-...
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     /**
      * Bind the underlying rectangle of pixels as a OpenGL Texture.
+     *
      * @returns <code>true</code> if successful.
      */
       public boolean setAsInput()
+        {
-...
         mDepthEnabled = enable;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     /**
      * Draw the (texture,mesh,effects) object to the Framebuffer.
      * <p>
      * Must be called from a thread holding OpenGL Context.
+     *
      * @param surface InputSurface to skin our Mesh with.
      * @param mesh Class descendant from MeshObject
      * @param effects The DistortedEffects to use when rendering
      * @param time Current time, in milliseconds.
      */
       public void renderTo(DistortedInputSurface surface, MeshObject mesh, DistortedEffects effects, long time)
+        {
         surface.create();  // Watch out  - this needs to be before
         create();          // the 'setAsInput' because this has side-effects!
         if( surface.setAsInput() )
+          {
           DistortedRenderable.deleteAllMarked();
           effects.drawPriv(surface.getWidth()/2.0f, surface.getHeight()/2.0f, mesh, this, time);
+          }
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     /**
      * Draws the Tree, and all its children, to the Framebuffer.
      * <p>
      * Must be called from a thread holding OpenGL Context.
+     *
      * @param dt DistortedTree to render.
      * @param time Current time, in milliseconds. This will be passed to all the Effects stored in the Tree.
      */
       public void renderTo(DistortedTree dt, long time)
+        {
         DistortedRenderable.deleteAllMarked();
         create();
         dt.drawRecursive(time,this);
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     /**
      * Create new Projection matrix.
+     *
      * @param fov Vertical 'field of view' of the Projection frustrum (in degrees).
      * @param x X-coordinate of the point at which our camera looks at. 0 is the center.
      * @param y Y-coordinate of the point at which our camera looks at. 0 is the center.
      */
       public void setProjection(float fov, float x, float y)
+        {
         mProjection.set(fov,x,y);
         mProjection.createProjection();
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     /**
      * Resize the underlying Framebuffer.
+     *
      * @param width The new width.
      * @param height The new height.
      */
       public void resize(int width, int height)
+        {
         if( mProjection.resize(width,height) )
+          {
           mSizeX = width;
           mSizeY = height;
           if( mColorH[0]>0 ) markForDeletion();
+          }
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     /**
      * Return the ID of the Texture (COLOR attachment 0) that's backing this FBO.
-...
+        {
         return mDepthEnabled;
+        }
     //////////////////////////////////////////////////////////////////////////////////////////////////
     /**
      * Return Projection stored in this Framebuffer.
+     *
      * @return DistortedProjection object.
      */
       public DistortedProjection getProjection()
+        {
         return mProjection;
+        }
+      }

Also available in: Unified diff

Project

General

Profile

Distorted Android

Revision af4cc5db

Added by Leszek Koltunski about 7 years ago