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

« Previous | Next »

Revision c5369f1b

Added by Leszek Koltunski about 7 years ago

ID c5369f1bc82e265b3251e6ec7ac2670a4a58f544
Parent 8ca9f899
Child af4cc5db

Major: change of API.

Split DFramebuffer into Framebuffer and Screen; introduce the 'DistortedInputSurface' and 'DistortedOutputSurface' interfaces.

       private MeshObject mMesh;
       private DistortedEffects mEffects;
       private DistortedRenderable mRenderable;
       private DistortedInputSurface mSurface;
       private NodeData mData;
       private DistortedTree mParent;
-...
+        {
         ArrayList<Long> ret = new ArrayList<>();
         ret.add( mRenderable.getID() );
         ret.add( mSurface.getID() );
         DistortedTree node;
         for(int i=0; i<mNumChildren[0]; i++)
-...
           if( newList.size()>1 )
+            {
             if( mData.mFBO ==null )
               mData.mFBO = new DistortedFramebuffer(mRenderable.getWidth(), mRenderable.getHeight());
               mData.mFBO = new DistortedFramebuffer(mSurface.getWidth(), mSurface.getHeight());
+            }
           else
+            {
-...
     */
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       void drawRecursive(long currTime, DistortedFramebuffer df)
       void drawRecursive(long currTime, DistortedOutputSurface surface)
+        {
         mRenderable.create();
         float halfX = mRenderable.getWidth()/2.0f;
         float halfY = mRenderable.getHeight()/2.0f;
         mSurface.create();
         float halfX = mSurface.getWidth()/2.0f;
         float halfY = mSurface.getHeight()/2.0f;
         if( mNumChildren[0]<=0 )
+          {
           mRenderable.setAsInput();
           mSurface.setAsInput();
+          }
         else
+          {
-...
             GLES30.glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
             GLES30.glClear( GLES30.GL_DEPTH_BUFFER_BIT | GLES30.GL_COLOR_BUFFER_BIT);
             if( mRenderable.setAsInput() )
               DistortedEffects.drawNoEffectsPriv(halfX, halfY, mMesh, mData.mFBO);
             if( mSurface.setAsInput() )
               DistortedEffects.drawNoEffectsPriv(halfX, halfY, mMesh, mData.mFBO.getProjection() );
             synchronized(this)
+              {
-...
           mData.mFBO.setAsInput();
+          }
         mEffects.drawPriv(halfX, halfY, mMesh, df, currTime);
         mEffects.drawPriv(halfX, halfY, mMesh, surface, currTime);
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
-...
     /**
      * Constructs new Node of the Tree.
+     *
      * @param renderable DistortedRenderable to put into the new Node.
      * @param surface InputSurface to put into the new Node.
      * @param effects DistortedEffects to put into the new Node.
      * @param mesh MeshObject to put into the new Node.
      */
       public DistortedTree(DistortedRenderable renderable, DistortedEffects effects, MeshObject mesh)
       public DistortedTree(DistortedInputSurface surface, DistortedEffects effects, MeshObject mesh)
+        {
         mRenderable    = renderable;
         mSurface       = surface;
         mEffects       = effects;
         mMesh          = mesh;
         mParent        = null;
-...
         mNumChildren[0]= 0;
         ArrayList<Long> list = new ArrayList<>();
         list.add(mRenderable.getID());
         list.add(mSurface.getID());
         mData = mMapNodeID.get(list);
-...
         if( (flags & Distorted.CLONE_RENDERABLE) != 0 )
+          {
           mRenderable = node.mRenderable;
           mSurface = node.mSurface;
+          }
         else
+          {
           int w = node.mRenderable.getWidth();
           int h = node.mRenderable.getHeight();
           int w = node.mSurface.getWidth();
           int h = node.mSurface.getHeight();
           if( node.mRenderable instanceof DistortedTexture )
           if( node.mSurface instanceof DistortedTexture )
+            {
             mRenderable = new DistortedTexture(w,h);
             mSurface = new DistortedTexture(w,h);
+            }
           else if( node.mRenderable instanceof DistortedFramebuffer )
           else if( node.mSurface instanceof DistortedFramebuffer )
+            {
             boolean hasDepth = ((DistortedFramebuffer) node.mRenderable).hasDepth();
             mRenderable = new DistortedFramebuffer(w,h,hasDepth);
             boolean hasDepth = ((DistortedFramebuffer) node.mSurface).hasDepth();
             mSurface = new DistortedFramebuffer(w,h,hasDepth);
+            }
+          }
         if( (flags & Distorted.CLONE_CHILDREN) != 0 )
-...
     /**
      * Adds a new child to the last position in the list of our Node's children.
+     *
      * @param renderable DistortedRenderable to initialize our child Node with.
      * @param surface InputSurface to initialize our child Node with.
      * @param effects DistortedEffects to initialize our child Node with.
      * @param mesh MeshObject to initialize our child Node with.
      * @return the newly constructed child Node, or null if we couldn't allocate resources.
      */
       public synchronized DistortedTree attach(DistortedRenderable renderable, DistortedEffects effects, MeshObject mesh)
       public synchronized DistortedTree attach(DistortedInputSurface surface, DistortedEffects effects, MeshObject mesh)
+        {
         ArrayList<Long> prev = generateIDList();
         if( mChildren==null ) mChildren = new ArrayList<>(2);
         DistortedTree node = new DistortedTree(renderable,effects,mesh);
         DistortedTree node = new DistortedTree(surface,effects,mesh);
         node.mParent = this;
         mChildren.add(node);
         mNumChildren[0]++;
-...
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     /**
      * Returns the DistortedRenderable object that's in the Node.
      * Returns the DistortedInputSurface object that's in the Node.
+     *
      * @return The DistortedRenderable contained in the Node.
      * @return The DistortedInputSurface contained in the Node.
      */
       public DistortedRenderable getRenderable()
       public DistortedInputSurface getSurface()
+        {
         return mRenderable;
         return mSurface;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////

Also available in: Unified diff

Project

General

Profile

Distorted Android

Revision c5369f1b

Added by Leszek Koltunski about 7 years ago