eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-02-03 05:39:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added texcoord matrix, reworked the shader setting methods a bit.

Browse Source
This commit is contained in:
codeanticode
2012-02-13 05:00:23 +00:00
parent 2f723a0403
commit a554f6f757
5 changed files with 138 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
java/libraries/opengl/src/processing/opengl/FillShaderFragTex.glsl
View File

@@ -21,13 +21,11 @@
uniform sampler2D textureSampler;
uniform vec2 texcoordScale;
uniform vec2 texcoordOffset;
varying vec4 vertColor;
varying vec2 vertTexcoord;
varying vec4 vertTexcoord;
void main() {
vec2 uv = vertTexcoord * texcoordScale + texcoordOffset;
gl_FragColor = texture2D(textureSampler, uv) * vertColor;
gl_FragColor = texture2D(textureSampler, vertTexcoord.st) * vertColor;
}

7
java/libraries/opengl/src/processing/opengl/FillShaderVertFull.glsl
View File

@@ -22,6 +22,7 @@
uniform mat4 modelviewMatrix;
uniform mat4 projmodelviewMatrix;
uniform mat3 normalMatrix;
uniform mat4 texcoordMatrix;
uniform int lightCount;
uniform vec4 lightPosition[8];
@@ -43,7 +44,7 @@ attribute vec4 inEmissive;
attribute float inShine;
varying vec4 vertColor;
varying vec2 vertTexcoord;
varying vec4 vertTexcoord;
const float zero_float = 0.0;
const float one_float = 1.0;
@@ -129,6 +130,6 @@ void main() {
vec4(totalSpecular, 1) * inSpecular +
inEmissive;
// Passing texture coordinates to the fragment shader
vertTexcoord = inTexcoord;
// Calculating texture coordinates, with r and q set both to one
vertTexcoord = texcoordMatrix * vec4(inTexcoord, 1.0, 1.0);
}

5
java/libraries/opengl/src/processing/opengl/FillShaderVertTex.glsl
View File

@@ -20,17 +20,18 @@
*/
uniform mat4 projmodelviewMatrix;
uniform mat4 texcoordMatrix;
attribute vec4 inVertex;
attribute vec4 inColor;
attribute vec2 inTexcoord;
varying vec4 vertColor;
varying vec2 vertTexcoord;
varying vec4 vertTexcoord;
void main() {
gl_Position = projmodelviewMatrix * inVertex;
vertColor = inColor;
vertTexcoord = inTexcoord;
vertTexcoord = texcoordMatrix * vec4(inTexcoord, 1.0, 1.0);
}

126
java/libraries/opengl/src/processing/opengl/PGraphicsOpenGL.java
View File

@@ -5570,9 +5570,37 @@ public class PGraphicsOpenGL extends PGraphics {
return null;
}
}
public PShader loadShader(String fragFilename, int kind) {
PShader shader;
if (kind == FILL_SHADER_SIMPLE) {
shader = new FillShaderSimple(parent);
shader.setVertexShader(defFillShaderVertSimpleURL);
} else if (kind == FILL_SHADER_LIT) {
shader = new FillShaderLit(parent);
shader.setVertexShader(defFillShaderVertLitURL);
} else if (kind == FILL_SHADER_TEX) {
shader = new FillShaderTex(parent);
shader.setVertexShader(defFillShaderVertTexURL);
} else if (kind == FILL_SHADER_FULL) {
shader = new FillShaderFull(parent);
shader.setVertexShader(defFillShaderVertFullURL);
} else if (kind == LINE_SHADER) {
shader = new LineShader(parent);
shader.setVertexShader(defLineShaderVertURL);
} else if (kind == POINT_SHADER) {
shader = new PointShader(parent);
shader.setVertexShader(defPointShaderVertURL);
} else {
PGraphics.showWarning("Wrong shader type");
return null;
}
shader.setFragmentShader(fragFilename);
return shader;
}
public void setShader(PShader shader, int kind) {
if (kind == FILL_SHADER_SIMPLE) {
if (kind == FILL_SHADER_SIMPLE) {
fillShaderSimple = (FillShaderSimple) shader;
} else if (kind == FILL_SHADER_LIT) {
fillShaderLit = (FillShaderLit) shader;
@@ -5625,7 +5653,7 @@ public class PGraphicsOpenGL extends PGraphics {
}
}
protected FillShader getFillShader(boolean lit, boolean tex) {
protected FillShader getFillShader(boolean lit, boolean tex) {
FillShader shader;
if (lit) {
if (tex) {
@@ -5694,6 +5722,10 @@ public class PGraphicsOpenGL extends PGraphics {
}
protected class FillShader extends PShader {
public FillShader(PApplet parent) {
super(parent);
}
public FillShader(PApplet parent, String vertFilename, String fragFilename) {
super(parent, vertFilename, fragFilename);
}
@@ -5726,6 +5758,10 @@ public class PGraphicsOpenGL extends PGraphics {
protected int inVertexLoc;
protected int inColorLoc;
public FillShaderSimple(PApplet parent) {
super(parent);
}
public FillShaderSimple(PApplet parent, String vertFilename, String fragFilename) {
super(parent, vertFilename, fragFilename);
@@ -5795,6 +5831,10 @@ public class PGraphicsOpenGL extends PGraphics {
protected int inEmissiveLoc;
protected int inShineLoc;
public FillShaderLit(PApplet parent) {
super(parent);
}
public FillShaderLit(PApplet parent, String vertFilename, String fragFilename) {
super(parent, vertFilename, fragFilename);
}
@@ -5906,15 +5946,19 @@ public class PGraphicsOpenGL extends PGraphics {
}
protected class FillShaderTex extends FillShaderSimple {
protected int texcoordScaleLoc;
protected int texcoordOffsetLoc;
protected int inTexcoordLoc;
PTexture texture;
protected int texcoordMatrixLoc;
protected int texcoordOffsetLoc;
protected float[] tcmat;
public FillShaderTex(PApplet parent) {
super(parent);
}
public FillShaderTex(PApplet parent, String vertFilename, String fragFilename) {
super(parent, vertFilename, fragFilename);
super(parent, vertFilename, fragFilename);
}
public FillShaderTex(PApplet parent, URL vertURL, URL fragURL) {
@@ -5924,7 +5968,7 @@ public class PGraphicsOpenGL extends PGraphics {
public void loadUniforms() {
super.loadUniforms();
texcoordScaleLoc = getUniformLocation("texcoordScale");
texcoordMatrixLoc = getUniformLocation("texcoordMatrix");
texcoordOffsetLoc = getUniformLocation("texcoordOffset");
}
@@ -5939,23 +5983,27 @@ public class PGraphicsOpenGL extends PGraphics {
}
public void setTexture(PTexture tex) {
texture = tex;
// Calculate scale and offset for texture coordinates
// and passing them to the fragment shader.
float scaleu = tex.maxTexCoordU;
float scalev = tex.maxTexCoordV;
float offsetu = 0;
float offsetv = 0;
float dispu = 0;
float dispv = 0;
if (tex.isFlippedY()) {
scalev *= -1;
offsetv = 1;
dispv = 1;
}
if (tcmat == null) {
tcmat = new float[16];
}
set2FloatUniform(texcoordScaleLoc, scaleu, scalev);
set2FloatUniform(texcoordOffsetLoc, offsetu, offsetv);
tcmat[0] = scaleu; tcmat[4] = 0; tcmat[ 8] = 0; tcmat[12] = dispu;
tcmat[1] = 0; tcmat[5] = scalev; tcmat[ 9] = 0; tcmat[13] = dispv;
tcmat[2] = 0; tcmat[6] = 0; tcmat[10] = 0; tcmat[14] = 0;
tcmat[3] = 0; tcmat[7] = 0; tcmat[11] = 0; tcmat[15] = 0;
set4x4MatUniform(texcoordMatrixLoc, tcmat);
set2FloatUniform(texcoordOffsetLoc, 1.0f / tex.width, 1.0f / tex.height);
}
public void start() {
@@ -5974,9 +6022,15 @@ public class PGraphicsOpenGL extends PGraphics {
protected class FillShaderFull extends FillShaderLit {
protected int inTexcoordLoc;
protected int texcoordScaleLoc;
protected int texcoordMatrixLoc;
protected int texcoordOffsetLoc;
protected float[] tcmat;
public FillShaderFull(PApplet parent) {
super(parent);
}
public FillShaderFull(PApplet parent, String vertFilename, String fragFilename) {
super(parent, vertFilename, fragFilename);
}
@@ -5988,7 +6042,7 @@ public class PGraphicsOpenGL extends PGraphics {
public void loadUniforms() {
super.loadUniforms();
texcoordScaleLoc = getUniformLocation("texcoordScale");
texcoordMatrixLoc = getUniformLocation("texcoordMatrix");
texcoordOffsetLoc = getUniformLocation("texcoordOffset");
}
@@ -6003,23 +6057,27 @@ public class PGraphicsOpenGL extends PGraphics {
}
public void setTexture(PTexture tex) {
texture = tex;
// Calculate scale and offset for texture coordinates
// and passing them to the fragment shader.
float scaleu = tex.maxTexCoordU;
float scalev = tex.maxTexCoordV;
float offsetu = 0;
float offsetv = 0;
float dispu = 0;
float dispv = 0;
if (tex.isFlippedY()) {
scalev *= -1;
offsetv = 1;
dispv = 1;
}
if (tcmat == null) {
tcmat = new float[16];
}
set2FloatUniform(texcoordScaleLoc, scaleu, scalev);
set2FloatUniform(texcoordOffsetLoc, offsetu, offsetv);
tcmat[0] = scaleu; tcmat[4] = 0; tcmat[ 8] = 0; tcmat[12] = dispu;
tcmat[1] = 0; tcmat[5] = scalev; tcmat[ 9] = 0; tcmat[13] = dispv;
tcmat[2] = 0; tcmat[6] = 0; tcmat[10] = 0; tcmat[14] = 0;
tcmat[3] = 0; tcmat[7] = 0; tcmat[11] = 0; tcmat[15] = 0;
set4x4MatUniform(texcoordMatrixLoc, tcmat);
set2FloatUniform(texcoordOffsetLoc, 1.0f / tex.width, 1.0f / tex.height);
}
public void start() {
@@ -6046,6 +6104,10 @@ public class PGraphicsOpenGL extends PGraphics {
protected int inColorLoc;
protected int inDirWidthLoc;
public LineShader(PApplet parent) {
super(parent);
}
public LineShader(PApplet parent, String vertFilename, String fragFilename) {
super(parent, vertFilename, fragFilename);
}
@@ -6125,6 +6187,10 @@ public class PGraphicsOpenGL extends PGraphics {
protected int inVertexLoc;
protected int inColorLoc;
protected int inSizeLoc;
public PointShader(PApplet parent) {
super(parent);
}
public PointShader(PApplet parent, String vertFilename, String fragFilename) {
super(parent, vertFilename, fragFilename);

38
java/libraries/opengl/src/processing/opengl/PShader.java
View File

@@ -63,6 +63,13 @@ public class PShader {
fragmentShader = 0;
}
public PShader(PApplet parent) {
this();
this.parent = parent;
pg = (PGraphicsOpenGL) parent.g;
pgl = pg.pgl;
}
/**
* Creates a shader program using the specified vertex and fragment
* shaders.
@@ -117,6 +124,21 @@ public class PShader {
}
}
public void setVertexShader(String vertFilename) {
this.vertexFilename = vertFilename;
}
public void setVertexShader(URL vertURL) {
this.vertexURL = vertURL;
}
public void setFragmentShader(String fragFilename) {
this.fragmentFilename = fragFilename;
}
public void setFragmentShader(URL fragURL) {
this.fragmentURL = fragURL;
}
/**
* Starts the execution of the shader program.
@@ -274,14 +296,20 @@ public class PShader {
if (programObject == 0) {
programObject = pg.createGLSLProgramObject();
if (vertexFilename != null && fragmentFilename != null) {
if (vertexFilename != null) {
loadVertexShader(vertexFilename);
loadFragmentShader(fragmentFilename);
} else if (vertexURL != null && fragmentURL != null) {
} else if (vertexURL != null) {
loadVertexShader(vertexURL);
loadFragmentShader(fragmentURL);
} else {
PGraphics.showException("Shader filenames and URLs are both null!");
PGraphics.showException("Vertex shader filenames and URLs are both null!");
}
if (fragmentFilename != null) {
loadFragmentShader(fragmentFilename);
} else if (fragmentURL != null) {
loadFragmentShader(fragmentURL);
} else {
PGraphics.showException("Fragment shader filenames and URLs are both null!");
}
checkLogInfo("Vertex shader " + vertexFilename + " compilation: ", vertexShader);