diff --git a/core/src/processing/opengl/MaskShaderFrag.glsl b/core/src/processing/opengl/MaskShaderFrag.glsl index 5ec22fd5b..cab482648 100644 --- a/core/src/processing/opengl/MaskShaderFrag.glsl +++ b/core/src/processing/opengl/MaskShaderFrag.glsl @@ -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); } \ No newline at end of file diff --git a/core/src/processing/opengl/PolyTexShaderFrag.glsl b/core/src/processing/opengl/PolyTexShaderFrag.glsl index 60edc4a66..d48d34d71 100644 --- a/core/src/processing/opengl/PolyTexShaderFrag.glsl +++ b/core/src/processing/opengl/PolyTexShaderFrag.glsl @@ -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; } \ No newline at end of file diff --git a/core/src/processing/opengl/PolyTexShaderVert.glsl b/core/src/processing/opengl/PolyTexShaderVert.glsl index 7e68a30df..33a0d016e 100644 --- a/core/src/processing/opengl/PolyTexShaderVert.glsl +++ b/core/src/processing/opengl/PolyTexShaderVert.glsl @@ -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); } \ No newline at end of file diff --git a/core/src/processing/opengl/PolyTexlightShaderVert.glsl b/core/src/processing/opengl/PolyTexlightShaderVert.glsl index 69ba8efba..0ce98a3e6 100644 --- a/core/src/processing/opengl/PolyTexlightShaderVert.glsl +++ b/core/src/processing/opengl/PolyTexlightShaderVert.glsl @@ -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); }