summaryrefslogtreecommitdiff
path: root/src/mbgl/shaders/collision_box.cpp
diff options
context:
space:
mode:
authorMikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com>2019-03-06 11:59:15 +0200
committerMikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com>2019-03-06 18:00:19 +0200
commit06a8ecdb171a6284f54d1db6847d4cc0cfcc9f91 (patch)
tree8a29cf95124c7efd23af80761919075eaca1c7f9 /src/mbgl/shaders/collision_box.cpp
parent8a8291d8f4ce39d341f42c6d14b2aaad28cd854e (diff)
downloadqtlocation-mapboxgl-06a8ecdb171a6284f54d1db6847d4cc0cfcc9f91.tar.gz
Update mapbox-gl-js submodule to v0.53.0
Diffstat (limited to 'src/mbgl/shaders/collision_box.cpp')
-rw-r--r--src/mbgl/shaders/collision_box.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mbgl/shaders/collision_box.cpp b/src/mbgl/shaders/collision_box.cpp
index 0c1395bf40..b016d48cc8 100644
--- a/src/mbgl/shaders/collision_box.cpp
+++ b/src/mbgl/shaders/collision_box.cpp
@@ -8,7 +8,7 @@ namespace shaders {
const char* collision_box::name = "collision_box";
const char* collision_box::vertexSource = source() + 9956;
-const char* collision_box::fragmentSource = source() + 10602;
+const char* collision_box::fragmentSource = source() + 10635;
// Uncompressed source of collision_box.vertex.glsl:
/*
@@ -16,6 +16,7 @@ attribute vec2 a_pos;
attribute vec2 a_anchor_pos;
attribute vec2 a_extrude;
attribute vec2 a_placed;
+attribute vec2 a_shift;
uniform mat4 u_matrix;
uniform vec2 u_extrude_scale;
@@ -33,7 +34,7 @@ void main() {
4.0);
gl_Position = u_matrix * vec4(a_pos, 0.0, 1.0);
- gl_Position.xy += a_extrude * u_extrude_scale * gl_Position.w * collision_perspective_ratio;
+ gl_Position.xy += (a_extrude + a_shift) * u_extrude_scale * gl_Position.w * collision_perspective_ratio;
v_placed = a_placed.x;
v_notUsed = a_placed.y;