eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-06-16 04:26:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3410 from JakubValtar/bugfix-depth-sorter

Browse Source 
Fix NullPointerException in DepthSorter
This commit is contained in:
Ben Fry
2015-06-20 11:53:29 -04:00
parent 03acfd909b d9295c5f51
commit b91e46f2c7
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/processing/opengl/PGraphicsOpenGL.java
+5 -2
View File
@@ -209,6 +209,7 @@ public class PGraphicsOpenGL extends PGraphics {
// Depth sorter
protected DepthSorter sorter;
protected boolean isDepthSortingEnabled;
// ........................................................
@@ -2166,12 +2167,14 @@ public class PGraphicsOpenGL extends PGraphics {
if (is3D()) {
flush();
if (sorter == null) sorter = new DepthSorter(this);
isDepthSortingEnabled = true;
} else {
PGraphics.showWarning("Depth sorting can only be enabled in 3D");
}
} else if (which == DISABLE_DEPTH_SORT) {
if (is3D()) {
flush();
isDepthSortingEnabled = false;
}
}
}
@@ -2547,7 +2550,7 @@ public class PGraphicsOpenGL extends PGraphics {
projmodelview.set(projection);
}
if (hasPolys && !getHint(ENABLE_DEPTH_SORT)) {
if (hasPolys && !isDepthSortingEnabled) {
flushPolys();
if (raw != null) {
rawPolys();
@@ -2570,7 +2573,7 @@ public class PGraphicsOpenGL extends PGraphics {
}
}
if (hasPolys && getHint(ENABLE_DEPTH_SORT)) {
if (hasPolys && isDepthSortingEnabled) {
// We flush after lines so they are visible
// under transparent polygons
flushSortedPolys();