Revision 040cd18c
Added by Leszek Koltunski almost 6 years ago
| 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 |
|
| ... | ... | |
| 283 | 283 |
|
| 284 | 284 |
if( input.setAsInput() ) |
| 285 | 285 |
{
|
| 286 |
surface.setAsOutput(currTime); |
|
| 287 | 286 |
mState.apply(); |
| 288 | 287 |
GLES31.glDisable(GLES31.GL_BLEND); |
| 289 | 288 |
mEffects.drawPriv(mSurface.getWidth()/2.0f, mSurface.getHeight()/2.0f, mMesh, surface, currTime, 0); |
| ... | ... | |
| 303 | 302 |
|
| 304 | 303 |
if( input.setAsInput() ) |
| 305 | 304 |
{
|
| 306 |
surface.setAsOutput(currTime); |
|
| 307 | 305 |
mState.apply(); |
| 308 | 306 |
mEffects.drawPriv(mSurface.getWidth()/2.0f, mSurface.getHeight()/2.0f, mMesh, surface, currTime, 0); |
| 309 | 307 |
return 1; |
| ... | ... | |
| 364 | 362 |
if( mParent!=null ) |
| 365 | 363 |
{
|
| 366 | 364 |
mParent.mChildren.remove(this); |
| 367 |
DistortedMaster.addSorted(mParent.mChildren,this);
|
|
| 365 |
DistortedMaster.addSortingByBuckets(mParent.mChildren,this);
|
|
| 368 | 366 |
} |
| 369 | 367 |
else if( mSurfaceParent!=null ) |
| 370 | 368 |
{
|
| 371 | 369 |
ArrayList<DistortedNode> children = mSurfaceParent.getChildren(); |
| 372 | 370 |
children.remove(this); |
| 373 |
DistortedMaster.addSorted(children,this);
|
|
| 371 |
DistortedMaster.addSortingByBuckets(children,this);
|
|
| 374 | 372 |
} |
| 375 | 373 |
} |
| 376 | 374 |
|
| ... | ... | |
| 651 | 649 |
if( mChildren==null ) mChildren = new ArrayList<>(2); |
| 652 | 650 |
job.node.mParent = this; |
| 653 | 651 |
job.node.mSurfaceParent = null; |
| 654 |
DistortedMaster.addSorted(mChildren,job.node);
|
|
| 652 |
DistortedMaster.addSortingByBuckets(mChildren,job.node);
|
|
| 655 | 653 |
mNumChildren[0]++; |
| 656 | 654 |
break; |
| 657 | 655 |
case DETACH: numChanges++; |
| ... | ... | |
| 678 | 676 |
} |
| 679 | 677 |
break; |
| 680 | 678 |
case SORT : mChildren.remove(job.node); |
| 681 |
DistortedMaster.addSorted(mChildren,job.node);
|
|
| 679 |
DistortedMaster.addSortingByBuckets(mChildren,job.node);
|
|
| 682 | 680 |
break; |
| 683 | 681 |
} |
| 684 | 682 |
} |
Also available in: Unified diff
Port all the 'non-controversial' changes from order-independent-transparency branch.