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

kind parameter in shader(shader, kind) overrides shader type specified

Browse Source 
by #define or autodetection using uniforms.
This commit is contained in:
codeanticode
2014-06-14 18:43:12 -04:00
parent 32e3c6854f
commit 23744dc031
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/processing/opengl/PGraphicsOpenGL.java
View File

@@ -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);
}