diff options
author | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2019-08-03 20:47:46 +0300 |
---|---|---|
committer | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2019-08-05 16:13:26 +0300 |
commit | c763c262c87a4ae76489e856cc58392c853372a1 (patch) | |
tree | 29ee76bc6df36d59236be9e0984c24238583c64d /src/mbgl/text/placement.hpp | |
parent | 65d2f7ed6afe17c6fbc8155cb116aae7de16db9a (diff) | |
download | qtlocation-mapboxgl-c763c262c87a4ae76489e856cc58392c853372a1.tar.gz |
[core] Remove ProjectedCollisionBox from CollisionBox
- Minus 20 bytes from CollisionBox size.
- Fix constness at Placement::placeBucket
Diffstat (limited to 'src/mbgl/text/placement.hpp')
-rw-r--r-- | src/mbgl/text/placement.hpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/mbgl/text/placement.hpp b/src/mbgl/text/placement.hpp index 0f56b0007e..2a6a2e1d6e 100644 --- a/src/mbgl/text/placement.hpp +++ b/src/mbgl/text/placement.hpp @@ -116,11 +116,11 @@ public: private: friend SymbolBucket; void placeBucket( - SymbolBucket&, + const SymbolBucket&, const BucketPlacementParameters&, std::set<uint32_t>& seenCrossTileIDs); // Returns `true` if bucket vertices were updated; returns `false` otherwise. - bool updateBucketDynamicVertices(SymbolBucket&, const TransformState&, const RenderTile& tile); + bool updateBucketDynamicVertices(SymbolBucket&, const TransformState&, const RenderTile& tile) const; void updateBucketOpacities(SymbolBucket&, const TransformState&, std::set<uint32_t>&); void markUsedJustification(SymbolBucket&, style::TextVariableAnchorType, SymbolInstance&); @@ -141,6 +141,9 @@ private: std::unordered_map<uint32_t, RetainedQueryData> retainedQueryData; CollisionGroups collisionGroups; std::unique_ptr<Placement> prevPlacement; + + // Used for debug purposes. + std::unordered_map<const CollisionFeature*, std::vector<ProjectedCollisionBox>> collisionCircles; }; } // namespace mbgl |