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

« Previous | Next »

Revision c204c69d

Added by Leszek Koltunski about 7 years ago

ID c204c69db2ef3787663ea13a08c92a52ba5049d6
Parent f8377ef8
Child af27df87

New, cleaner way to create/destroy DistortedSurfaces.

Serious regression in StarWars (crashes!). Looks like the Node's internal FBO is being deleted and not re-created in time.

     ///////////////////////////////////////////////////////////////////////////////////////////////////
     abstract class DistortedOutputSurface extends DistortedSurface
     abstract class DistortedOutputSurface extends DistortedSurface implements DistortedAttacheable
+    {
       private ArrayList<DistortedNode> mChildren;
       private int mNumChildren;   // ==mChildren.length(), but we only create mChildren if the first one gets added
-...
      */
       public void render(long time)
+        {
         // change tree topology (attach and detach children)
         // create and delete all underlying OpenGL resources
         // Watch out: FIRST change topology, only then deal
         // with OpenGL resources. That's because changing Tree
         // can result in additional Framebuffers that would need
         // to be created immediately, before the calls to drawRecursive()
         if( DistortedAttachDaemon.toDo() )
+          {
           for(int i=0; i<mNumChildren; i++)
+            {
             mChildren.get(i).treeIsomorphism();
+            }
+          }
         toDo();
         for(int i=0; i<mNumChildren; i++)
-...
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     /**
      * Adds a new child to the last position in the list of our Surface's children.
      * <p>
      * We cannot do this mid-render - actual attachment will be done just before the next render, by the
      * DistortedAttachDeamon (by calling attachNow())
+     *
      * @param node The new Node to add.
      */
       public synchronized void attach(DistortedNode node)
       public void attach(DistortedNode node)
+        {
         if( mChildren==null ) mChildren = new ArrayList<>(2);
         mChildren.add(node);
         mNumChildren++;
         DistortedAttachDaemon.attach(this,node);
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     /**
      * Adds a new child to the last position in the list of our Surface's children.
      * <p>
      * We cannot do this mid-render - actual attachment will be done just before the next render, by the
      * DistortedAttachDeamon (by calling attachNow())
+     *
      * @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 DistortedNode attach(DistortedInputSurface surface, DistortedEffects effects, MeshObject mesh)
       public DistortedNode attach(DistortedInputSurface surface, DistortedEffects effects, MeshObject mesh)
+        {
         if( mChildren==null ) mChildren = new ArrayList<>(2);
         DistortedNode node = new DistortedNode(surface,effects,mesh);
         DistortedAttachDaemon.attach(this,node);
         return node;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     /**
      * This is not really part of the public API. Has to be public only because it is a part of the
      * DistortedAttacheable interface, which should really be a class that we extend here instead but
      * Java has no multiple inheritance.
+     *
      * @param node new Node to add.
      */
       public void attachNow(DistortedNode node)
+        {
         if( mChildren==null ) mChildren = new ArrayList<>(2);
         mChildren.add(node);
         mNumChildren++;
         return node;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     /**
      * Removes the first occurrence of a specified child from the list of children of our Surface.
      * <p>
      * We cannot do this mid-render - actual attachment will be done just before the next render, by the
      * DistortedAttachDeamon (by calling detachNow())
+     *
      * @param node The Node to remove.
      */
       public void detach(DistortedNode node)
+        {
         DistortedAttachDaemon.detach(this,node);
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     /**
      * This is not really part of the public API. Has to be public only because it is a part of the
      * DistortedAttacheable interface, which should really be a class that we extend here instead but
      * Java has no multiple inheritance.
+     *
      * @param node The Node to remove.
      * @return <code>true</code> if the child was successfully removed.
      */
       public synchronized boolean detach(DistortedNode node)
       public void detachNow(DistortedNode node)
+        {
         if( mNumChildren>0 && mChildren.remove(node) )
+          {
           mNumChildren--;
           return true;
+          }
         return false;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     /**
      * Removes all children Nodes.
      * <p>
      * We cannot do this mid-render - actual attachment will be done just before the next render, by the
      * DistortedAttachDeamon (by calling detachAllNow())
      */
       public void detachAll()
+        {
         DistortedAttachDaemon.detachAll(this);
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     /**
      * This is not really part of the public API. Has to be public only because it is a part of the
      * DistortedAttacheable interface, which should really be a class that we extend here instead but
      * Java has no multiple inheritance.
      */
       public synchronized void detachAll()
       public void detachAllNow()
+        {
         if( mNumChildren>0 )
+          {

Also available in: Unified diff

Project

General

Profile

Distorted Android

Revision c204c69d

Added by Leszek Koltunski about 7 years ago