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

renamed resetShader to defaultShader, updated examples

Browse Source
This commit is contained in:
codeanticode
2012-05-25 16:45:23 +00:00
parent 08944f3a00
commit ce0efb24f6
4 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/libraries/opengl/examples/Shaders/EdgeDetect/EdgeDetect.pde
+6 -6
View File
@@ -7,7 +7,7 @@
PImage img;
PShader shader;
PGraphicsOpenGL pg;
boolean usingShader;
boolean customShader;
void setup() {
size(400, 400, P3D);
@@ -16,7 +16,7 @@ void setup() {
pg = (PGraphicsOpenGL)g;
shader = pg.loadShader("edges.glsl", POLY_SHADER_TEX);
pg.setShader(shader, POLY_SHADER_TEX);
usingShader = true;
customShader = true;
}
public void draw() {
@@ -24,11 +24,11 @@ public void draw() {
}
public void keyPressed() {
if (usingShader) {
pg.resetShader(POLY_SHADER_TEX);
usingShader = false;
if (customShader) {
pg.defaultShader(POLY_SHADER_TEX);
customShader = false;
} else {
pg.setShader(shader, POLY_SHADER_TEX);
usingShader = true;
customShader = true;
}
}
java/libraries/opengl/examples/Shaders/ToonShading/ToonShading.pde
+6 -6
View File
@@ -5,7 +5,7 @@
PShader shader;
PGraphicsOpenGL pg;
boolean usingShader;
boolean customShader;
public void setup() {
size(400, 400, P3D);
@@ -15,7 +15,7 @@ public void setup() {
pg = (PGraphicsOpenGL)g;
shader = pg.loadShader("ToonVert.glsl", "ToonFrag.glsl", POLY_SHADER_LIT);
pg.setShader(shader, POLY_SHADER_LIT);
usingShader = true;
customShader = true;
}
public void draw() {
@@ -29,13 +29,13 @@ public void draw() {
}
public void keyPressed() {
if (usingShader) {
pg.resetShader(POLY_SHADER_LIT);
usingShader = false;
if (customShader) {
pg.defaultShader(POLY_SHADER_LIT);
customShader = false;
}
else {
pg.setShader(shader, POLY_SHADER_LIT);
usingShader = true;
customShader = true;
}
}
java/libraries/opengl/src/processing/opengl/PGraphicsOpenGL.java
+1 -1
View File
@@ -5351,7 +5351,7 @@ public class PGraphicsOpenGL extends PGraphics {
}
public void resetShader(int kind) {
public void defaultShader(int kind) {
if (kind == POLY_SHADER_SIMPLE) {
if (defPolyShaderSimple == null || defPolyShaderSimple.contextIsOutdated()) {
defPolyShaderSimple = new PolyShaderSimple(parent, defPolyShaderVertSimpleURL, defPolyShaderFragNoTexURL);