diff options
author | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2019-07-01 12:00:01 +0300 |
---|---|---|
committer | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2019-07-04 16:56:43 +0300 |
commit | d57083497509a1918fcccfb3005be2ba532e0266 (patch) | |
tree | 51ee178b7c9743e9add97c2faee8b4faee7657c2 /src/mbgl/text | |
parent | dd16eadc382fe853f4b877fbcfd909d103a339f5 (diff) | |
download | qtlocation-mapboxgl-d57083497509a1918fcccfb3005be2ba532e0266.tar.gz |
[core] Remove orchestration methods from RenderTile
Diffstat (limited to 'src/mbgl/text')
-rw-r--r-- | src/mbgl/text/placement.cpp | 3 | ||||
-rw-r--r-- | src/mbgl/text/placement.hpp | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/mbgl/text/placement.cpp b/src/mbgl/text/placement.cpp index edf73101ab..62110fefa7 100644 --- a/src/mbgl/text/placement.cpp +++ b/src/mbgl/text/placement.cpp @@ -78,6 +78,7 @@ void Placement::placeLayer(const RenderLayer& layer, const mat4& projMatrix, boo item.tile, projMatrix, layer.baseImpl->source, + item.featureIndex, showCollisionBoxes}; bucket.place(*this, params, seenCrossTileIDs); } @@ -332,7 +333,7 @@ void Placement::placeBucket( // matching FeatureIndex/data for querying purposes retainedQueryData.emplace(std::piecewise_construct, std::forward_as_tuple(bucket.bucketInstanceId), - std::forward_as_tuple(bucket.bucketInstanceId, renderTile.getFeatureIndex(), overscaledID)); + std::forward_as_tuple(bucket.bucketInstanceId, params.featureIndex, overscaledID)); } void Placement::commit(TimePoint now) { diff --git a/src/mbgl/text/placement.hpp b/src/mbgl/text/placement.hpp index 6ffe58afc5..0f56b0007e 100644 --- a/src/mbgl/text/placement.hpp +++ b/src/mbgl/text/placement.hpp @@ -93,6 +93,7 @@ public: const RenderTile& tile; const mat4& projMatrix; std::string sourceId; + std::shared_ptr<FeatureIndex> featureIndex; bool showCollisionBoxes; }; |