Project

General

Profile

« Previous | Next » 

Revision ceed2df6

Added by Leszek Koltunski over 4 years ago

Change abortAll to removeAll in effectQueues (for consistency)
Remove all pre-effects from the component queues when they are not used anymore.

View differences:

src/main/java/org/distorted/library/effectqueue/EffectQueue.java
345 345
// we do want to notify Listeners if they called 'abortAll' themselves but don't want to notify
346 346
// them if it is the library itself which is releasing resources.
347 347

  
348
  public synchronized int abortAll(boolean notify)
348
  public synchronized int removeAll(boolean notify)
349 349
    {
350 350
    mJobs.add(new Job(DETALL,0,notify,null));
351 351
    InternalMaster.newSlave(this);
src/main/java/org/distorted/library/main/DistortedEffects.java
104 104

  
105 105
    for( int i=0; i<EffectType.LENGTH; i++)
106 106
      {
107
      aborted += mQueues[i].abortAll(true);
107
      aborted += mQueues[i].removeAll(true);
108 108
      }
109 109

  
110 110
    return aborted;
......
120 120
  public int abortByType(EffectType type)
121 121
    {
122 122
    int num = type.ordinal();
123
    return mQueues[num].abortAll(true);
123
    return mQueues[num].removeAll(true);
124 124
    }
125 125

  
126 126
///////////////////////////////////////////////////////////////////////////////////////////////////
src/main/java/org/distorted/library/mesh/MeshBase.java
302 302
       }
303 303

  
304 304
     GLES30.glUnmapBuffer(GLES30.GL_TRANSFORM_FEEDBACK);
305

  
306
     int numComp = mComponent.size();
307

  
308
     for(int i=0; i<numComp; i++)
309
       {
310
       mComponent.get(i).mQueue.removeAll(false);
311
       }
305 312
     }
306 313

  
307 314
///////////////////////////////////////////////////////////////////////////////////////////////////

Also available in: Unified diff