eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-02-13 10:30:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

some more tweaks to shader loading and selection

Browse Source
This commit is contained in:
codeanticode
2013-10-07 18:48:19 -04:00
parent 40198890bb
commit bb1c16c7fc
1 changed files with 76 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
core/src/processing/opengl/PGraphicsOpenGL.java
View File

@@ -82,8 +82,23 @@ public class PGraphicsOpenGL extends PGraphics {
"The vertex and fragment shaders have different types";
static final String WRONG_SHADER_TYPE_ERROR =
"shader() called with a wrong shader";
static final String SHADER_NEED_LIGHT_ATTRIBS =
"The provided shader needs light attributes (ambient, diffuse, etc.), but " +
"the current scene is unlit, so the default shader will be used instead";
static final String UNKNOWN_SHADER_KIND_ERROR =
"Unknown shader kind";
static final String NO_TEXLIGHT_SHADER_ERROR =
"Your shader needs to be of TEXLIGHT type " +
"to render this geometry properly, using default shader instead.";
static final String NO_LIGHT_SHADER_ERROR =
"Your shader needs to be of LIGHT type " +
"to render this geometry properly, using default shader instead.";
static final String NO_TEXTURE_SHADER_ERROR =
"Your shader needs to be of TEXTURE type " +
"to render this geometry properly, using default shader instead.";
static final String NO_COLOR_SHADER_ERROR =
"Your shader needs to be of COLOR type " +
"to render this geometry properly, using default shader instead.";
static final String TOO_LONG_STROKE_PATH_ERROR =
"Stroke path is too long, some bevel triangles won't be added";
static final String TESSELLATION_ERROR =
@@ -6294,15 +6309,19 @@ public class PGraphicsOpenGL extends PGraphics {
} else if (shaderType == PShader.TEXLIGHT) {
shader = new PolyShader(parent);
shader.setVertexShader(defTexlightShaderVertURL);
((PolyShader)shader).setType(PShader.TEXLIGHT);
} else if (shaderType == PShader.LIGHT) {
shader = new PolyShader(parent);
shader.setVertexShader(defLightShaderVertURL);
((PolyShader)shader).setType(PShader.LIGHT);
} else if (shaderType == PShader.TEXTURE) {
shader = new PolyShader(parent);
((PolyShader)shader).setType(PShader.TEXTURE);
shader.setVertexShader(defTextureShaderVertURL);
} else if (shaderType == PShader.COLOR) {
shader = new PolyShader(parent);
shader.setVertexShader(defColorShaderVertURL);
((PolyShader)shader).setType(PShader.COLOR);
} else {
shader = new PolyShader(parent);
shader.setVertexShader(defTextureShaderVertURL);
@@ -6344,15 +6363,19 @@ public class PGraphicsOpenGL extends PGraphics {
} else if (shaderType == PShader.TEXLIGHT) {
shader = new PolyShader(parent);
shader.setFragmentShader(defTextureShaderFragURL);
((PolyShader)shader).setType(PShader.TEXLIGHT);
} else if (shaderType == PShader.LIGHT) {
shader = new PolyShader(parent);
shader.setFragmentShader(defColorShaderFragURL);
((PolyShader)shader).setType(PShader.LIGHT);
} else if (shaderType == PShader.TEXTURE) {
shader = new PolyShader(parent);
shader.setFragmentShader(defTextureShaderFragURL);
((PolyShader)shader).setType(PShader.TEXTURE);
} else if (shaderType == PShader.COLOR) {
shader = new PolyShader(parent);
shader.setFragmentShader(defColorShaderFragURL);
((PolyShader)shader).setType(PShader.COLOR);
} else {
shader = new PolyShader(parent);
shader.setVertexShader(defTextureShaderVertURL);
@@ -6476,9 +6499,10 @@ public class PGraphicsOpenGL extends PGraphics {
protected PolyShader getPolyShader(boolean lit, boolean tex) {
PolyShader shader;
boolean useDefault = polyShader == null;
if (lit) {
if (tex) {
if (polyShader == null) {
if (useDefault || !polyShader.checkType(PShader.TEXLIGHT)) {
if (defTexlightShader == null) {
defTexlightShader = new PolyShader(parent,
defTexlightShaderVertURL,
@@ -6489,7 +6513,7 @@ public class PGraphicsOpenGL extends PGraphics {
shader = polyShader;
}
} else {
if (polyShader == null) {
if (useDefault || !polyShader.checkType(PShader.LIGHT)) {
if (defLightShader == null) {
defLightShader = new PolyShader(parent,
defLightShaderVertURL,
@@ -6501,8 +6525,13 @@ public class PGraphicsOpenGL extends PGraphics {
}
}
} else {
if (polyShader != null && polyShader.accessLightAttribs()) {
PGraphics.showWarning(SHADER_NEED_LIGHT_ATTRIBS);
useDefault = true;
}
if (tex) {
if (polyShader == null) {
if (useDefault || !polyShader.checkType(PShader.TEXTURE)) {
if (defTextureShader == null) {
defTextureShader = new PolyShader(parent,
defTextureShaderVertURL,
@@ -6513,7 +6542,7 @@ public class PGraphicsOpenGL extends PGraphics {
shader = polyShader;
}
} else {
if (polyShader == null) {
if (useDefault || !polyShader.checkType(PShader.COLOR)) {
if (defColorShader == null) {
defColorShader = new PolyShader(parent,
defColorShaderVertURL,
@@ -6672,6 +6701,10 @@ public class PGraphicsOpenGL extends PGraphics {
return false;
}
public boolean accessLightAttribs() {
return false;
}
public void setVertexAttribute(int vboId, int size, int type,
int stride, int offset) { }
public void setColorAttribute(int vboId, int size, int type,
@@ -6693,6 +6726,8 @@ public class PGraphicsOpenGL extends PGraphics {
protected class PolyShader extends BaseShader {
protected int type = 0;
protected int vertexLoc;
protected int colorLoc;
protected int normalLoc;
@@ -6817,6 +6852,37 @@ public class PGraphicsOpenGL extends PGraphics {
}
}
public boolean hasType() {
return COLOR <= type && type <= TEXLIGHT;
}
public void setType(int type) {
this.type = type;
}
public int getType() {
return type;
}
public boolean checkType(int type) {
if (!hasType()) return true;
if (getType() != type) {
if (type == TEXLIGHT) {
PGraphics.showWarning(NO_TEXLIGHT_SHADER_ERROR);
} else if (type == LIGHT) {
PGraphics.showWarning(NO_LIGHT_SHADER_ERROR);
} else if (type == TEXTURE) {
PGraphics.showWarning(NO_TEXTURE_SHADER_ERROR);
} else if (type == COLOR) {
PGraphics.showWarning(NO_COLOR_SHADER_ERROR);
}
return false;
}
return true;
}
@Override
public boolean supportsTexturing() {
return -1 < textureLoc;
@@ -6837,6 +6903,12 @@ public class PGraphicsOpenGL extends PGraphics {
return -1 < normalLoc;
}
@Override
public boolean accessLightAttribs() {
return -1 < ambientLoc || -1 < specularLoc || -1 < emissiveLoc ||
-1 < shininessLoc;
}
@Override
public void setVertexAttribute(int vboId, int size, int type,
int stride, int offset) {