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 shader constants

Browse Source
This commit is contained in:
codeanticode
2012-05-27 02:09:20 +00:00
parent d2e4195c9a
commit 415cb64449
5 changed files with 34 additions and 34 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", 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;
}
}
java/libraries/opengl/examples/Shaders/FXAA/FXAA.pde
+4 -4
View File
@@ -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;
}
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", 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;
}
}
java/libraries/opengl/src/processing/opengl/PGraphicsOpenGL.java
+16 -16
View File
@@ -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);
}