Project

General

Profile

« Previous | Next » 

Revision 85bfeb7a

Added by Leszek Koltunski almost 6 years ago

Try and avoid re-sorting the children by buckets (if we can!). This makes change in rendering order in the 'Transparency' app actually work.

View differences:

src/main/java/org/distorted/library/main/DistortedNode.java
228 228
    if( mNumChildren[0]==0 && newData.mFBO!=null )
229 229
      {
230 230
      newData.mFBO.markForDeletion();
231
      android.util.Log.d("NODE", "ERROR!! this NodeData cannot possibly contain a non-null FBO!! "+newData.mFBO.getID() );
231
      android.util.Log.e("NODE", "ERROR!! this NodeData cannot possibly contain a non-null FBO!! "+newData.mFBO.getID() );
232 232
      newData.mFBO = null;
233 233
      }
234 234

  
......
362 362
    if( mParent!=null )
363 363
      {
364 364
      mParent.mChildren.remove(this);
365
      DistortedMaster.addSorted(mParent.mChildren,this);
365
      DistortedMaster.addSortingByBuckets(mParent.mChildren,this);
366 366
      }
367 367
    else if( mSurfaceParent!=null )
368 368
      {
369 369
      ArrayList<DistortedNode> children = mSurfaceParent.getChildren();
370 370
      children.remove(this);
371
      DistortedMaster.addSorted(children,this);
371
      DistortedMaster.addSortingByBuckets(children,this);
372 372
      }
373 373
    }
374 374

  
......
649 649
                     if( mChildren==null ) mChildren = new ArrayList<>(2);
650 650
                     job.node.mParent = this;
651 651
                     job.node.mSurfaceParent = null;
652
                     DistortedMaster.addSorted(mChildren,job.node);
652
                     DistortedMaster.addSortingByBuckets(mChildren,job.node);
653 653
                     mNumChildren[0]++;
654 654
                     break;
655 655
        case DETACH: numChanges++;
......
676 676
                       }
677 677
                     break;
678 678
        case SORT  : mChildren.remove(job.node);
679
                     DistortedMaster.addSorted(mChildren,job.node);
679
                     DistortedMaster.addSortingByBuckets(mChildren,job.node);
680 680
                     break;
681 681
        }
682 682
      }

Also available in: Unified diff