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

« Previous | Next »

Revision 7602a827

Added by Leszek Koltunski about 5 years ago

ID 7602a82767eb61ee52cbd00822843742c498eaf8
Parent 809dcae3
Child 46b572b5

Rename all the classes that are not exported to application to 'Internal'

     ///////////////////////////////////////////////////////////////////////////////////////////////////
     // Copyright 2016 Leszek Koltunski                                                               //
     //                                                                                               //
     // This file is part of Distorted.                                                               //
     // This file is part of DistortedLibrary.                                                               //
     //                                                                                               //
     // Distorted is free software: you can redistribute it and/or modify                             //
     // DistortedLibrary is free software: you can redistribute it and/or modify                             //
     // it under the terms of the GNU General Public License as published by                          //
     // the Free Software Foundation, either version 2 of the License, or                             //
     // (at your option) any later version.                                                           //
     //                                                                                               //
     // Distorted is distributed in the hope that it will be useful,                                  //
     // DistortedLibrary is distributed in the hope that it will be useful,                                  //
     // but WITHOUT ANY WARRANTY; without even the implied warranty of                                //
     // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                 //
     // GNU General Public License for more details.                                                  //
     //                                                                                               //
     // You should have received a copy of the GNU General Public License                             //
     // along with Distorted.  If not, see <http://www.gnu.org/licenses/>.                            //
     // along with DistortedLibrary.  If not, see <http://www.gnu.org/licenses/>.                            //
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     package org.distorted.library.main;
-...
      * to sub-class 'NodeData'. Two identical sub-trees attached at different points of the main tree
      * will point to the same NodeData; only the first of this is rendered (mData.numRender!).
      */
     public class DistortedNode implements DistortedChildrenList.Parent
     public class DistortedNode implements InternalChildrenList.Parent
+      {
       private MeshBase mMesh;
       private DistortedEffects mEffects;
       private DistortedSurface mSurface;
       private DistortedRenderState mState;
       private DistortedNodeData mData;
       private DistortedChildrenList mChildren;
       private DistortedChildrenList.Parent mParent;
       private InternalSurface mSurface;
       private InternalRenderState mState;
       private InternalNodeData mData;
       private InternalChildrenList mChildren;
       private InternalChildrenList.Parent mParent;
       private int mFboW, mFboH, mFboDepthStencil;
       private boolean mRenderWayOIT;
-...
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     /**
      * This is not really part of the public API. Has to be public only because it is a part of the
      * DistortedChildrenList.Parent interface.
      * InternalChildrenList.Parent interface.
+     *
      * @y.exclude
      */
       public void adjustIsomorphism()
+        {
         DistortedNodeData newData = DistortedNodeData.returnData(generateIDList());
         InternalNodeData newData = InternalNodeData.returnData(generateIDList());
         boolean deleteOldFBO = mData.removeData();
         boolean createNewFBO = (mChildren.getNumChildren()>0 && newData.mFBO==null);
-...
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     // return the total number of render calls issued
       int drawNoBlend(long currTime, DistortedOutputSurface surface)
       int drawNoBlend(long currTime, InternalOutputSurface surface)
+        {
         DistortedSurface input = getInternalSurface();
         InternalSurface input = getInternalSurface();
         if( input.setAsInput() )
+          {
           mState.apply();
           GLES31.glDisable(GLES31.GL_BLEND);
           Distorted.drawPriv(mEffects.getQueues(), mSurface.getWidth()/2.0f, mSurface.getHeight()/2.0f, mMesh, surface, currTime);
           DistortedLibrary.drawPriv(mEffects.getQueues(), mSurface.getWidth()/2.0f, mSurface.getHeight()/2.0f, mMesh, surface, currTime);
           GLES31.glEnable(GLES31.GL_BLEND);
           return 1;
+          }
-...
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     // Use the Order Independent Transparency method to draw a non-postprocessed child.
       int drawOIT(long currTime, DistortedOutputSurface surface)
       int drawOIT(long currTime, InternalOutputSurface surface)
+        {
         DistortedSurface input = getInternalSurface();
         InternalSurface input = getInternalSurface();
         if( input.setAsInput() )
+          {
           mState.apply();
           Distorted.drawPrivOIT(mEffects.getQueues(), mSurface.getWidth()/2.0f, mSurface.getHeight()/2.0f, mMesh, surface, currTime);
           DistortedLibrary.drawPrivOIT(mEffects.getQueues(), mSurface.getWidth()/2.0f, mSurface.getHeight()/2.0f, mMesh, surface, currTime);
           return 1;
+          }
-...
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     // return the total number of render calls issued
       int draw(long currTime, DistortedOutputSurface surface)
       int draw(long currTime, InternalOutputSurface surface)
+        {
         DistortedSurface input = getInternalSurface();
         InternalSurface input = getInternalSurface();
         if( input.setAsInput() )
+          {
           mState.apply();
           Distorted.drawPriv(mEffects.getQueues(), mSurface.getWidth()/2.0f, mSurface.getHeight()/2.0f, mMesh, surface, currTime);
           DistortedLibrary.drawPriv(mEffects.getQueues(), mSurface.getWidth()/2.0f, mSurface.getHeight()/2.0f, mMesh, surface, currTime);
           return 1;
+          }
-...
           if( mSurface.setAsInput() )
+            {
             numRenders++;
             Distorted.blitPriv(mData.mFBO);
             DistortedLibrary.blitPriv(mData.mFBO);
+            }
           numRenders += mData.mFBO.renderChildren(currTime,numChildren,mChildren,0, mRenderWayOIT);
-...
+        {
         int width  = mFboW <= 0 ? mSurface.getWidth()  : mFboW;
         int height = mFboH <= 0 ? mSurface.getHeight() : mFboH;
         return new DistortedFramebuffer(1,mFboDepthStencil, DistortedSurface.TYPE_TREE, width, height);
         return new DistortedFramebuffer(1,mFboDepthStencil, InternalSurface.TYPE_TREE, width, height);
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       void setParent(DistortedChildrenList.Parent parent)
       void setParent(InternalChildrenList.Parent parent)
+        {
         mParent = parent;
+        }
-...
      * @param effects DistortedEffects to put into the new Node.
      * @param mesh MeshBase to put into the new Node.
      */
       public DistortedNode(DistortedSurface surface, DistortedEffects effects, MeshBase mesh)
       public DistortedNode(InternalSurface surface, DistortedEffects effects, MeshBase mesh)
+        {
         mSurface       = surface;
         mEffects       = effects;
         mMesh          = mesh;
         mState         = new DistortedRenderState();
         mChildren      = new DistortedChildrenList(this);
         mState         = new InternalRenderState();
         mChildren      = new InternalChildrenList(this);
         mParent        = null;
         mRenderWayOIT  = false;
-...
         mFboH            = 0;  // mSurface's dimensions
         mFboDepthStencil = DistortedFramebuffer.DEPTH_NO_STENCIL;
         mData = DistortedNodeData.returnData(generateIDList());
         mData = InternalNodeData.returnData(generateIDList());
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
-...
+     *
      * @param node The DistortedNode to copy data from.
      * @param flags bit field composed of a subset of the following:
      *        {@link Distorted#CLONE_SURFACE},  {@link Distorted#CLONE_MATRIX}, {@link Distorted#CLONE_VERTEX},
      *        {@link Distorted#CLONE_FRAGMENT} and {@link Distorted#CLONE_CHILDREN}.
      *        {@link DistortedLibrary#CLONE_SURFACE},  {@link DistortedLibrary#CLONE_MATRIX}, {@link DistortedLibrary#CLONE_VERTEX},
      *        {@link DistortedLibrary#CLONE_FRAGMENT} and {@link DistortedLibrary#CLONE_CHILDREN}.
      *        For example flags = CLONE_SURFACE | CLONE_CHILDREN.
      */
       public DistortedNode(DistortedNode node, int flags)
+        {
         mEffects      = new DistortedEffects(node.mEffects,flags);
         mMesh         = node.mMesh;
         mState        = new DistortedRenderState();
         mState        = new InternalRenderState();
         mParent       = null;
         mRenderWayOIT = false;
-...
         mFboH            = node.mFboH;
         mFboDepthStencil = node.mFboDepthStencil;
         if( (flags & Distorted.CLONE_SURFACE) != 0 )
         if( (flags & DistortedLibrary.CLONE_SURFACE) != 0 )
+          {
           mSurface = node.mSurface;
+          }
-...
           if( node.mSurface instanceof DistortedTexture )
+            {
             mSurface = new DistortedTexture(w,h, DistortedSurface.TYPE_TREE);
             mSurface = new DistortedTexture(w,h, InternalSurface.TYPE_TREE);
+            }
           else if( node.mSurface instanceof DistortedFramebuffer )
+            {
-...
               depthStencil = (hasStencil ? DistortedFramebuffer.BOTH_DEPTH_STENCIL:DistortedFramebuffer.DEPTH_NO_STENCIL);
+              }
             mSurface = new DistortedFramebuffer(1,depthStencil,DistortedSurface.TYPE_TREE,w,h);
             mSurface = new DistortedFramebuffer(1,depthStencil, InternalSurface.TYPE_TREE,w,h);
+            }
+          }
         if( (flags & Distorted.CLONE_CHILDREN) != 0 )
         if( (flags & DistortedLibrary.CLONE_CHILDREN) != 0 )
+          {
           mChildren = node.mChildren;
+          }
         else
+          {
           mChildren = new DistortedChildrenList(this);
           mChildren = new InternalChildrenList(this);
+          }
         mData = DistortedNodeData.returnData(generateIDList());
         mData = InternalNodeData.returnData(generateIDList());
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
-...
         mRenderWayOIT = oit;
         if( initialSize>0.0f && initialSize<10.0f )
           Distorted.setSSBOSize(initialSize);
           DistortedLibrary.setSSBOSize(initialSize);
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
-...
      * Adds a new child to the last position in the list of our Node's children.
      * <p>
      * We cannot do this mid-render - actual attachment will be done just before the next render, by the
      * DistortedMaster (by calling doWork())
      * InternalMaster (by calling doWork())
+     *
      * @param node The new Node to add.
      */
-...
      * Adds a new child to the last position in the list of our Node's children.
      * <p>
      * We cannot do this mid-render - actual attachment will be done just before the next render, by the
      * DistortedMaster (by calling doWork())
      * InternalMaster (by calling doWork())
+     *
      * @param surface InputSurface to initialize our child Node with.
      * @param effects DistortedEffects to initialize our child Node with.
      * @param mesh MeshBase to initialize our child Node with.
      * @return the newly constructed child Node, or null if we couldn't allocate resources.
      */
       public DistortedNode attach(DistortedSurface surface, DistortedEffects effects, MeshBase mesh)
       public DistortedNode attach(InternalSurface surface, DistortedEffects effects, MeshBase mesh)
+        {
         return mChildren.attach(surface,effects,mesh);
+        }
-...
      * Removes the first occurrence of a specified child from the list of children of our Node.
      * <p>
      * We cannot do this mid-render - actual detachment will be done just before the next render, by the
      * DistortedMaster (by calling doWork())
      * InternalMaster (by calling doWork())
+     *
      * @param node The Node to remove.
      */
-...
      * of them having the same Effects but - for instance - different Mesh. Use with care.
      * <p>
      * We cannot do this mid-render - actual detachment will be done just before the next render, by the
      * DistortedMaster (by calling doWork())
      * InternalMaster (by calling doWork())
+     *
      * @param effects DistortedEffects to remove.
      */
-...
      * Removes all children Nodes.
      * <p>
      * We cannot do this mid-render - actual detachment will be done just before the next render, by the
      * DistortedMaster (by calling doWork())
      * InternalMaster (by calling doWork())
      */
       public void detachAll()
+        {
-...
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     /**
      * Returns the DistortedSurface object that's in the Node.
      * Returns the InternalSurface object that's in the Node.
+     *
      * @return The DistortedSurface contained in the Node.
      * @return The InternalSurface contained in the Node.
      */
       public DistortedSurface getSurface()
       public InternalSurface getSurface()
+        {
         return mSurface;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       /**
        * Returns the DistortedSurface object that's in the Node.
        * Returns the InternalSurface object that's in the Node.
+       *
        * @return The DistortedSurface contained in the Node (if a leaf), or the FBO (if an internal Node)
        * @return The InternalSurface contained in the Node (if a leaf), or the FBO (if an internal Node)
        */
       public DistortedSurface getInternalSurface()
       public InternalSurface getInternalSurface()
+        {
         return mChildren.getNumChildren()==0 ? mSurface : mData.mFBO;
+        }

Also available in: Unified diff

Project

General

Profile

Distorted Android

Revision 7602a827

Added by Leszek Koltunski about 5 years ago