From 30626be5ebec9c449370edc78ee1fe31bafeb76f Mon Sep 17 00:00:00 2001 From: codeanticode Date: Mon, 4 Jun 2012 14:21:00 +0000 Subject: [PATCH] renamed shader constants, again --- .../Shaders/EdgeDetect/EdgeDetect.pde | 8 ++-- .../opengl/examples/Shaders/FXAA/FXAA.pde | 12 ++--- .../Shaders/ToonShading/ToonShading.pde | 8 ++-- .../processing/opengl/PGraphicsOpenGL.java | 48 +++++++++---------- .../opengl/src/processing/opengl/PShader.java | 12 ++--- 5 files changed, 44 insertions(+), 44 deletions(-) diff --git a/java/libraries/opengl/examples/Shaders/EdgeDetect/EdgeDetect.pde b/java/libraries/opengl/examples/Shaders/EdgeDetect/EdgeDetect.pde index eeff962d1..2602a92d0 100644 --- a/java/libraries/opengl/examples/Shaders/EdgeDetect/EdgeDetect.pde +++ b/java/libraries/opengl/examples/Shaders/EdgeDetect/EdgeDetect.pde @@ -14,8 +14,8 @@ void setup() { img = loadImage("berlin-1.jpg"); pg = (PGraphicsOpenGL)g; - shader = pg.loadShader("edges.glsl", PShader.TEXTURE_SHADER); - pg.setShader(shader, PShader.TEXTURE_SHADER); + shader = pg.loadShader("edges.glsl", PShader.TEXTURED); + pg.setShader(shader, PShader.TEXTURED); customShader = true; } @@ -25,10 +25,10 @@ public void draw() { public void mousePressed() { if (customShader) { - pg.defaultShader(PShader.TEXTURE_SHADER); + pg.defaultShader(PShader.TEXTURED); customShader = false; } else { - pg.setShader(shader, PShader.TEXTURE_SHADER); + pg.setShader(shader, PShader.TEXTURED); customShader = true; } } diff --git a/java/libraries/opengl/examples/Shaders/FXAA/FXAA.pde b/java/libraries/opengl/examples/Shaders/FXAA/FXAA.pde index d799fc97d..72c2a15af 100644 --- a/java/libraries/opengl/examples/Shaders/FXAA/FXAA.pde +++ b/java/libraries/opengl/examples/Shaders/FXAA/FXAA.pde @@ -20,8 +20,8 @@ void setup() { canvas.noSmooth(); pg = (PGraphicsOpenGL) g; - shader = pg.loadShader("fxaa.glsl", PShader.TEXTURE_SHADER); - pg.setShader(shader, PShader.TEXTURE_SHADER); + shader = pg.loadShader("fxaa.glsl", PShader.TEXTURED); + pg.setShader(shader, PShader.TEXTURED); 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(PShader.TEXTURE_SHADER); + pg.defaultShader(PShader.TEXTURED); usingShader = false; } else { - pg.setShader(shader, PShader.TEXTURE_SHADER); + pg.setShader(shader, PShader.TEXTURED); usingShader = true; } updateMessage(); @@ -84,11 +84,11 @@ void drawMessage() { if (usingShader) { // We need the default texture shader to // render text. - pg.defaultShader(PShader.TEXTURE_SHADER); + pg.defaultShader(PShader.TEXTURED); } fill(0); text(message, width - msgLen, height - 5); if (usingShader) { - pg.setShader(shader, PShader.TEXTURE_SHADER); + pg.setShader(shader, PShader.TEXTURED); } } diff --git a/java/libraries/opengl/examples/Shaders/ToonShading/ToonShading.pde b/java/libraries/opengl/examples/Shaders/ToonShading/ToonShading.pde index e4a248f94..53f7059ca 100644 --- a/java/libraries/opengl/examples/Shaders/ToonShading/ToonShading.pde +++ b/java/libraries/opengl/examples/Shaders/ToonShading/ToonShading.pde @@ -13,8 +13,8 @@ public void setup() { fill(204); pg = (PGraphicsOpenGL)g; - shader = pg.loadShader("ToonVert.glsl", "ToonFrag.glsl", PShader.LIGHT_SHADER); - pg.setShader(shader, PShader.LIGHT_SHADER); + shader = pg.loadShader("ToonVert.glsl", "ToonFrag.glsl", PShader.LIT); + pg.setShader(shader, PShader.LIT)); 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(PShader.LIGHT_SHADER); + pg.defaultShader(PShader.LIT)); customShader = false; } else { - pg.setShader(shader, PShader.LIGHT_SHADER); + pg.setShader(shader, PShader.LIT)); customShader = true; } } diff --git a/java/libraries/opengl/src/processing/opengl/PGraphicsOpenGL.java b/java/libraries/opengl/src/processing/opengl/PGraphicsOpenGL.java index 7af3fe64c..4d4e47ca4 100644 --- a/java/libraries/opengl/src/processing/opengl/PGraphicsOpenGL.java +++ b/java/libraries/opengl/src/processing/opengl/PGraphicsOpenGL.java @@ -5383,17 +5383,17 @@ public class PGraphicsOpenGL extends PGraphics { public PShader loadShader(String vertFilename, String fragFilename, int kind) { - if (kind == PShader.FLAT_SHADER) { + if (kind == PShader.FLAT) { return new PolyFlatShader(parent, vertFilename, fragFilename); - } else if (kind == PShader.LIGHT_SHADER) { + } else if (kind == PShader.LIT) { return new PolyLightShader(parent, vertFilename, fragFilename); - } else if (kind == PShader.TEXTURE_SHADER) { + } else if (kind == PShader.TEXTURED) { return new PolyTexShader(parent, vertFilename, fragFilename); - } else if (kind == PShader.FULL_SHADER) { + } else if (kind == PShader.FULL) { return new PolyFullShader(parent, vertFilename, fragFilename); - } else if (kind == PShader.LINE3D_SHADER) { + } else if (kind == PShader.LINE) { return new LineShader(parent, vertFilename, fragFilename); - } else if (kind == PShader.POINT3D_SHADER) { + } else if (kind == PShader.POINT) { return new PointShader(parent, vertFilename, fragFilename); } else { PGraphics.showWarning("Wrong shader type"); @@ -5404,22 +5404,22 @@ public class PGraphicsOpenGL extends PGraphics { public PShader loadShader(String fragFilename, int kind) { PShader shader; - if (kind == PShader.FLAT_SHADER) { + if (kind == PShader.FLAT) { shader = new PolyFlatShader(parent); shader.setVertexShader(defPolyFlatShaderVertURL); - } else if (kind == PShader.LIGHT_SHADER) { + } else if (kind == PShader.LIT) { shader = new PolyLightShader(parent); shader.setVertexShader(defPolyLightShaderVertURL); - } else if (kind == PShader.TEXTURE_SHADER) { + } else if (kind == PShader.TEXTURED) { shader = new PolyTexShader(parent); shader.setVertexShader(defPolyTexShaderVertURL); - } else if (kind == PShader.FULL_SHADER) { + } else if (kind == PShader.FULL) { shader = new PolyFullShader(parent); shader.setVertexShader(defPolyFullShaderVertURL); - } else if (kind == PShader.LINE3D_SHADER) { + } else if (kind == PShader.LINE) { shader = new LineShader(parent); shader.setVertexShader(defLineShaderVertURL); - } else if (kind == PShader.POINT3D_SHADER) { + } else if (kind == PShader.POINT) { shader = new PointShader(parent); shader.setVertexShader(defPointShaderVertURL); } else { @@ -5433,17 +5433,17 @@ public class PGraphicsOpenGL extends PGraphics { public void setShader(PShader shader, int kind) { flush(); // Flushing geometry with a different shader. - if (kind == PShader.FLAT_SHADER) { + if (kind == PShader.FLAT) { polyFlatShader = (PolyFlatShader) shader; - } else if (kind == PShader.LIGHT_SHADER) { + } else if (kind == PShader.LIT) { polyLightShader = (PolyLightShader) shader; - } else if (kind == PShader.TEXTURE_SHADER) { + } else if (kind == PShader.TEXTURED) { polyTexShader = (PolyTexShader) shader; - } else if (kind == PShader.FULL_SHADER) { + } else if (kind == PShader.FULL) { polyFullShader = (PolyFullShader) shader; - } else if (kind == PShader.LINE3D_SHADER) { + } else if (kind == PShader.LINE) { lineShader = (LineShader) shader; - } else if (kind == PShader.POINT3D_SHADER) { + } else if (kind == PShader.POINT) { pointShader = (PointShader) shader; } else { PGraphics.showWarning("Wrong shader type"); @@ -5453,32 +5453,32 @@ public class PGraphicsOpenGL extends PGraphics { public void defaultShader(int kind) { flush(); // Flushing geometry with a different shader. - if (kind == PShader.FLAT_SHADER) { + if (kind == PShader.FLAT) { if (defPolyFlatShader == null || defPolyFlatShader.contextIsOutdated()) { defPolyFlatShader = new PolyFlatShader(parent, defPolyFlatShaderVertURL, defPolyNoTexShaderFragURL); } polyFlatShader = defPolyFlatShader; - } else if (kind == PShader.LIGHT_SHADER) { + } else if (kind == PShader.LIT) { if (defPolyLightShader == null || defPolyLightShader.contextIsOutdated()) { defPolyLightShader = new PolyLightShader(parent, defPolyLightShaderVertURL, defPolyNoTexShaderFragURL); } polyLightShader = defPolyLightShader; - } else if (kind == PShader.TEXTURE_SHADER) { + } else if (kind == PShader.TEXTURED) { if (defPolyTexShader == null || defPolyTexShader.contextIsOutdated()) { defPolyTexShader = new PolyTexShader(parent, defPolyTexShaderVertURL, defPolyTexShaderFragURL); } polyTexShader = defPolyTexShader; - } else if (kind == PShader.FULL_SHADER) { + } else if (kind == PShader.FULL) { if (defPolyFullShader == null || defPolyFullShader.contextIsOutdated()) { defPolyFullShader = new PolyFullShader(parent, defPolyFullShaderVertURL, defPolyTexShaderFragURL); } polyFullShader = defPolyFullShader; - } else if (kind == PShader.LINE3D_SHADER) { + } else if (kind == PShader.LINE) { if (defLineShader == null || defLineShader.contextIsOutdated()) { defLineShader = new LineShader(parent, defLineShaderVertURL, defLineShaderFragURL); } lineShader = defLineShader; - } else if (kind == PShader.POINT3D_SHADER) { + } else if (kind == PShader.POINT) { if (defPointShader == null || defPointShader.contextIsOutdated()) { defPointShader = new PointShader(parent, defPointShaderVertURL, defPointShaderFragURL); } diff --git a/java/libraries/opengl/src/processing/opengl/PShader.java b/java/libraries/opengl/src/processing/opengl/PShader.java index fdb9e6ed0..08c1871f1 100644 --- a/java/libraries/opengl/src/processing/opengl/PShader.java +++ b/java/libraries/opengl/src/processing/opengl/PShader.java @@ -34,12 +34,12 @@ import java.net.URL; */ public class PShader { // shaders constants - static public final int FLAT_SHADER = 0; - static public final int LIGHT_SHADER = 1; - static public final int TEXTURE_SHADER = 2; - static public final int FULL_SHADER = 3; - static public final int LINE3D_SHADER = 4; - static public final int POINT3D_SHADER = 5; + static public final int FLAT = 0; + static public final int LIT = 1; + static public final int TEXTURED = 2; + static public final int FULL = 3; + static public final int LINE = 4; + static public final int POINT = 5; protected PApplet parent; protected PGraphicsOpenGL pg;