/ - Diff - Distorted Android

« Previous | Next »

Revision 7691a39f

Added by Leszek Koltunski over 8 years ago

ID 7691a39f3126e7743afac456ec30712d9e76a6d5
Parent 63b6561a
Child c7da4e65

- workaround for the issue with flashing in StarWars
- return number of objects rendered from OutputSurface.render() and use this in Olympic
- rework tree isomorphism so that it now works even if we don't render the whole tree (and also we don't have to reset() the Tree anymore!)
- current a buf with tree isomorphism: Leaf Nodes have the same NodeData only if they agree in Surface AND Effects!

      */
     public class Distorted
+      {
       /**
        * When creating an instance of a DistortedTexture (or Tree) from another instance, do not clone anything.
        * Used in the copy constructor.
        */
       public static final int CLONE_NOTHING = 0x0;
       /**
        * When creating an instance of a DistortedTexture from another instance, clone the Bitmap that's
        * backing up our DistortedTexture.
-...
         DistortedEffects.createProgram(resources);
         EffectQueuePostprocess.createProgram(resources);
         DistortedNode.reset();
         EffectMessageSender.startSending();
         mInitialized = true;

+        {
         long ID;
         int numPointingNodes;
         int numRendered;
         int numRender;
         ArrayList<Long> key;
         DistortedFramebuffer mFBO;
-...
           ID              = id;
           key             = k;
           numPointingNodes= 1;
           numRendered     = 0;
           numRender       =-1;
           mFBO            = null;
+          }
+        }
-...
         ArrayList<Long> ret = new ArrayList<>();
         ret.add( mSurface.getID() );
         if( mNumChildren[0]==0 )
+          {
           ret.add(-mEffects.getID());
+          }
         DistortedNode node;
         for(int i=0; i<mNumChildren[0]; i++)
-...
         return ret;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     // this will be called on startup and every time OpenGL context has been lost
       static void reset()
+        {
         NodeData tmp;
         for(ArrayList<Long> key: mMapNodeID.keySet())
+          {
           tmp = mMapNodeID.get(key);
           if( tmp.mFBO != null ) tmp.numRendered = 0;
+          }
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     // Debug - print all the Node IDs
-...
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     // return the total number of render calls issued
       void drawRecursive(long currTime, DistortedOutputSurface surface)
       int drawRecursive(int render, long currTime, DistortedOutputSurface surface)
+        {
         int ret = 0;
         float halfX = mSurface.getWidth()/2.0f;
         float halfY = mSurface.getHeight()/2.0f;
-...
+          }
         else
+          {
           if( mData.numRendered==0 )
           if( mData.numRender!=render )
+            {
             mData.numRender = render;
             mData.mFBO.setAsOutput();
             GLES30.glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
             GLES30.glClear( GLES30.GL_DEPTH_BUFFER_BIT | GLES30.GL_COLOR_BUFFER_BIT);
             if( mSurface.setAsInput() )
               DistortedEffects.drawNoEffectsPriv(halfX, halfY, mMesh, mData.mFBO );
+              {
               ret++;
               DistortedEffects.drawNoEffectsPriv(halfX, halfY, mMesh, mData.mFBO);
+              }
             for(int i=0; i<mNumChildren[0]; i++)
+              {
               mChildren.get(i).drawRecursive(currTime, mData.mFBO);
               ret += mChildren.get(i).drawRecursive(render, currTime, mData.mFBO);
+              }
+            }
           mData.numRendered++;
           mData.numRendered %= mData.numPointingNodes;
           mData.mFBO.setAsInput();
+          }
         mEffects.drawPriv(halfX, halfY, mMesh, surface, currTime);
         return ret+1;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
-...
         ArrayList<Long> list = new ArrayList<>();
         list.add(mSurface.getID());
         list.add(-mEffects.getID());
         mData = mMapNodeID.get(list);

src/main/java/org/distorted/library/DistortedOutputSurface.java
27	27
28	28	abstract class DistortedOutputSurface extends DistortedSurface implements DistortedAttacheable
29	29	{
	30	private static int mRender = 0;
	31
30	32	private ArrayList<DistortedNode> mChildren;
31	33	private int mNumChildren; // ==mChildren.length(), but we only create mChildren if the first one gets added
32	34
...	...
105	107	* Must be called from a thread holding OpenGL Context.
106	108	*
107	109	* @param time Current time, in milliseconds. This will be passed to all the Effects stored in the children Nodes.
	110	* @return Number of objects rendered.
108	111	*/
109		public void render(long time)
	112	public int render(long time)
110	113	{
	114	mRender++;
	115
111	116	// change tree topology (attach and detach children)
112	117	// create and delete all underlying OpenGL resources
113	118	// Watch out: FIRST change topology, only then deal
...	...
125	130	mChildren.get(i).debug(0);
126	131	}
127	132
128		//DistortedNode.debugMap();
	133	DistortedNode.debugMap();
129	134	}
130	135
131	136	toDo();
...	...
135	140	DistortedSurface.debugLists();
136	141	}
137	142
	143	int numRenders = 0;
	144
138	145	for(int i=0; i<mNumChildren; i++)
139	146	{
140		mChildren.get(i).drawRecursive(time,this);
	147	numRenders += mChildren.get(i).drawRecursive(mRender,time,this);
141	148	}
	149
	150	return numRenders;
142	151	}
143	152
144	153	///////////////////////////////////////////////////////////////////////////////////////////////////

Also available in: Unified diff

Project

General

Profile

Distorted Android

Revision 7691a39f

Added by Leszek Koltunski over 8 years ago