/ - Diff - Distorted Android

« Previous | Next »

Revision ffbe7ecf

Added by Leszek Koltunski over 8 years ago

ID ffbe7ecf040b9bdd5931fcc7d890109824e3fbd3
Parent 80b3acf6
Child fe6fe99a

Remove old facility to correct Postprocessing buckets on new Postporcessing effects.

New facility will follow shortly....

+        {
         int type;
         DistortedNode node;
         DistortedEffectsPostprocess dep;
         Job(int t, DistortedNode n, DistortedEffectsPostprocess d)
         Job(int t, DistortedNode n)
+          {
           type = t;
           node = n;
           dep  = d;
+          }
+        }
-...
       private DistortedOutputSurface mSurfaceParent;
       private MeshObject mMesh;
       private DistortedEffects mEffects;
       private DistortedEffectsPostprocess mPostprocess;
       private DistortedInputSurface mSurface;
       private DistortedRenderState mState;
       private NodeData mData;
-...
         return numRenders;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       private void newJob(int t, DistortedNode n, DistortedEffectsPostprocess d)
+        {
         mJobs.add(new Job(t,n,d));
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       void setPost(DistortedEffectsPostprocess dep)
+        {
         mPostprocess = dep;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       void setSurfaceParent(DistortedOutputSurface dep)
-...
+        {
         mSurface       = surface;
         mEffects       = effects;
         mPostprocess   = null;
         mMesh          = mesh;
         mState         = new DistortedRenderState();
         mChildren      = null;
-...
       public DistortedNode(DistortedNode node, int flags)
+        {
         mEffects      = new DistortedEffects(node.mEffects,flags);
         mPostprocess  = null;
         mMesh         = node.mMesh;
         mState        = new DistortedRenderState();
         mParent       = null;
-...
      */
       public void attach(DistortedNode node)
+        {
         mJobs.add(new Job(ATTACH,node,null));
         mJobs.add(new Job(ATTACH,node));
         DistortedMaster.newSlave(this);
+        }
-...
       public DistortedNode attach(DistortedInputSurface surface, DistortedEffects effects, MeshObject mesh)
+        {
         DistortedNode node = new DistortedNode(surface,effects,mesh);
         mJobs.add(new Job(ATTACH,node,null));
         mJobs.add(new Job(ATTACH,node));
         DistortedMaster.newSlave(this);
         return node;
+        }
-...
      */
       public void detach(DistortedNode node)
+        {
         mJobs.add(new Job(DETACH,node,null));
         mJobs.add(new Job(DETACH,node));
         DistortedMaster.newSlave(this);
+        }
-...
           if( node.getEffects().getID()==id )
+            {
             detached = true;
             mJobs.add(new Job(DETACH,node,null));
             mJobs.add(new Job(DETACH,node));
             DistortedMaster.newSlave(this);
             break;
+            }
-...
      */
       public void detachAll()
+        {
         mJobs.add(new Job(DETALL,null,null));
         mJobs.add(new Job(DETALL,null));
         DistortedMaster.newSlave(this);
+        }
-...
                            mNumChildren[0] = 0;
+                           }
                          break;
             case SORT  : job.node.mPostprocess = job.dep;
                          mChildren.remove(job.node);
             case SORT  : mChildren.remove(job.node);
                          DistortedMaster.addSorted(mChildren,job.node);
                          break;
+            }
-...
         if( numChanges>0 ) adjustIsomorphism();
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     /**
      * Sets the Postprocessing Effects we will apply to the temporary buffer this Node - and fellow siblings
      * with the same Effects - will get rendered to.
      * <p>
      * For efficiency reasons, it is very important to assign the very same DistortedEffectsPostprocess
      * object to all the DistortedNode siblings that are supposed to be postprocessed in the same way,
      * because only then will the library assign all such siblings to the same 'Bucket' which gets rendered
      * to the same offscreen buffer which then gets postprocessed in one go and subsequently merged to the
      * target Surface.
      */
       public void setPostprocessEffects(DistortedEffectsPostprocess dep)
+        {
         if( mParent!=null )
+          {
           mParent.newJob(SORT, this, dep);
           DistortedMaster.newSlave(mParent);
+          }
         else if( mSurfaceParent!=null )
+          {
           mSurfaceParent.newJob(SORT, this, dep);
           DistortedMaster.newSlave(mSurfaceParent);
+          }
         else
+          {
           mPostprocess = dep;
+          }
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     /**

src/main/java/org/distorted/library/main/DistortedOutputSurface.java
60	60	{
61	61	int type;
62	62	DistortedNode node;
63		DistortedEffectsPostprocess dep;
64	63
65		Job(int t, DistortedNode n, DistortedEffectsPostprocess d)
	64	Job(int t, DistortedNode n)
66	65	{
67	66	type = t;
68	67	node = n;
69		dep = d;
70	68	}
71	69	}
72	70
...	...
319	317
320	318	///////////////////////////////////////////////////////////////////////////////////////////////////
321	319
322		void newJob(int t, DistortedNode n, DistortedEffectsPostprocess d)
	320	void newJob(int t, DistortedNode n)
323	321	{
324		mJobs.add(new Job(t,n,d));
	322	mJobs.add(new Job(t,n));
325	323	}
326	324
327	325	///////////////////////////////////////////////////////////////////////////////////////////////////
...	...
608	606	*/
609	607	public void attach(DistortedNode node)
610	608	{
611		mJobs.add(new Job(ATTACH,node,null));
	609	mJobs.add(new Job(ATTACH,node));
612	610	DistortedMaster.newSlave(this);
613	611	}
614	612
...	...
627	625	public DistortedNode attach(DistortedInputSurface surface, DistortedEffects effects, MeshObject mesh)
628	626	{
629	627	DistortedNode node = new DistortedNode(surface,effects,mesh);
630		mJobs.add(new Job(ATTACH,node,null));
	628	mJobs.add(new Job(ATTACH,node));
631	629	DistortedMaster.newSlave(this);
632	630	return node;
633	631	}
...	...
657	655	if( node.getEffects().getID()==id )
658	656	{
659	657	detached = true;
660		mJobs.add(new Job(DETACH,node,null));
	658	mJobs.add(new Job(DETACH,node));
661	659	DistortedMaster.newSlave(this);
662	660	break;
663	661	}
...	...
694	692	*/
695	693	public void detach(DistortedNode node)
696	694	{
697		mJobs.add(new Job(DETACH,node,null));
	695	mJobs.add(new Job(DETACH,node));
698	696	DistortedMaster.newSlave(this);
699	697	}
700	698
...	...
707	705	*/
708	706	public void detachAll()
709	707	{
710		mJobs.add(new Job(DETALL,null,null));
	708	mJobs.add(new Job(DETALL,null));
711	709	DistortedMaster.newSlave(this);
712	710	}
713	711
...	...
754	752	mNumChildren = 0;
755	753	}
756	754	break;
757		case SORT : job.node.setPost(job.dep);
758		mChildren.remove(job.node);
	755	case SORT : mChildren.remove(job.node);
759	756	DistortedMaster.addSorted(mChildren,job.node);
760	757	break;
761	758	}

Also available in: Unified diff

Project

General

Profile

Distorted Android

Revision ffbe7ecf

Added by Leszek Koltunski over 8 years ago