diff options
author | Ansis Brammanis <brammanis@gmail.com> | 2015-01-30 11:02:26 -0800 |
---|---|---|
committer | Ansis Brammanis <brammanis@gmail.com> | 2015-01-30 11:02:26 -0800 |
commit | 47966a143176a337733fe63b4121d2d00c48359a (patch) | |
tree | 555d03c55442d6825de9924c0c9f86c37d1e24af /src/mbgl/shader | |
parent | 2686198a1835cea26c5ca7873f8f7f31b3ce7504 (diff) | |
download | qtlocation-mapboxgl-47966a143176a337733fe63b4121d2d00c48359a.tar.gz |
make line-opacity work with line-image
js: 0e9a86e3553913abb8ebb3d8926e2b99db8d4008
Diffstat (limited to 'src/mbgl/shader')
-rw-r--r-- | src/mbgl/shader/linepattern.fragment.glsl | 3 | ||||
-rw-r--r-- | src/mbgl/shader/linepattern_shader.hpp | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/mbgl/shader/linepattern.fragment.glsl b/src/mbgl/shader/linepattern.fragment.glsl index 52ca823a3b..45be7c8c2f 100644 --- a/src/mbgl/shader/linepattern.fragment.glsl +++ b/src/mbgl/shader/linepattern.fragment.glsl @@ -6,6 +6,7 @@ uniform vec2 u_pattern_size; uniform vec2 u_pattern_tl; uniform vec2 u_pattern_br; uniform float u_fade; +uniform float u_opacity; uniform sampler2D u_image; @@ -31,7 +32,7 @@ void main() { vec4 color = texture2D(u_image, pos) * (1.0 - u_fade) + u_fade * texture2D(u_image, pos2); - color.rgb *= color.a; // premultiply + alpha *= u_opacity; gl_FragColor = color * alpha; } diff --git a/src/mbgl/shader/linepattern_shader.hpp b/src/mbgl/shader/linepattern_shader.hpp index ace8198aed..388cff17d2 100644 --- a/src/mbgl/shader/linepattern_shader.hpp +++ b/src/mbgl/shader/linepattern_shader.hpp @@ -22,6 +22,7 @@ public: Uniform<float> u_point = {"u_point", *this}; Uniform<float> u_blur = {"u_blur", *this}; Uniform<float> u_fade = {"u_fade", *this}; + Uniform<float> u_opacity = {"u_opacity", *this}; private: int32_t a_pos = -1; |