diff options
| author | Chris Loer <chris.loer@gmail.com> | 2018-01-09 12:26:29 -0800 |
|---|---|---|
| committer | Chris Loer <chris.loer@mapbox.com> | 2018-01-09 13:14:02 -0800 |
| commit | 966606a1075bc1717db145f2fa677b0de8093ce9 (patch) | |
| tree | 1ac62eb920159198c728eb9de584d06a00b2ecb4 | |
| parent | 145a0ee6d0b9f544899bff4d4c67cbf91b470a75 (diff) | |
| download | qtlocation-mapboxgl-966606a1075bc1717db145f2fa677b0de8093ce9.tar.gz | |
[core] Update debug collision circle shader.
Fixes issue #10876.
| m--------- | mapbox-gl-js | 0 | ||||
| -rw-r--r-- | platform/node/test/ignores.json | 1 | ||||
| -rw-r--r-- | src/mbgl/shaders/collision_circle.cpp | 2 |
3 files changed, 2 insertions, 1 deletions
diff --git a/mapbox-gl-js b/mapbox-gl-js -Subproject e877fa762b019ae434936047df4d020fe41f5e1 +Subproject 2c127fabb5f57d403d6d825693007137a8102e8 diff --git a/platform/node/test/ignores.json b/platform/node/test/ignores.json index 62e042cd4d..95335e530a 100644 --- a/platform/node/test/ignores.json +++ b/platform/node/test/ignores.json @@ -74,6 +74,7 @@ "render-tests/regressions/mapbox-gl-js#5370": "skip - https://github.com/mapbox/mapbox-gl-native/pull/9439", "render-tests/regressions/mapbox-gl-js#5599": "https://github.com/mapbox/mapbox-gl-native/issues/10399", "render-tests/regressions/mapbox-gl-js#5740": "https://github.com/mapbox/mapbox-gl-native/issues/10619", + "render-tests/regressions/mapbox-gl-js#5947": "https://github.com/mapbox/mapbox-gl-native/issues/10678", "render-tests/regressions/mapbox-gl-native#7357": "https://github.com/mapbox/mapbox-gl-native/issues/7357", "render-tests/runtime-styling/image-add-sdf": "https://github.com/mapbox/mapbox-gl-native/issues/9847", "render-tests/runtime-styling/paint-property-fill-flat-to-extrude": "https://github.com/mapbox/mapbox-gl-native/issues/6745", diff --git a/src/mbgl/shaders/collision_circle.cpp b/src/mbgl/shaders/collision_circle.cpp index ac2d71d7fc..f220586245 100644 --- a/src/mbgl/shaders/collision_circle.cpp +++ b/src/mbgl/shaders/collision_circle.cpp @@ -68,7 +68,7 @@ void main() { float extrude_scale_length = length(v_extrude_scale); float extrude_length = length(v_extrude) * extrude_scale_length; - float stroke_width = 3.0; + float stroke_width = 15.0 * extrude_scale_length; float radius = v_radius * extrude_scale_length; float distance_to_edge = abs(extrude_length - radius); |