varying vertTexcoord renamed to vertTexCoord

This commit is contained in:
codeanticode
2013-02-05 18:05:22 -05:00
parent 43a4a5ee84
commit c94086a910
4 changed files with 9 additions and 9 deletions
@@ -21,11 +21,11 @@
uniform sampler2D texture;
uniform sampler2D mask;
varying vec4 vertTexcoord;
varying vec4 vertTexCoord;
void main() {
vec3 texColor = texture2D(texture, vertTexcoord.st).rgb;
vec3 maskColor = texture2D(mask, vertTexcoord.st).rgb;
vec3 texColor = texture2D(texture, vertTexCoord.st).rgb;
vec3 maskColor = texture2D(mask, vertTexCoord.st).rgb;
float luminance = dot(maskColor, vec3(0.2126, 0.7152, 0.0722));
gl_FragColor = vec4(texColor, luminance);
}
@@ -28,8 +28,8 @@ uniform sampler2D texture;
uniform vec2 texOffset;
varying vec4 vertColor;
varying vec4 vertTexcoord;
varying vec4 vertTexCoord;
void main() {
gl_FragColor = texture2D(shininess, vertTexcoord.st) * vertColor;
gl_FragColor = texture2D(shininess, vertTexCoord.st) * vertColor;
}
@@ -26,11 +26,11 @@ attribute vec4 color;
attribute vec2 texCoord;
varying vec4 vertColor;
varying vec4 vertTexcoord;
varying vec4 vertTexCoord;
void main() {
gl_Position = transform * vertex;
vertColor = color;
vertTexcoord = texMatrix * vec4(texCoord, 1.0, 1.0);
vertTexCoord = texMatrix * vec4(texCoord, 1.0, 1.0);
}
@@ -43,7 +43,7 @@ attribute vec4 emissive;
attribute float shininess;
varying vec4 vertColor;
varying vec4 vertTexcoord;
varying vec4 vertTexCoord;
const float zero_float = 0.0;
const float one_float = 1.0;
@@ -141,5 +141,5 @@ void main() {
vec4(emissive.rgb, 0);
// Calculating texture coordinates, with r and q set both to one
vertTexcoord = texMatrix * vec4(texCoord, 1.0, 1.0);
vertTexCoord = texMatrix * vec4(texCoord, 1.0, 1.0);
}