renamed resetShader to defaultShader, updated examples

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