From 415cb6444941b81b7b8c21eaaa4125c3b8337dd3 Mon Sep 17 00:00:00 2001 From: codeanticode Date: Sun, 27 May 2012 02:09:20 +0000 Subject: [PATCH] renamed shader constants --- core/src/processing/core/PConstants.java | 12 +++---- .../Shaders/EdgeDetect/EdgeDetect.pde | 8 ++--- .../opengl/examples/Shaders/FXAA/FXAA.pde | 8 ++--- .../Shaders/ToonShading/ToonShading.pde | 8 ++--- .../processing/opengl/PGraphicsOpenGL.java | 32 +++++++++---------- 5 files changed, 34 insertions(+), 34 deletions(-) diff --git a/core/src/processing/core/PConstants.java b/core/src/processing/core/PConstants.java index e9e49c6b9..3e2a05b29 100644 --- a/core/src/processing/core/PConstants.java +++ b/core/src/processing/core/PConstants.java @@ -452,12 +452,12 @@ public interface PConstants { // shaders - static public final int POLY_SHADER_SIMPLE = 0; - static public final int POLY_SHADER_LIT = 1; - static public final int POLY_SHADER_TEX = 2; - static public final int POLY_SHADER_FULL = 3; - static public final int LINE_SHADER = 4; - static public final int POINT_SHADER = 5; + 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 LINE_SHADER = 4; + static public final int POINT_SHADER = 5; // stroke modes diff --git a/java/libraries/opengl/examples/Shaders/EdgeDetect/EdgeDetect.pde b/java/libraries/opengl/examples/Shaders/EdgeDetect/EdgeDetect.pde index ed2cdf3c0..85288b2d5 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", POLY_SHADER_TEX); - pg.setShader(shader, POLY_SHADER_TEX); + shader = pg.loadShader("edges.glsl", TEXTURE_SHADER); + pg.setShader(shader, TEXTURE_SHADER); customShader = true; } @@ -25,10 +25,10 @@ public void draw() { public void keyPressed() { if (customShader) { - pg.defaultShader(POLY_SHADER_TEX); + pg.defaultShader(TEXTURE_SHADER); customShader = false; } else { - pg.setShader(shader, POLY_SHADER_TEX); + pg.setShader(shader, TEXTURE_SHADER); customShader = true; } } diff --git a/java/libraries/opengl/examples/Shaders/FXAA/FXAA.pde b/java/libraries/opengl/examples/Shaders/FXAA/FXAA.pde index 178b242c9..024ff89ba 100644 --- a/java/libraries/opengl/examples/Shaders/FXAA/FXAA.pde +++ b/java/libraries/opengl/examples/Shaders/FXAA/FXAA.pde @@ -17,8 +17,8 @@ void setup() { canvas.noSmooth(); pg = (PGraphicsOpenGL) g; - shader = pg.loadShader("fxaa.glsl", POLY_SHADER_TEX); - pg.setShader(shader, POLY_SHADER_TEX); + shader = pg.loadShader("fxaa.glsl", TEXTURE_SHADER); + pg.setShader(shader, TEXTURE_SHADER); println("FXAA shader is enabled"); usingShader = true; @@ -42,11 +42,11 @@ public void draw() { public void keyPressed() { if (usingShader) { - pg.defaultShader(POLY_SHADER_TEX); + pg.defaultShader(TEXTURE_SHADER); println("FXAA shader is disabled"); usingShader = false; } else { - pg.setShader(shader, POLY_SHADER_TEX); + pg.setShader(shader, TEXTURE_SHADER); println("FXAA shader is enabled"); usingShader = true; } diff --git a/java/libraries/opengl/examples/Shaders/ToonShading/ToonShading.pde b/java/libraries/opengl/examples/Shaders/ToonShading/ToonShading.pde index 9c14274ce..c74fbffad 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", POLY_SHADER_LIT); - pg.setShader(shader, POLY_SHADER_LIT); + shader = pg.loadShader("ToonVert.glsl", "ToonFrag.glsl", LIGHT_SHADER); + pg.setShader(shader, LIGHT_SHADER); customShader = true; } @@ -30,11 +30,11 @@ public void draw() { public void keyPressed() { if (customShader) { - pg.defaultShader(POLY_SHADER_LIT); + pg.defaultShader(LIGHT_SHADER); customShader = false; } else { - pg.setShader(shader, POLY_SHADER_LIT); + pg.setShader(shader, LIGHT_SHADER); customShader = true; } } diff --git a/java/libraries/opengl/src/processing/opengl/PGraphicsOpenGL.java b/java/libraries/opengl/src/processing/opengl/PGraphicsOpenGL.java index 9ee277bd0..44f5ff70b 100644 --- a/java/libraries/opengl/src/processing/opengl/PGraphicsOpenGL.java +++ b/java/libraries/opengl/src/processing/opengl/PGraphicsOpenGL.java @@ -5339,13 +5339,13 @@ public class PGraphicsOpenGL extends PGraphics { public PShader loadShader(String vertFilename, String fragFilename, int kind) { - if (kind == POLY_SHADER_SIMPLE) { + if (kind == FLAT_SHADER) { return new PolyShaderSimple(parent, vertFilename, fragFilename); - } else if (kind == POLY_SHADER_LIT) { + } else if (kind == LIGHT_SHADER) { return new PolyShaderLit(parent, vertFilename, fragFilename); - } else if (kind == POLY_SHADER_TEX) { + } else if (kind == TEXTURE_SHADER) { return new PolyShaderTex(parent, vertFilename, fragFilename); - } else if (kind == POLY_SHADER_FULL) { + } else if (kind == FULL_SHADER) { return new PolyShaderFull(parent, vertFilename, fragFilename); } else if (kind == LINE_SHADER) { return new LineShader(parent, vertFilename, fragFilename); @@ -5360,16 +5360,16 @@ public class PGraphicsOpenGL extends PGraphics { public PShader loadShader(String fragFilename, int kind) { PShader shader; - if (kind == POLY_SHADER_SIMPLE) { + if (kind == FLAT_SHADER) { shader = new PolyShaderSimple(parent); shader.setVertexShader(defPolyShaderVertSimpleURL); - } else if (kind == POLY_SHADER_LIT) { + } else if (kind == LIGHT_SHADER) { shader = new PolyShaderLit(parent); shader.setVertexShader(defPolyShaderVertLitURL); - } else if (kind == POLY_SHADER_TEX) { + } else if (kind == TEXTURE_SHADER) { shader = new PolyShaderTex(parent); shader.setVertexShader(defPolyShaderVertTexURL); - } else if (kind == POLY_SHADER_FULL) { + } else if (kind == FULL_SHADER) { shader = new PolyShaderFull(parent); shader.setVertexShader(defPolyShaderVertFullURL); } else if (kind == LINE_SHADER) { @@ -5388,13 +5388,13 @@ public class PGraphicsOpenGL extends PGraphics { public void setShader(PShader shader, int kind) { - if (kind == POLY_SHADER_SIMPLE) { + if (kind == FLAT_SHADER) { polyShaderSimple = (PolyShaderSimple) shader; - } else if (kind == POLY_SHADER_LIT) { + } else if (kind == LIGHT_SHADER) { polyShaderLit = (PolyShaderLit) shader; - } else if (kind == POLY_SHADER_TEX) { + } else if (kind == TEXTURE_SHADER) { polyShaderTex = (PolyShaderTex) shader; - } else if (kind == POLY_SHADER_FULL) { + } else if (kind == FULL_SHADER) { polyShaderFull = (PolyShaderFull) shader; } else if (kind == LINE_SHADER) { lineShader = (LineShader) shader; @@ -5407,22 +5407,22 @@ public class PGraphicsOpenGL extends PGraphics { public void defaultShader(int kind) { - if (kind == POLY_SHADER_SIMPLE) { + if (kind == FLAT_SHADER) { if (defPolyShaderSimple == null || defPolyShaderSimple.contextIsOutdated()) { defPolyShaderSimple = new PolyShaderSimple(parent, defPolyShaderVertSimpleURL, defPolyShaderFragNoTexURL); } polyShaderSimple = defPolyShaderSimple; - } else if (kind == POLY_SHADER_LIT) { + } else if (kind == LIGHT_SHADER) { if (defPolyShaderLit == null || defPolyShaderLit.contextIsOutdated()) { defPolyShaderLit = new PolyShaderLit(parent, defPolyShaderVertLitURL, defPolyShaderFragNoTexURL); } polyShaderLit = defPolyShaderLit; - } else if (kind == POLY_SHADER_TEX) { + } else if (kind == TEXTURE_SHADER) { if (defPolyShaderTex == null || defPolyShaderTex.contextIsOutdated()) { defPolyShaderTex = new PolyShaderTex(parent, defPolyShaderVertTexURL, defPolyShaderFragTexURL); } polyShaderTex = defPolyShaderTex; - } else if (kind == POLY_SHADER_FULL) { + } else if (kind == FULL_SHADER) { if (defPolyShaderFull == null || defPolyShaderFull.contextIsOutdated()) { defPolyShaderFull = new PolyShaderFull(parent, defPolyShaderVertFullURL, defPolyShaderFragTexURL); }