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

Fixed hints handling

Browse Source
This commit is contained in:
codeanticode
2011-12-14 20:47:52 +00:00
parent 0ba371e382
commit 7a0f3c3d25
4 changed files with 39 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/libraries/opengl/src/processing/opengl/PGraphicsOpenGL.java
+18 -17
View File
@@ -1408,18 +1408,18 @@ public class PGraphicsOpenGL extends PGraphics {
setDefaultBlend();
// this is necessary for 3D drawing
if (hints[DISABLE_DEPTH_TEST]) {
gl.glDisable(GL.GL_DEPTH_TEST);
if (hintEnabled(ENABLE_DEPTH_TEST)) {
gl.glEnable(GL.GL_DEPTH_TEST);
} else {
gl.glEnable(GL.GL_DEPTH_TEST);
gl.glDisable(GL.GL_DEPTH_TEST);
}
// use <= since that's what processing.core does
gl.glDepthFunc(GL.GL_LEQUAL);
if (hints[DISABLE_DEPTH_MASK]) {
gl.glDepthMask(false);
if (hintEnabled(ENABLE_DEPTH_MASK)) {
gl.glDepthMask(true);
} else {
gl.glDepthMask(true);
gl.glDepthMask(false);
}
// setup opengl viewport.
@@ -1601,17 +1601,18 @@ public class PGraphicsOpenGL extends PGraphics {
restoreGLMatrices();
// Restoring hints.
if (hints[DISABLE_DEPTH_TEST]) {
if (hintEnabled(DISABLE_DEPTH_TEST)) {
gl.glEnable(GL.GL_DEPTH_TEST);
} else {
gl.glDisable(GL.GL_DEPTH_TEST);
gl.glClearColor(0, 0, 0, 0);
gl.glClear(GL.GL_DEPTH_BUFFER_BIT);
} else {
gl.glEnable(GL.GL_DEPTH_TEST);
gl.glClear(GL.GL_DEPTH_BUFFER_BIT);
}
if (hints[DISABLE_DEPTH_MASK]) {
gl.glDepthMask(false);
if (hintEnabled(ENABLE_DEPTH_MASK)) {
gl.glDepthMask(true);
} else {
gl.glDepthMask(true);
gl.glDepthMask(false);
}
// Restoring blending.
@@ -4953,7 +4954,7 @@ public class PGraphicsOpenGL extends PGraphics {
* throw an GL_INVALID_OPERATION error.
*/
public void report(String where) {
if (!hints[DISABLE_OPENGL_ERROR_REPORT]) {
if (hintEnabled(ENABLE_OPENGL_ERROR_REPORT)) {
int err = gl.glGetError();
if (err != 0) {
String errString = glu.gluErrorString(err);
@@ -5954,10 +5955,10 @@ public class PGraphicsOpenGL extends PGraphics {
gl2f.glMatrixMode(GL2.GL_MODELVIEW);
gl2f.glPopMatrix();
if (hints[DISABLE_DEPTH_MASK]) {
gl.glDepthMask(false);
if (hintEnabled(ENABLE_DEPTH_MASK)) {
gl.glDepthMask(true);
} else {
gl.glDepthMask(true);
gl.glDepthMask(false);
}
}
java/libraries/opengl/src/processing/opengl/PShape3D.java
+6 -4
View File
@@ -49,11 +49,11 @@ import java.util.HashSet;
// Notes about geometry update in PShape3D.
// 1) Flush mechanism for data update in PShape3D?
// only do copy to tess arrays, and mark updated shapes.
// When drawing, put all modified data in large array and
// copy to VBO using single glBufferSubData() call.
// only do copy to tess arrays, and mark updated shapes.
// When drawing, put all modified data in large array and
// copy to VBO using single glBufferSubData() call.
// 2) What about fill called on a GROUP shape? shoud apply
// color change to all child shapes. Probably yes.
// color change to all child shapes. Probably yes.
// 3) translate, scale, rotate, and applyMatrix could
// work in a similar way as update color, since they are
// transformations that apply on all tesselated geometry
@@ -1355,6 +1355,8 @@ public class PShape3D extends PShape {
}
// TODO: implement smarter update logic so that transformed contiguous shapes
// are copied to the root VBO in a single call.
protected void updateGeometry() {
if (root == this && parent == null) {
fillVertCopyOffset = 0;