From 23744dc0317a79cbfd36eb76d9be56843aeb9289 Mon Sep 17 00:00:00 2001 From: codeanticode Date: Sat, 14 Jun 2014 18:43:12 -0400 Subject: [PATCH] kind parameter in shader(shader, kind) overrides shader type specified by #define or autodetection using uniforms. --- core/src/processing/opengl/PGraphicsOpenGL.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/core/src/processing/opengl/PGraphicsOpenGL.java b/core/src/processing/opengl/PGraphicsOpenGL.java index 12c6fe413..f177bfa67 100644 --- a/core/src/processing/opengl/PGraphicsOpenGL.java +++ b/core/src/processing/opengl/PGraphicsOpenGL.java @@ -6680,9 +6680,13 @@ public class PGraphicsOpenGL extends PGraphics { @Override - // TODO: deprecate this method, the kind arguments is not used anymore public void shader(PShader shader, int kind) { - shader(shader); + flush(); // Flushing geometry drawn with a different shader. + + if (kind == TRIANGLES) polyShader = shader; + else if (kind == LINES) lineShader = shader; + else if (kind == POINTS) pointShader = shader; + else PGraphics.showWarning(UNKNOWN_SHADER_KIND_ERROR); }