/src/main/java/org/distorted/library/MeshObject.java - Diff - Distorted Android

« Previous | Next »

Revision 226144d0

Added by Leszek Koltunski about 7 years ago

ID 226144d09a5038779477e2c04df07efe65ea29db
Parent 42571056
Child e78a30fd

Progress with VBOs - this time abstract out a new class, DistortedObject - i.e. everything that uploads something to GPU and thus needs to be auto re-created upon loss of the context.

     import android.opengl.GLES30;
     import java.nio.FloatBuffer;
     import java.util.HashMap;
     import java.util.LinkedList;
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     /**
-...
      * If you want to render to a particular shape, extend from here, construct the three FloatBuffers and
      * provide correct dataLength, i.e. the number of vertices.
      */
     public abstract class MeshObject
     public abstract class MeshObject extends DistortedObject
+       {
        static final int BYTES_PER_FLOAT   = 4; //
        static final int POSITION_DATA_SIZE= 3; // Size of the position data in elements
        static final int NORMAL_DATA_SIZE  = 3; // Size of the normal data in elements.
        static final int TEX_DATA_SIZE     = 2; // Size of the texture coordinate data in elements.
        ///// CREATING/DELETING Vertex Buffer Objects ///////////////////////////
        private static final int JOB_CREATE = 0;
        private static final int JOB_DELETE = 1;
        private class Job
+         {
          MeshObject mesh;
          int action;
          Job(MeshObject o, int a)
+           {
            mesh   = o;
            action = a;
+           }
+         }
        private static boolean mToDo = false;
        private static LinkedList<MeshObject> mDoneList = new LinkedList<>();
        private static HashMap<Long,Job> mToDoMap = new HashMap<>();
        /////////////////////////////////////////////////////////////////////////
        private static long mNextID = 0;
        private long mID;
        int dataLength;
        FloatBuffer mMeshPositions, mMeshNormals, mMeshTexture;
        int[] mPosVBO = new int[1];
-...
        MeshObject(float factor)
+         {
          zFactor = factor;
          mID     = mNextID++;
          super(DistortedObject.NOT_CREATED_YET,DistortedObject.TYPE_USER);
          zFactor = factor;
          recreate();
          mToDoMap.put(mID, new Job(this,JOB_CREATE) );
          mToDo = true;
+         }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     // must be called from a thread holding OpenGL Context
        static synchronized boolean toDo()
+         {
          if( mToDo )
+           {
            Job job;
            MeshObject mesh;
            for(Long key: mToDoMap.keySet())
+             {
              job = mToDoMap.get(key);
              mesh = job.mesh;
              //android.util.Log.d("MESH", "  ---> need to "+(job.action==JOB_CREATE ? "create":"delete") );
              if( job.action==JOB_CREATE )
+               {
                mesh.create();
                mDoneList.add(mesh);
+               }
              else if( job.action==JOB_DELETE )
+               {
                mesh.delete();
+               }
+             }
            mToDoMap.clear();
            mToDo = false;
            return true;
+           }
          return false;
+         }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
-...
     // Do NOT release mMeshPositions etc as we will need them when we need to re-create the buffers after
     // a loss of OpenGL context!
        private void create()
        void create()
+         {
          if( mPosVBO[0]<0 )
+           {
-...
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     // must be called from a thread holding OpenGL Context
        private void delete()
        void delete()
+         {
          if( mPosVBO[0]>=0 )
+           {
-...
     ///////////////////////////////////////////////////////////////////////////////////////////////////
        private void recreate()
        void recreate()
+         {
          mPosVBO[0] = -1;
          mNorVBO[0] = -1;
-...
+         }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     // debugging only
       static synchronized void onPause()
+        {
         MeshObject mesh;
         int num = mDoneList.size();
         for(int i=0; i<num; i++)
+          {
           mesh = mDoneList.removeFirst();
           mToDoMap.put(mesh.getID(), mesh.new Job(mesh,JOB_CREATE) );
           mesh.recreate();
+          }
         mToDo = true;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       static synchronized void onDestroy()
+        {
         mToDoMap.clear();
         mDoneList.clear();
         mToDo = true;
         mNextID = 0;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       @SuppressWarnings("unused")
       static void debugLists()
+        {
         android.util.Log.e("Mesh", "Done list:");
         MeshObject mesh;
         int num = mDoneList.size();
         for(int i=0; i<num; i++)
+          {
           mesh = mDoneList.get(i);
           mesh.print(i, "");
+          }
         android.util.Log.e("Mesh", "ToDo list:");
         Job job;
         int i=0;
         for(Long key: mToDoMap.keySet())
+          {
           job = mToDoMap.get(key);
           job.mesh.print(i++, job.action==JOB_CREATE ? " create":" delete");
+          }
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       private void print(int i, String extra)
+        {
         String str;
              if( this instanceof MeshFlat ) str = (i+": MeshFlat  ");
         else if( this instanceof MeshCubes) str = (i+": MeshCubes ");
         else                                str = (i+": UNKNOWN   ");
         str += ( "dataLength: "+dataLength+" meshID:"+getID());
        String printDetails()
+         {
          return getClass().getSimpleName()+" vertices:"+dataLength;
+         }
         android.util.Log.e("Mesh", str+extra);
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     /**
      * Get the minimal set of Vertices which have the same convex hull as the whole set.
-...
      * This is used to be able to quickly compute, in window coordinates, the Mesh'es bounding rectangle.
      */
        abstract float[] getBoundingVertices();
     ///////////////////////////////////////////////////////////////////////////////////////////////////
        synchronized void markForCreation()
+         {
          mDoneList.remove(this);
          mToDoMap.put(mID, new Job(this,JOB_CREATE) );
          mToDo = true;
+         }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     // PUBLIC API
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     /**
      * Mark the underlying OpenGL object for deletion. Actual deletion will take place on the next render.
      */
        synchronized public void markForDeletion()
+         {
          mDoneList.remove(this);
          mToDoMap.put(mID, new Job(this,JOB_DELETE) );
          mToDo = true;
+         }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     /**
      * Return unique ID of this Mesh.
      */
        public long getID()
+        {
         return mID;
+        }
+       }

Also available in: Unified diff

Project

General

Profile

Distorted Android

Revision 226144d0

Added by Leszek Koltunski about 7 years ago