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

cleanup shader constants, update examples

Browse Source
This commit is contained in:
codeanticode
2012-06-04 02:03:36 +00:00
parent 4ee85f0e45
commit 38e86225dc
6 changed files with 55 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/libraries/opengl/examples/Shaders/EdgeDetect/EdgeDetect.pde
+4 -4
View File
@@ -14,8 +14,8 @@ void setup() {
img = loadImage("berlin-1.jpg");
pg = (PGraphicsOpenGL)g;
shader = pg.loadShader("edges.glsl", TEXTURE_SHADER);
pg.setShader(shader, TEXTURE_SHADER);
shader = pg.loadShader("edges.glsl", PShader.TEXTURE_SHADER);
pg.setShader(shader, PShader.TEXTURE_SHADER);
customShader = true;
}
@@ -25,10 +25,10 @@ public void draw() {
public void mousePressed() {
if (customShader) {
pg.defaultShader(TEXTURE_SHADER);
pg.defaultShader(PShader.TEXTURE_SHADER);
customShader = false;
} else {
pg.setShader(shader, TEXTURE_SHADER);
pg.setShader(shader, PShader.TEXTURE_SHADER);
customShader = true;
}
}
java/libraries/opengl/examples/Shaders/FXAA/FXAA.pde
+6 -6
View File
@@ -20,8 +20,8 @@ void setup() {
canvas.noSmooth();
pg = (PGraphicsOpenGL) g;
shader = pg.loadShader("fxaa.glsl", TEXTURE_SHADER);
pg.setShader(shader, TEXTURE_SHADER);
shader = pg.loadShader("fxaa.glsl", PShader.TEXTURE_SHADER);
pg.setShader(shader, PShader.TEXTURE_SHADER);
usingShader = true;
canvas.beginDraw();
@@ -55,10 +55,10 @@ public void draw() {
public void mousePressed() {
if (!drawing && width - msgLen < mouseX && height - 23 < mouseY) {
if (usingShader) {
pg.defaultShader(TEXTURE_SHADER);
pg.defaultShader(PShader.TEXTURE_SHADER);
usingShader = false;
} else {
pg.setShader(shader, TEXTURE_SHADER);
pg.setShader(shader, PShader.TEXTURE_SHADER);
usingShader = true;
}
updateMessage();
@@ -84,11 +84,11 @@ void drawMessage() {
if (usingShader) {
// We need the default texture shader to
// render text.
pg.defaultShader(TEXTURE_SHADER);
pg.defaultShader(PShader.TEXTURE_SHADER);
}
fill(0);
text(message, width - msgLen, height - 5);
if (usingShader) {
pg.setShader(shader, TEXTURE_SHADER);
pg.setShader(shader, PShader.TEXTURE_SHADER);
}
}
java/libraries/opengl/examples/Shaders/ToonShading/ToonShading.pde
+4 -4
View File
@@ -13,8 +13,8 @@ public void setup() {
fill(204);
pg = (PGraphicsOpenGL)g;
shader = pg.loadShader("ToonVert.glsl", "ToonFrag.glsl", LIGHT_SHADER);
pg.setShader(shader, LIGHT_SHADER);
shader = pg.loadShader("ToonVert.glsl", "ToonFrag.glsl", PShader.LIGHT_SHADER);
pg.setShader(shader, PShader.LIGHT_SHADER);
customShader = true;
}
@@ -31,11 +31,11 @@ public void draw() {
public void mousePressed() {
if (dist(mouseX, mouseY, width/2, height/2) < 80) {
if (customShader) {
pg.defaultShader(LIGHT_SHADER);
pg.defaultShader(PShader.LIGHT_SHADER);
customShader = false;
}
else {
pg.setShader(shader, LIGHT_SHADER);
pg.setShader(shader, PShader.LIGHT_SHADER);
customShader = true;
}
}