diff options
| author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-10-29 14:39:10 +0300 |
|---|---|---|
| committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-10-31 16:53:07 +0200 |
| commit | f03afdee218680d95eb5b9b0ab04083bc7cea512 (patch) | |
| tree | 304744bcf7aeca97dec067343052032752814c1d | |
| parent | ccc3964270e32145b050d97bf4c678941a5c6092 (diff) | |
| download | qtlocation-mapboxgl-f03afdee218680d95eb5b9b0ab04083bc7cea512.tar.gz | |
[core] Use overscaledZ for scale in collision box shader
| -rw-r--r-- | src/mbgl/renderer/painter_symbol.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mbgl/renderer/painter_symbol.cpp b/src/mbgl/renderer/painter_symbol.cpp index 78de30ca17..d4ac5f94e9 100644 --- a/src/mbgl/renderer/painter_symbol.cpp +++ b/src/mbgl/renderer/painter_symbol.cpp @@ -10,6 +10,7 @@ #include <mbgl/shader/symbol_uniforms.hpp> #include <mbgl/shader/collision_box_uniforms.hpp> #include <mbgl/util/math.hpp> +#include <mbgl/tile/tile.hpp> #include <cmath> @@ -125,7 +126,7 @@ void Painter::renderSymbol(PaintParameters& parameters, shaders->collisionBox, CollisionBoxUniforms::values( tile.matrix, - std::pow(2, state.getZoom() - tile.id.canonical.z), + std::pow(2.0f, state.getZoom() - tile.tile.id.overscaledZ), state.getZoom() * 10, (tile.id.canonical.z + 1) * 10 ), |