/ - Diff - Distorted Android

     import android.opengl.GLES31;
     import java.nio.Buffer;
     import java.nio.ByteBuffer;
     import java.nio.ByteOrder;
     import java.nio.FloatBuffer;
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     /**
-...
      */
     public class InternalBuffer extends InternalObject
+      {
       public int[] mIndex;
       public final int[] mIndex;
       private int mTarget, mSize, mUsage;
       private Buffer mBuffer;
-...
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     // mark for creation only now, when we do have all data ready, in order to avoid the situation
     // when create() would be called before this.
     // must be called from a thread holding OpenGL Context.
       public void setData(int size, Buffer buffer)
       public void createImmediately(int size, float[] buffer)
+        {
         mSize   = size;
         mBuffer = buffer;
         if( mIndex[0]<0 )
+          {
           mSize= size;
           if( buffer!=null )
+            {
             FloatBuffer buf = ByteBuffer.allocateDirect(size).order(ByteOrder.nativeOrder()).asFloatBuffer();
             buf.put(buffer).position(0);
             mBuffer = buf;
+            }
           else
+            {
             mBuffer = null;
+            }
           GLES31.glGenBuffers( 1, mIndex, 0);
           GLES31.glBindBuffer( mTarget, mIndex[0]);
           GLES31.glBufferData( mTarget, mSize, mBuffer, mUsage);
           GLES31.glBindBuffer( mTarget, 0);
         markForCreation();
           markWasCreatedImmediately();
+          }
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       public void invalidate()
+        {
         recreate();
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////

         mType= type;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       void markWasCreatedImmediately()
+        {
         mDoneList.add(this);
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       void markForCreation()

     import org.distorted.library.main.InternalBuffer;
     import org.distorted.library.program.DistortedProgram;
     import java.nio.ByteBuffer;
     import java.nio.ByteOrder;
     import java.nio.FloatBuffer;
     import java.util.ArrayList;
     ///////////////////////////////////////////////////////////////////////////////////////////////////
-...
          mComponent.add(new Component(mNumVertices));
          FloatBuffer attribs = ByteBuffer.allocateDirect(mNumVertices*VERT_SIZE).order(ByteOrder.nativeOrder()).asFloatBuffer();
          attribs.put(vertexAttribs).position(0);
          mVBO.setData(mNumVertices*VERT_SIZE, attribs);
          mTFO.setData(mNumVertices*TRAN_SIZE, null   );
          mVBO.invalidate();
          mTFO.invalidate();
+         }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
-...
+             }
            num = mesh.mNumVertices;
            mNumVertices+= (i<len-1 ? ( num%2==1 ? num+2 : num+1 ) : num);
            if( mNumVertices==0 ) mNumVertices += (num%2==1 ? num+2 : num+1);
            else if( i==len-1 )   mNumVertices += (num+1);
            else                  mNumVertices += (num%2==1 ? num+3 : num+2);
+           }
          // allocate new attrib array
-...
            mesh = meshes[i];
            num = mesh.mNumVertices;
            System.arraycopy(mesh.mVertAttribs, 0, newAttribs, VERT_ATTRIBS*origVertices, VERT_ATTRIBS    );
            origVertices++;
            if( origVertices>0 )
+             {
              System.arraycopy(mesh.mVertAttribs, 0, newAttribs, VERT_ATTRIBS*origVertices, VERT_ATTRIBS    );
              origVertices++;
+             }
            System.arraycopy(mesh.mVertAttribs, 0, newAttribs, VERT_ATTRIBS*origVertices, VERT_ATTRIBS*num);
            origVertices+=num;
-...
          mVertAttribs = newAttribs;
          FloatBuffer attribs = ByteBuffer.allocateDirect(mNumVertices*VERT_SIZE).order(ByteOrder.nativeOrder()).asFloatBuffer();
          attribs.put(mVertAttribs).position(0);
          mVBO.setData(mNumVertices*VERT_SIZE, attribs);
          mTFO.setData(mNumVertices*TRAN_SIZE, null   );
          mVBO.invalidate();
+         }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
-...
      */
        public void bindVertexAttribs(DistortedProgram program)
+         {
          mVBO.createImmediately(mNumVertices*VERT_SIZE, mVertAttribs);
          GLES31.glBindBuffer(GLES31.GL_ARRAY_BUFFER, mVBO.mIndex[0] );
          GLES31.glVertexAttribPointer(program.mAttribute[0], POS_DATA_SIZE, GLES31.GL_FLOAT, false, VERT_SIZE, OFFSET_POS);
          GLES31.glVertexAttribPointer(program.mAttribute[1], NOR_DATA_SIZE, GLES31.GL_FLOAT, false, VERT_SIZE, OFFSET_NOR);
-...
      */
        public void bindTransformAttribs(DistortedProgram program)
+         {
          mTFO.createImmediately(mNumVertices*TRAN_SIZE, null);
          GLES31.glBindBuffer(GLES31.GL_ARRAY_BUFFER, mTFO.mIndex[0] );
          GLES31.glVertexAttribPointer(program.mAttribute[0], POS_DATA_SIZE, GLES31.GL_FLOAT, false, 0, 0);
          GLES31.glBindBuffer(GLES31.GL_ARRAY_BUFFER, 0);
-...
+             }
+           }
          FloatBuffer attribs = ByteBuffer.allocateDirect(mNumVertices*VERT_SIZE).order(ByteOrder.nativeOrder()).asFloatBuffer();
          attribs.put(mVertAttribs).position(0);
          mVBO.setData(mNumVertices*VERT_SIZE, attribs);
          mTFO.setData(mNumVertices*TRAN_SIZE, null   );
          mTFO.invalidate();
+         }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
-...
+             }
+           }
          FloatBuffer attribs = ByteBuffer.allocateDirect(mNumVertices*VERT_SIZE).order(ByteOrder.nativeOrder()).asFloatBuffer();
          attribs.put(mVertAttribs).position(0);
          mVBO.setData(mNumVertices*VERT_SIZE, attribs);
          mTFO.setData(mNumVertices*TRAN_SIZE, null   );
          mTFO.invalidate();
+         }
     ///////////////////////////////////////////////////////////////////////////////////////////////////

Project

General

Profile

Distorted Android

Revision 22e60fba

Added by Leszek Koltunski over 4 years ago