diff options
author | Juha Alanen <juha.alanen@mapbox.com> | 2019-08-21 15:40:11 +0300 |
---|---|---|
committer | Juha Alanen <19551460+jmalanen@users.noreply.github.com> | 2019-09-18 14:29:15 +0300 |
commit | 598df1897dcad6f0a003fbae5d9058b1a660f408 (patch) | |
tree | 247106b5f0e622af07125927035fa763114dd570 /src/mbgl/tile | |
parent | 8e19be9d9c7f66bff16f97066570e990fe09fd4e (diff) | |
download | qtlocation-mapboxgl-598df1897dcad6f0a003fbae5d9058b1a660f408.tar.gz |
[core] Add feature state support to queryRenderedFeatures API
Diffstat (limited to 'src/mbgl/tile')
-rw-r--r-- | src/mbgl/tile/geometry_tile.cpp | 6 | ||||
-rw-r--r-- | src/mbgl/tile/geometry_tile.hpp | 3 | ||||
-rw-r--r-- | src/mbgl/tile/tile.cpp | 3 | ||||
-rw-r--r-- | src/mbgl/tile/tile.hpp | 4 |
4 files changed, 11 insertions, 5 deletions
diff --git a/src/mbgl/tile/geometry_tile.cpp b/src/mbgl/tile/geometry_tile.cpp index 8f624f21dc..2076c73337 100644 --- a/src/mbgl/tile/geometry_tile.cpp +++ b/src/mbgl/tile/geometry_tile.cpp @@ -308,7 +308,8 @@ void GeometryTile::queryRenderedFeatures( const TransformState& transformState, const std::unordered_map<std::string, const RenderLayer*>& layers, const RenderedQueryOptions& options, - const mat4& projMatrix) { + const mat4& projMatrix, + const SourceFeatureState& featureState) { if (!getData()) return; @@ -327,7 +328,8 @@ void GeometryTile::queryRenderedFeatures( options, id.toUnwrapped(), layers, - queryPadding * transformState.maxPitchScaleFactor()); + queryPadding * transformState.maxPitchScaleFactor(), + featureState); } void GeometryTile::querySourceFeatures( diff --git a/src/mbgl/tile/geometry_tile.hpp b/src/mbgl/tile/geometry_tile.hpp index ca9e33218c..4415e0a1fa 100644 --- a/src/mbgl/tile/geometry_tile.hpp +++ b/src/mbgl/tile/geometry_tile.hpp @@ -54,7 +54,8 @@ public: const TransformState&, const std::unordered_map<std::string, const RenderLayer*>& layers, const RenderedQueryOptions& options, - const mat4& projMatrix) override; + const mat4& projMatrix, + const SourceFeatureState& featureState) override; void querySourceFeatures( std::vector<Feature>& result, diff --git a/src/mbgl/tile/tile.cpp b/src/mbgl/tile/tile.cpp index 2f342c092d..87223c7933 100644 --- a/src/mbgl/tile/tile.cpp +++ b/src/mbgl/tile/tile.cpp @@ -45,7 +45,8 @@ void Tile::queryRenderedFeatures( const TransformState&, const std::unordered_map<std::string, const RenderLayer*>&, const RenderedQueryOptions&, - const mat4&) {} + const mat4&, + const SourceFeatureState&) {} float Tile::getQueryPadding(const std::unordered_map<std::string, const RenderLayer*>&) { return 0; diff --git a/src/mbgl/tile/tile.hpp b/src/mbgl/tile/tile.hpp index 65bff305a3..eda4667027 100644 --- a/src/mbgl/tile/tile.hpp +++ b/src/mbgl/tile/tile.hpp @@ -28,6 +28,7 @@ class TileRenderData; class RenderedQueryOptions; class SourceQueryOptions; class CollisionIndex; +class SourceFeatureState; namespace gfx { class UploadPass; @@ -73,7 +74,8 @@ public: const TransformState&, const std::unordered_map<std::string, const RenderLayer*>&, const RenderedQueryOptions& options, - const mat4& projMatrix); + const mat4& projMatrix, + const SourceFeatureState& featureState); virtual void querySourceFeatures( std::vector<Feature>& result, |