/ - Diff - Distorted Android

« Previous | Next »

Revision aee078f8

Added by Leszek Koltunski over 4 years ago

ID aee078f8bb1f8c6c955846baaf110c39080c92af
Parent 60fdf71d
Child 07206c71

Correct VertexEffectQueue in the Mesh. There's no need to have a separate Queue in every component.

        private int[] mAssociation;
        private static int[] mComponentAssociationH = new int[EffectQueue.MAIN_VARIANTS];
        private EffectQueueVertex mQueue;
        private static class Component
+         {
          private int mEndIndex;
          private Static4D mTextureMap;
          private EffectQueueVertex mQueue;
          Component(int end)
+           {
            mEndIndex  = end;
            mTextureMap= new Static4D(0,0,1,1);
            mQueue     = new EffectQueueVertex();
+           }
          Component(Component original)
+           {
-...
            float z = original.mTextureMap.get2();
            float w = original.mTextureMap.get3();
            mTextureMap = new Static4D(x,y,z,w);
            mQueue = new EffectQueueVertex(original.mQueue);
+           }
          void setMap(Static4D map)
-...
          for(int i=0; i<MAX_COMPONENTS; i++) mAssociation[i] = DEFAULT_ASSOCIATION;
          mNeedsAdjustment = new boolean[1];
          mQueue = new EffectQueueVertex();
          mVBO1= new InternalBuffer(GLES30.GL_ARRAY_BUFFER             , GLES30.GL_STATIC_READ);
          mVBO2= new InternalBuffer(GLES30.GL_ARRAY_BUFFER             , GLES30.GL_STATIC_READ);
-...
          int size = original.mComponent.size();
          mComponent = new ArrayList<>();
          mQueue = new EffectQueueVertex(original.mQueue);
          for(int i=0; i<size; i++)
+           {
-...
          GLES30.glUnmapBuffer(GLES30.GL_TRANSFORM_FEEDBACK);
          int numComp = mComponent.size();
          for(int i=0; i<numComp; i++)
+           {
            mComponent.get(i).mQueue.removeAll(false);
+           }
          mQueue.removeAll(false);
+         }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
-...
      */
        public void computeQueue()
+         {
          int numComp = mComponent.size();
          for(int i=0; i<numComp; i++)
+           {
            mComponent.get(i).mQueue.compute(1);
+           }
          mQueue.compute(1);
+         }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
-...
      */
        public void sendQueue()
+         {
          int numComp = mComponent.size();
          for(int i=0; i<numComp; i++)
+           {
            mComponent.get(i).mQueue.send(0.0f,3);
+           }
          mQueue.send(0.0f,3);
+         }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
-...
      */
        public void apply(VertexEffect effect)
+         {
          int numComp = mComponent.size();
          for(int i=0; i<numComp; i++)
+           {
            mComponent.get(i).mQueue.add(effect);
+           }
          mQueue.add(effect);
          mNeedsAdjustment[0] = true;
+         }

src/main/java/org/distorted/library/mesh/MeshCubes.java
941	941	*
942	942	* @param deep If to be a deep or shallow copy of mVertAttribs1, i.e. the array holding vertices,
943	943	* normals and inflates (the rest, in particular the mVertAttribs2 containing texture
944		* coordinates and effect assocciations, is always deep copied).
	944	* coordinates and effect associations, is always deep copied).
945	945	*/
946	946	public MeshCubes copy(boolean deep)
947	947	{

src/main/java/org/distorted/library/mesh/MeshJoined.java
50	50	*
51	51	* @param deep If to be a deep or shallow copy of mVertAttribs1, i.e. the array holding vertices,
52	52	* normals and inflates (the rest, in particular the mVertAttribs2 containing texture
53		* coordinates and effect assocciations, is always deep copied)
	53	* coordinates and effect associations, is always deep copied)
54	54	*/
55	55	public MeshJoined copy(boolean deep)
56	56	{

src/main/java/org/distorted/library/mesh/MeshQuad.java
84	84	*
85	85	* @param deep If to be a deep or shallow copy of mVertAttribs1, i.e. the array holding vertices,
86	86	* normals and inflates (the rest, in particular the mVertAttribs2 containing texture
87		* coordinates and effect assocciations, is always deep copied)
	87	* coordinates and effect associations, is always deep copied)
88	88	*/
89	89	public MeshQuad copy(boolean deep)
90	90	{

src/main/java/org/distorted/library/mesh/MeshRectangles.java
187	187	*
188	188	* @param deep If to be a deep or shallow copy of mVertAttribs1, i.e. the array holding vertices,
189	189	* normals and inflates (the rest, in particular the mVertAttribs2 containing texture
190		* coordinates and effect assocciations, is always deep copied)
	190	* coordinates and effect associations, is always deep copied)
191	191	*/
192	192	public MeshRectangles copy(boolean deep)
193	193	{

src/main/java/org/distorted/library/mesh/MeshSphere.java
285	285	*
286	286	* @param deep If to be a deep or shallow copy of mVertAttribs1, i.e. the array holding vertices,
287	287	* normals and inflates (the rest, in particular the mVertAttribs2 containing texture
288		* coordinates and effect assocciations, is always deep copied)
	288	* coordinates and effect associations, is always deep copied)
289	289	*/
290	290	public MeshSphere copy(boolean deep)
291	291	{

src/main/java/org/distorted/library/mesh/MeshTriangles.java
137	137	*
138	138	* @param deep If to be a deep or shallow copy of mVertAttribs1, i.e. the array holding vertices,
139	139	* normals and inflates (the rest, in particular the mVertAttribs2 containing texture
140		* coordinates and effect assocciations, is always deep copied)
	140	* coordinates and effect associations, is always deep copied)
141	141	*/
142	142	public MeshTriangles copy(boolean deep)
143	143	{

Also available in: Unified diff

Project

General

Profile

Distorted Android

Revision aee078f8

Added by Leszek Koltunski over 4 years ago