ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use vec2 for vTexCoord

Browse Source
This commit is contained in:
Éric Lemoine
2013-02-14 11:50:58 +01:00
parent de7a1d8f81
commit b6b493c198
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/renderer/webgl/webglmaprenderer.js
+4 -4
View File
@@ -50,11 +50,11 @@ ol.renderer.webgl.map.shader.Fragment = function() {
'uniform float uOpacity;', 'uniform float uOpacity;',
'uniform sampler2D uTexture;', 'uniform sampler2D uTexture;',
'', '',
'varying vec4 vTexCoord;', 'varying vec2 vTexCoord;',
'', '',
'void main(void) {', 'void main(void) {',
'', '',
' vec4 texColor = texture2D(uTexture, vTexCoord.st);', ' vec4 texColor = texture2D(uTexture, vTexCoord);',
' vec4 color = uColorMatrix * vec4(texColor.rgb, 1.);', ' vec4 color = uColorMatrix * vec4(texColor.rgb, 1.);',
' color.a = texColor.a * uOpacity;', ' color.a = texColor.a * uOpacity;',
'', '',
@@ -80,11 +80,11 @@ ol.renderer.webgl.map.shader.Vertex = function() {
'', '',
'uniform mat4 uTexCoordMatrix;', 'uniform mat4 uTexCoordMatrix;',
'', '',
'varying vec4 vTexCoord;', 'varying vec2 vTexCoord;',
'', '',
'void main(void) {', 'void main(void) {',
' gl_Position = vec4(aPosition, 0., 1.);', ' gl_Position = vec4(aPosition, 0., 1.);',
' vTexCoord = uTexCoordMatrix * vec4(aTexCoord, 0., 1.);', ' vTexCoord = (uTexCoordMatrix * vec4(aTexCoord, 0., 1.)).st;',
'}' '}'
].join('\n')); ].join('\n'));
}; };