diff options
Diffstat (limited to 'src/mbgl/text')
| -rw-r--r-- | src/mbgl/text/collision_index.cpp | 4 | ||||
| -rw-r--r-- | src/mbgl/text/collision_index.hpp | 2 | ||||
| -rw-r--r-- | src/mbgl/text/placement.cpp | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/src/mbgl/text/collision_index.cpp b/src/mbgl/text/collision_index.cpp index cd854db3b6..a0b8a8ab77 100644 --- a/src/mbgl/text/collision_index.cpp +++ b/src/mbgl/text/collision_index.cpp @@ -27,7 +27,7 @@ const float viewportPaddingDefault = 100; // Viewport padding must be much larger for static tiles to avoid clipped labels. const float viewportPaddingForStaticTiles = 1024; -inline float getViewportPadding(const TransformState& transformState, MapMode mapMode) { +inline float findViewportPadding(const TransformState& transformState, MapMode mapMode) { if (mapMode == MapMode::Tile) return viewportPaddingForStaticTiles; return (transformState.getPitch() != 0.0f) ? viewportPaddingDefault * 2 : viewportPaddingDefault; } @@ -36,7 +36,7 @@ inline float getViewportPadding(const TransformState& transformState, MapMode ma CollisionIndex::CollisionIndex(const TransformState& transformState_, MapMode mapMode) : transformState(transformState_), - viewportPadding(getViewportPadding(transformState_, mapMode)), + viewportPadding(findViewportPadding(transformState_, mapMode)), collisionGrid(transformState.getSize().width + 2 * viewportPadding, transformState.getSize().height + 2 * viewportPadding, 25), diff --git a/src/mbgl/text/collision_index.hpp b/src/mbgl/text/collision_index.hpp index b88a8623e8..c6f689bc7e 100644 --- a/src/mbgl/text/collision_index.hpp +++ b/src/mbgl/text/collision_index.hpp @@ -50,6 +50,8 @@ public: const TransformState& getTransformState() const { return transformState; } + float getViewportPadding() const { return viewportPadding; } + private: bool isOffscreen(const CollisionBoundaries&) const; bool isInsideGrid(const CollisionBoundaries&) const; diff --git a/src/mbgl/text/placement.cpp b/src/mbgl/text/placement.cpp index 1f4b73323e..3cba1b8e16 100644 --- a/src/mbgl/text/placement.cpp +++ b/src/mbgl/text/placement.cpp @@ -1386,7 +1386,8 @@ void TilePlacement::newSymbolPlaced(const SymbolInstance& symbol, iconCollisionBox, placement.text, placement.icon, - !placement.skipFade && onlyLabelsIntersectingTileBorders}; + !placement.skipFade && onlyLabelsIntersectingTileBorders, + collisionIndex.getViewportPadding()}; placedSymbolsData.emplace_back(std::move(symbolData)); } |