From b6b493c198bac09834168bdd52b0f42836015446 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Lemoine?= Date: Thu, 14 Feb 2013 11:50:58 +0100 Subject: [PATCH] Use vec2 for vTexCoord --- src/ol/renderer/webgl/webglmaprenderer.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ol/renderer/webgl/webglmaprenderer.js b/src/ol/renderer/webgl/webglmaprenderer.js index 7ca920c264..f7a553f3f2 100644 --- a/src/ol/renderer/webgl/webglmaprenderer.js +++ b/src/ol/renderer/webgl/webglmaprenderer.js @@ -50,11 +50,11 @@ ol.renderer.webgl.map.shader.Fragment = function() { 'uniform float uOpacity;', 'uniform sampler2D uTexture;', '', - 'varying vec4 vTexCoord;', + 'varying vec2 vTexCoord;', '', 'void main(void) {', '', - ' vec4 texColor = texture2D(uTexture, vTexCoord.st);', + ' vec4 texColor = texture2D(uTexture, vTexCoord);', ' vec4 color = uColorMatrix * vec4(texColor.rgb, 1.);', ' color.a = texColor.a * uOpacity;', '', @@ -80,11 +80,11 @@ ol.renderer.webgl.map.shader.Vertex = function() { '', 'uniform mat4 uTexCoordMatrix;', '', - 'varying vec4 vTexCoord;', + 'varying vec2 vTexCoord;', '', 'void main(void) {', ' gl_Position = vec4(aPosition, 0., 1.);', - ' vTexCoord = uTexCoordMatrix * vec4(aTexCoord, 0., 1.);', + ' vTexCoord = (uTexCoordMatrix * vec4(aTexCoord, 0., 1.)).st;', '}' ].join('\n')); };