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

« Previous | Next »

Revision efe3d8fe

Added by Leszek Koltunski about 7 years ago

ID efe3d8feaaab28e0dbf004ac63bac11abc73e19c
Parent 27f42cd6
Child be60d4ff

Messing around with the AttachDaemon (from now on a more generic DistortedMaster).

In preparation for thr SORT job that will let us sort the children Nodes into postprocessing Buckets.

     ///////////////////////////////////////////////////////////////////////////////////////////////////
     abstract class DistortedOutputSurface extends DistortedSurface implements DistortedAttacheable
     abstract class DistortedOutputSurface extends DistortedSurface implements DistortedSlave
+    {
       private static final int ATTACH = 0;
       private static final int DETACH = 1;
       private static final int DETALL = 2;
       private static final int SORT   = 3;
       private ArrayList<DistortedNode> mChildren;
       private int mNumChildren;   // ==mChildren.length(), but we only create mChildren if the first one gets added
       private class Job
+        {
         int type;
         DistortedNode node;
         Job(int t, DistortedNode n)
+          {
           type = t;
           node = n;
+          }
+        }
       private ArrayList<Job> mJobs = new ArrayList<>();
       DistortedFramebuffer mBuffer1, mBuffer2;
       private long mTime;
-...
     /*
         boolean changed =
     */
         DistortedAttachDaemon.toDo();
         DistortedMaster.toDo();
     /*
         // debugging only
         if( changed )
-...
      * 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())
      * DistortedMaster (by calling doWork())
+     *
      * @param node The new Node to add.
      */
       public void attach(DistortedNode node)
+        {
         DistortedAttachDaemon.attach(this,node);
         mJobs.add(new Job(ATTACH,node));
         DistortedMaster.newSlave(this);
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
-...
      * 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())
      * DistortedMaster (by calling doWork())
+     *
      * @param surface InputSurface to initialize our child Node with.
      * @param effects DistortedEffects to initialize our child Node with.
-...
       public DistortedNode attach(DistortedInputSurface surface, DistortedEffects effects, MeshObject mesh)
+        {
         DistortedNode node = new DistortedNode(surface,effects,mesh);
         DistortedAttachDaemon.attach(this,node);
         mJobs.add(new Job(ATTACH,node));
         DistortedMaster.newSlave(this);
         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.
+     *
      * @y.exclude
      * @param node new Node to add.
      */
       public void attachNow(DistortedNode node)
+        {
         if( mChildren==null ) mChildren = new ArrayList<>(2);
         mChildren.add(node);
         mNumChildren++;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     /**
      * Removes the first occurrence of a specified child from the list of children of our Surface.
-...
      * 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
      * DistortedAttachDeamon (by calling detachNow())
      * DistortedMaster (by calling doWork())
+     *
      * @param effects DistortedEffects to remove.
      */
-...
           if( node.getEffects().getID()==id )
+            {
             detached = true;
             DistortedAttachDaemon.detach(this,node);
             mJobs.add(new Job(DETACH,node));
             DistortedMaster.newSlave(this);
             break;
+            }
+          }
-...
         if( !detached )
+          {
           // if we failed to detach any, it still might be the case that
           // there's a job in Daemon's queue that we need to cancel.
           DistortedAttachDaemon.cancelAttachJobs(this,effects);
           // there's an ATTACH job that we need to cancel.
           int num = mJobs.size();
           Job job;
           for(int i=0; i<num; i++)
+            {
             job = mJobs.get(i);
             if( job.type==ATTACH && job.node.getEffects()==effects )
+              {
               mJobs.remove(i);
               break;
+              }
+            }
+          }
+        }
-...
      * 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())
      * DistortedMaster (by calling doWork())
+     *
      * @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.
+     *
      * @y.exclude
      * @param node The Node to remove.
      */
       public void detachNow(DistortedNode node)
+        {
         if( mNumChildren>0 && mChildren.remove(node) )
+          {
           mNumChildren--;
+          }
         mJobs.add(new Job(DETACH,node));
         DistortedMaster.newSlave(this);
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
-...
      * 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())
      * DistortedMaster (by calling doWork())
      */
       public void detachAll()
+        {
         DistortedAttachDaemon.detachAll(this);
         mJobs.add(new Job(DETALL,null));
         DistortedMaster.newSlave(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
      * DistortedSlave interface, which should really be a class that we extend here instead but
      * Java has no multiple inheritance.
+     *
      * @y.exclude
      */
       public void detachAllNow()
       public void doWork()
+        {
         if( mNumChildren>0 )
         int num = mJobs.size();
         Job job;
         int numChanges=0;
         int numSorts  =0;
         for(int i=0; i<num; i++)
+          {
           job = mJobs.remove(0);
           switch(job.type)
+            {
             case ATTACH: numChanges++;
                          if( mChildren==null ) mChildren = new ArrayList<>(2);
                          mChildren.add(job.node);
                          mNumChildren++;
                          break;
             case DETACH: numChanges++;
                          if( mNumChildren>0 && mChildren.remove(job.node) )
+                           {
                            mNumChildren--;
+                           }
                          break;
             case DETALL: numChanges++;
                          if( mNumChildren>0 )
+                           {
                            mNumChildren = 0;
                            mChildren.clear();
+                           }
                          break;
             case SORT  : numSorts++;
                          // TODO: sort
                          break;
+            }
+          }
         if( numChanges>0 && numSorts==0 )
+          {
           mNumChildren = 0;
           mChildren.clear();
           // TODO: sort
+          }
+        }
+    }

Also available in: Unified diff

Project

General

Profile

Distorted Android

Revision efe3d8fe

Added by Leszek Koltunski about 7 years ago