/ - Diff - Distorted Android

« Previous | Next »

Revision f4c5a46e

1. New icon for PreDeform app
2. Library: advances with DeferredMeshJobs

src/main/java/org/distorted/library/mesh/DeferredJobs.java
79	79	break;
80	80	case JOB_TYPE_MERGE : break;
81	81	case JOB_TYPE_JOIN : break;
82		case JOB_TYPE_COPY : break;
	82	case JOB_TYPE_COPY : mTarget.deepCopyAttribs1(mSource[0]);
	83	break;
83	84	}
84	85	}
85	86

          if( deep )
+           {
            mVBO1= new InternalBuffer(GLES30.GL_ARRAY_BUFFER, GLES30.GL_STATIC_READ);
            mVertAttribs1= new float[mNumVertices*VERT1_ATTRIBS];
            mJobNode = new DeferredJobs.JobNode[1];
            if( original.mJobNode[0]!=null )
+             {
              mJobNode[0] = new DeferredJobs.JobNode(original.mJobNode[0]);
              mJobNode[0] = DeferredJobs.copy(this,original);
+             }
            else
+             {
              deepCopyAttribs1(original);
+             }
            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
+           {
-...
          mComponentAssociationH[variant] = GLES30.glGetUniformLocation( mProgramH, "vComponAssoc");
+         }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
        void deepCopyAttribs1(MeshBase original)
+         {
          System.arraycopy(original.mVertAttribs1,0,mVertAttribs1,0,mNumVertices*VERT1_ATTRIBS);
          mVBO1.invalidate();
+         }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
        int numComponents()

Also available in: Unified diff