/ - Diff - Distorted Android

« Previous | Next »

Revision 9519d1b1

Added by Leszek Koltunski about 4 years ago

ID 9519d1b1b279b3fc02e18457b7a2278a08386cef
Parent c8dbce40
Child 9ec374e8

1) Beginnings of support for using the library from more than one activity
2) rename DistortedLibrary.onCreate() to onSurfaceCreated()
3) (rubik) add Cambodia's flag.

     ///////////////////////////////////////////////////////////////////////////////////////////////////
     /**
      * When OpenGL context gets created, call this method so that the library can initialise its internal data structures.
      * I.e. best called from GLSurfaceView.onCreate().
      * I.e. best called from GLSurfaceView.Renderer.onSurfaceCreated().
      * <p>
      * Needs to be called from a thread holding the OpenGL context.
+     *
      * @param context Context of the App using the library - used to open up Resources and read Shader code.
      * @param listener The library will send all (asynchronous!) exceptions there.
      */
       public static void onCreate(final Context context, final ExceptionListener listener)
       public static void onSurfaceCreated(final Context context, final ExceptionListener listener)
+        {
         onCreate(context,listener,4);
         onSurfaceCreated(context,listener,4);
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     /**
      * When OpenGL context gets created, call this method so that the library can initialise its internal data structures.
      * I.e. best called from GLSurfaceView.onCreate().
      * I.e. best called from GLSurfaceView.Renderer.onSurfaceCreated().
      * <p>
      * Needs to be called from a thread holding the OpenGL context.
+     *
      * @param context Context of the App using the library - used to open up Resources and read Shader code.
      * @param listener The library will send all (asynchronous!) exceptions there.
      * @param queueSize the size of the FBO queue, a workaround for the bug on Mali drivers.
      * @param queueSize the size of the FBO queue, a workaround for the bug on Mali drivers. Use a small integer - 1,...,4
      */
       public static void onCreate(final Context context, final ExceptionListener listener, int queueSize)
       public static void onSurfaceCreated(final Context context, final ExceptionListener listener, int queueSize)
+        {
         final ActivityManager activityManager     = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
         final ConfigurationInfo configurationInfo = activityManager.getDeviceConfigurationInfo();
-...
         mOITCompilationAttempted = false;
         detectBuggyDriversAndSetQueueSize(queueSize);
         EffectMessageSender.startSending();
         mResources = context.getResources();
-...
      * <ul>
      * <li>the value of 'max' is outside permitted range (0 &le; max &le; Byte.MAX_VALUE)
      * <li>We try to increase the value of 'max' when it is too late to do so already. It needs to be called
      *     before the Vertex Shader gets compiled, i.e. before the call to {@link DistortedLibrary#onCreate}. After this
      *     before the Vertex Shader gets compiled, i.e. before the call to {@link DistortedLibrary#onSurfaceCreated}. After this
      *     time only decreasing the value of 'max' is permitted.
      * <li>Furthermore, this needs to be called before any instances of the DistortedEffects class get created.
      * </ul>

     package org.distorted.library.main;
     import java.util.ArrayList;
     import java.util.HashMap;
     import java.util.LinkedList;
-...
       private static final int JOB_CREATE = 0;
       private static final int JOB_DELETE = 1;
       private final static Object mLock = new Object();
       private long mID;
       private int mType;
       /////////////////////////////////////////////////////////////////
       private static class Job
+        {
         InternalObject object;
-...
+          }
+        }
       /////////////////////////////////////////////////////////////////
       private static boolean mToDo = false;
       private static LinkedList<InternalObject> mDoneList = new LinkedList<>();
       private static HashMap<Long,Job> mToDoMap = new HashMap<>();
       private static long mNextClientID = 0;
       private static long mNextSystemID = 0;
       private static StackFrame mCurrentFrame = null;
       private static ArrayList<StackFrame> mFrameList = new ArrayList<>();
       private final static Object mDoneLock = new Object();
       private final static Object mToDoLock = new Object();
       /////////////////////////////////////////////////////////////////
       private long mID;
       private int mType;
       private static class StackFrame
+        {
         private LinkedList<InternalObject> mDoneList;
         private HashMap<Long,Job> mToDoMap;
         private long mNextClientID;
         private long mNextSystemID;
         /////////////////////////////////////////////////////////
         StackFrame()
+          {
           mDoneList = new LinkedList<>();
           mToDoMap  = new HashMap<>();
           mNextClientID = 0;
           mNextSystemID = 0;
+          }
         /////////////////////////////////////////////////////////
         void onPause()
+          {
           int num = mDoneList.size();
           try
+            {
             for (int i=0; i<num; i++)
+              {
               InternalObject object = mDoneList.removeFirst();
               Job job = new Job(object, JOB_CREATE);
               mToDoMap.put(object.mID,job);
               object.recreate();
+              }
+            }
           catch( Exception ignored )
+            {
             // something else removed an object in the meantime; ignore
+            }
+          }
         /////////////////////////////////////////////////////////
         void toDo()
+          {
           for(Long key: mToDoMap.keySet())
+            {
             Job job = mToDoMap.get(key);
             InternalObject object = job.object;
             if( job.action==JOB_CREATE )
+              {
               object.create();
               mDoneList.add(object);
+              }
             else if( job.action==JOB_DELETE )
+              {
               object.delete();
+              }
+            }
           mToDoMap.clear();
+          }
         /////////////////////////////////////////////////////////
         long generateID(int type)
+          {
           return type==TYPE_SYST ? --mNextSystemID : ++mNextClientID;
+          }
         /////////////////////////////////////////////////////////
         void addToDoneList(InternalObject obj)
+          {
           mDoneList.add(obj);
+          }
         /////////////////////////////////////////////////////////
         void markFor(InternalObject obj, long id, int jobType)
+          {
           mDoneList.remove(obj);
           mToDoMap.put(id, new Job(obj,jobType) );
+          }
         /////////////////////////////////////////////////////////
         void debugLists(String frameMarker)
+          {
           android.util.Log.e("Object", frameMarker);
           android.util.Log.e("Object", "  Done list:");
           for(InternalObject object : mDoneList)
+            {
             object.print("  ");
+            }
           android.util.Log.e("Object", "  ToDo list:");
           Job job;
           for(Long key: mToDoMap.keySet())
+            {
             job = mToDoMap.get(key);
             job.object.print(job.action==JOB_CREATE ? " create":" delete");
+            }
+          }
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
-...
+        {
         if( mToDo )
+          {
           Job job;
           InternalObject object;
           mToDo = false;
           synchronized(mToDoLock)
           synchronized(mLock)
+            {
             for(Long key: mToDoMap.keySet())
+              {
               job = mToDoMap.get(key);
               object = job.object;
               if( job.action==JOB_CREATE )
+                {
                 object.create();
                 mDoneList.add(object);
+                }
               else if( job.action==JOB_DELETE )
+                {
                 object.delete();
+                }
+              }
             mToDoMap.clear();
             mToDo = false;
             mCurrentFrame.toDo();
+            }
           return true;
+          }
-...
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       static void onPause()
       static void onCreate()
+        {
         InternalObject object;
         synchronized(mDoneLock)
         synchronized(mLock)
+          {
           synchronized(mToDoLock)
+            {
             int num = mDoneList.size();
             try
+              {
               for (int i = 0; i < num; i++)
+                {
                 object = mDoneList.removeFirst();
                 Job job = new Job(object, JOB_CREATE);
                 mToDoMap.put(object.mID,job);
                 object.recreate();
+                }
+              }
             catch( Exception ex )
+              {
               // something else removed an object in the meantime; ignore
+              }
+            }
           mCurrentFrame = new StackFrame();
           mFrameList.add(mCurrentFrame);
           mToDo = false;
+          }
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
         mToDo = true;
       static void onPause()
+        {
         synchronized(mLock)
+          {
           mCurrentFrame.onPause();
           mToDo = true;
+          }
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       static void onDestroy()
+        {
         synchronized(mToDoLock)
         synchronized(mLock)
+          {
           synchronized(mDoneLock)
           int num = mFrameList.size();
           if( num>0 )
+            {
             mToDoMap.clear();
             mDoneList.clear();
             mFrameList.remove(num-1);
             mToDo = true;
             mNextClientID = 0;
             if( num>1 )
+              {
               mCurrentFrame = mFrameList.get(num-2);
               mToDo = true;
+              }
             else
+              {
               mCurrentFrame = null;
               mToDo = false;
+              }
+            }
+          }
+        }
-...
       @SuppressWarnings("unused")
       static void debugLists()
+        {
         android.util.Log.e("Object", "Done list:");
         int num = mFrameList.size();
         StackFrame frame;
         for(InternalObject object : mDoneList)
         for(int i=0; i<num; i++)
+          {
           object.print("");
+          }
         android.util.Log.e("Object", "ToDo list:");
         Job job;
         for(Long key: mToDoMap.keySet())
+          {
           job = mToDoMap.get(key);
           job.object.print(job.action==JOB_CREATE ? " create":" delete");
           frame = mFrameList.get(i);
           frame.debugLists("frame "+i);
+          }
+        }
-...
       InternalObject(int type)
+        {
         mID  = type==TYPE_SYST ? --mNextSystemID : ++mNextClientID;
         if( mCurrentFrame==null ) onCreate();
         mID = mCurrentFrame.generateID(type);
         mType= type;
+        }
-...
       void markWasCreatedImmediately()
+        {
         mDoneList.add(this);
         mCurrentFrame.addToDoneList(this);
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       void markForCreation()
+        {
         synchronized(mDoneLock)
         synchronized(mLock)
+          {
           mDoneList.remove(this);
+          }
         synchronized(mToDoLock)
+          {
           mToDoMap.put(mID, new Job(this,JOB_CREATE) );
           mCurrentFrame.markFor(this,mID,JOB_CREATE);
           mToDo = true;
+          }
+        }
-...
      */
       public void markForDeletion()
+        {
         synchronized(mDoneLock)
+          {
           mDoneList.remove(this);
+          }
         synchronized(mToDoLock)
         synchronized(mLock)
+          {
           mToDoMap.put(mID, new Job(this,JOB_DELETE) );
           mCurrentFrame.markFor(this,mID,JOB_DELETE);
           mToDo = true;
+          }
+        }
-...
+        {
         return mID;
+        }
+    }

Also available in: Unified diff

Project

General

Profile

Distorted Android

Revision 9519d1b1

Added by Leszek Koltunski about 4 years ago