/ - Diff - Distorted Android

        private float[] mVertAttribs1;             // packed: PosX,PosY,PosZ, NorX,NorY,NorZ, InfX,InfY,InfZ
        private float[] mVertAttribs2;             // packed: TexS,TexT
        private float mInflate;
        private boolean mNeedsAdjustment;
        private boolean[] mNeedsAdjustment;
        private static class Component
+         {
-...
        MeshBase()
+         {
          mShowNormals     = false;
          mInflate         = 0.0f;
          mNeedsAdjustment = false;
          mComponent       = new ArrayList<>();
          mShowNormals= false;
          mInflate    = 0.0f;
          mComponent  = new ArrayList<>();
          mNeedsAdjustment = new boolean[1];
          mNeedsAdjustment[0] = false;
          mVBO1= new InternalBuffer(GLES30.GL_ARRAY_BUFFER             , GLES30.GL_STATIC_READ);
          mVBO2= new InternalBuffer(GLES30.GL_ARRAY_BUFFER             , GLES30.GL_STATIC_READ);
-...
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     // copy constructor
        MeshBase(MeshBase original)
        MeshBase(MeshBase original, boolean deep)
+         {
          mShowNormals     = original.mShowNormals;
          mInflate         = original.mInflate;
          mNeedsAdjustment = original.mNeedsAdjustment;
          mNumVertices     = original.mNumVertices;
          int size = original.mComponent.size();
          mComponent = new ArrayList<>();
-...
            mComponent.add(comp);
+           }
          mVBO1= new InternalBuffer(GLES30.GL_ARRAY_BUFFER             , GLES30.GL_STATIC_READ);
          mVBO2= new InternalBuffer(GLES30.GL_ARRAY_BUFFER             , GLES30.GL_STATIC_READ);
          mTFO = new InternalBuffer(GLES30.GL_TRANSFORM_FEEDBACK_BUFFER, GLES30.GL_STATIC_READ);
          if( deep )
+           {
            mNeedsAdjustment = new boolean[1];
            mNeedsAdjustment[0] = original.mNeedsAdjustment[0];
          mNumVertices = original.mNumVertices;
          mVertAttribs1= new float[mNumVertices*VERT1_ATTRIBS];
          mVertAttribs2= new float[mNumVertices*VERT2_ATTRIBS];
            mVBO1= new InternalBuffer(GLES30.GL_ARRAY_BUFFER, GLES30.GL_STATIC_READ);
            mVertAttribs1= new float[mNumVertices*VERT1_ATTRIBS];
            System.arraycopy(original.mVertAttribs1,0,mVertAttribs1,0,mNumVertices*VERT1_ATTRIBS);
            mVBO1.invalidate();
+           }
          else
+           {
            mNeedsAdjustment = original.mNeedsAdjustment;
            mVBO1            = original.mVBO1;
            mVertAttribs1    = original.mVertAttribs1;
+           }
          System.arraycopy(original.mVertAttribs1,0,mVertAttribs1,0,mNumVertices*VERT1_ATTRIBS);
          mVBO2= new InternalBuffer(GLES30.GL_ARRAY_BUFFER, GLES30.GL_STATIC_READ);
          mVertAttribs2= new float[mNumVertices*VERT2_ATTRIBS];
          System.arraycopy(original.mVertAttribs2,0,mVertAttribs2,0,mNumVertices*VERT2_ATTRIBS);
          mVBO1.invalidate();
          mVBO2.invalidate();
          mTFO = new InternalBuffer(GLES30.GL_TRANSFORM_FEEDBACK_BUFFER, GLES30.GL_STATIC_READ);
          mTFO.invalidate();
+         }
-...
      */
        public void bindVertexAttribs(DistortedProgram program)
+         {
          if( mNeedsAdjustment )
          if( mNeedsAdjustment[0] )
+           {
            mNeedsAdjustment = false;
            mNeedsAdjustment[0] = false;
            DistortedLibrary.adjustVertices(this);
+           }
-...
            mComponent.get(i).mQueue.add(effect);
+           }
          mNeedsAdjustment = true;
          mNeedsAdjustment[0] = true;
+         }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
-...
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     /**
      * Deep copy
      * Copy the Mesh.
+     *
      * @param deep If to be a deep or shallow copy of mVertAttribs1, i.e. the array holding vertices,
      *             normals and inflates (the rest, in particular the mVertAttribs2 containing texture
      *             coordinates and effect assocciations, is always deep copied)
      */
        public abstract MeshBase deepCopy();
        public abstract MeshBase copy(boolean deep);
+       }

     ///////////////////////////////////////////////////////////////////////////////////////////////////
     /**
      * deep copy.
      * Copy constructor.
      */
      public MeshCubes(MeshCubes mesh)
      public MeshCubes(MeshCubes mesh, boolean deep)
+       {
        super(mesh);
        super(mesh,deep);
+       }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     /**
      * deep copy.
      * Copy the Mesh.
+     *
      * @param deep If to be a deep or shallow copy of mVertAttribs1, i.e. the array holding vertices,
      *             normals and inflates (the rest, in particular the mVertAttribs2 containing texture
      *             coordinates and effect assocciations, is always deep copied).
      */
      public MeshCubes deepCopy()
      public MeshCubes copy(boolean deep)
+       {
        return new MeshCubes(this);
        return new MeshCubes(this,deep);
+       }
+     }

     ///////////////////////////////////////////////////////////////////////////////////////////////////
     /**
      * deep copy.
      * Copy constructor.
      */
       public MeshJoined(MeshJoined mesh)
       public MeshJoined(MeshJoined mesh, boolean deep)
+       {
        super(mesh);
        super(mesh,deep);
+       }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     /**
      * deep copy.
      * Copy the Mesh.
+     *
      * @param deep If to be a deep or shallow copy of mVertAttribs1, i.e. the array holding vertices,
      *             normals and inflates (the rest, in particular the mVertAttribs2 containing texture
      *             coordinates and effect assocciations, is always deep copied)
      */
       public MeshJoined deepCopy()
       public MeshJoined copy(boolean deep)
+       {
        return new MeshJoined(this);
        return new MeshJoined(this,deep);
+       }
     ///////////////////////////////////////////////////////////////////////////////////////////////////

     ///////////////////////////////////////////////////////////////////////////////////////////////////
     /**
      * deep copy.
      * Copy constructor.
      */
       public MeshQuad(MeshQuad mesh)
       public MeshQuad(MeshQuad mesh, boolean deep)
+        {
         super(mesh);
         super(mesh,deep);
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     /**
      * deep copy.
      * Copy the Mesh.
+     *
      * @param deep If to be a deep or shallow copy of mVertAttribs1, i.e. the array holding vertices,
      *             normals and inflates (the rest, in particular the mVertAttribs2 containing texture
      *             coordinates and effect assocciations, is always deep copied)
      */
       public MeshQuad deepCopy()
       public MeshQuad copy(boolean deep)
+        {
         return new MeshQuad(this);
         return new MeshQuad(this,deep);
+        }
+      }

     ///////////////////////////////////////////////////////////////////////////////////////////////////
     /**
      * deep copy.
      * Copy constructor.
      */
       public MeshRectangles(MeshRectangles mesh)
       public MeshRectangles(MeshRectangles mesh, boolean deep)
+        {
         super(mesh);
         super(mesh,deep);
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     /**
      * deep copy.
      * Copy the Mesh.
+     *
      * @param deep If to be a deep or shallow copy of mVertAttribs1, i.e. the array holding vertices,
      *             normals and inflates (the rest, in particular the mVertAttribs2 containing texture
      *             coordinates and effect assocciations, is always deep copied)
      */
       public MeshRectangles deepCopy()
       public MeshRectangles copy(boolean deep)
+        {
         return new MeshRectangles(this);
         return new MeshRectangles(this,deep);
+        }
+     }

     ///////////////////////////////////////////////////////////////////////////////////////////////////
     /**
      * deep copy.
      * Copy cconstructor.
      */
       public MeshSphere(MeshSphere mesh)
       public MeshSphere(MeshSphere mesh, boolean deep)
+        {
         super(mesh);
         super(mesh,deep);
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     /**
      * deep copy.
      * Copy the Mesh.
+     *
      * @param deep If to be a deep or shallow copy of mVertAttribs1, i.e. the array holding vertices,
      *             normals and inflates (the rest, in particular the mVertAttribs2 containing texture
      *             coordinates and effect assocciations, is always deep copied)
      */
       public MeshSphere deepCopy()
       public MeshSphere copy(boolean deep)
+        {
         return new MeshSphere(this);
         return new MeshSphere(this,deep);
+        }
+      }

     ///////////////////////////////////////////////////////////////////////////////////////////////////
     /**
      * deep copy.
      * Copy constructor.
      */
       public MeshTriangles(MeshTriangles mesh)
       public MeshTriangles(MeshTriangles mesh, boolean deep)
+        {
         super(mesh);
         super(mesh,deep);
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     /**
      * deep copy.
      * Copy the Mesh.
+     *
      * @param deep If to be a deep or shallow copy of mVertAttribs1, i.e. the array holding vertices,
      *             normals and inflates (the rest, in particular the mVertAttribs2 containing texture
      *             coordinates and effect assocciations, is always deep copied)
      */
       public MeshTriangles deepCopy()
       public MeshTriangles copy(boolean deep)
+        {
         return new MeshTriangles(this);
         return new MeshTriangles(this,deep);
+        }
+      }

Project

General

Profile

Distorted Android

Revision 4f81e0c8

Added by Leszek Koltunski almost 4 years ago