eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-02-07 23:59:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:processing/processing

Browse Source
This commit is contained in:
Ben Fry
2015-06-05 22:21:04 -04:00
parent b4ac525392 7ecabd8a34
commit 88968262af
2 changed files with 59 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6850,15 +6850,15 @@ public class PGraphicsOpenGL extends PGraphics {
@Override
public PShader loadShader(String fragFilename, String vertFilename) {
PShader shader = null;
if (fragFilename == null || fragFilename.equals("")) {
PGraphics.showWarning(MISSING_FRAGMENT_SHADER);
return null;
} else if (vertFilename == null || vertFilename.equals("")) {
PGraphics.showWarning(MISSING_VERTEX_SHADER);
return null;
} else {
return new PShader(parent, vertFilename, fragFilename);
shader = new PShader(parent, vertFilename, fragFilename);
}
return shader;
}
@@ -6866,6 +6866,7 @@ public class PGraphicsOpenGL extends PGraphics {
public void shader(PShader shader) {
flush(); // Flushing geometry drawn with a different shader.
if (shader != null) shader.init();
if (shader.isPolyShader()) polyShader = shader;
else if (shader.isLineShader()) lineShader = shader;
else if (shader.isPointShader()) pointShader = shader;
@@ -6877,6 +6878,7 @@ public class PGraphicsOpenGL extends PGraphics {
public void shader(PShader shader, int kind) {
flush(); // Flushing geometry drawn with a different shader.
if (shader != null) shader.init();
if (kind == TRIANGLES) polyShader = shader;
else if (kind == LINES) lineShader = shader;
else if (kind == POINTS) pointShader = shader;