From 636d43dcebfee1ad901cb781cfff430a6e25db7d Mon Sep 17 00:00:00 2001 From: Mikhail Pozdnyakov Date: Thu, 26 Mar 2020 15:54:19 +0200 Subject: [core] PlacedSymbolData includes viewport padding --- include/mbgl/renderer/renderer.hpp | 6 +++++- src/mbgl/text/collision_index.cpp | 4 ++-- src/mbgl/text/collision_index.hpp | 2 ++ src/mbgl/text/placement.cpp | 3 ++- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/include/mbgl/renderer/renderer.hpp b/include/mbgl/renderer/renderer.hpp index c7514054e4..60f1f6ed8b 100644 --- a/include/mbgl/renderer/renderer.hpp +++ b/include/mbgl/renderer/renderer.hpp @@ -34,6 +34,8 @@ struct PlacedSymbolData { bool iconPlaced; // Symbol text or icon collision box intersects tile borders bool intersectsTileBorder; + // Viewport padding ({viewportPadding, viewportPadding} is a coordinate of the tile's top-left corner) + float viewportPadding; }; class Renderer { @@ -66,7 +68,9 @@ public: void setFeatureState(const std::string& sourceID, const optional& sourceLayerID, const std::string& featureID, const FeatureState& state); - void getFeatureState(FeatureState& state, const std::string& sourceID, const optional& sourceLayerID, + void getFeatureState(FeatureState& state, + const std::string& sourceID, + const optional& sourceLayerID, const std::string& featureID) const; void removeFeatureState(const std::string& sourceID, diff --git a/src/mbgl/text/collision_index.cpp b/src/mbgl/text/collision_index.cpp index 20cb6514b6..d00812a505 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 dd1da03bdb..de9dc7102b 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)); } -- cgit v1.2.1