diff options
author | zmiao <miao.zhao@mapbox.com> | 2019-08-26 21:54:59 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-08-26 21:54:59 +0300 |
commit | c770c2326261ee22b22216538a2eaaed3648bc0d (patch) | |
tree | 03725479de83005554f1d3df3d0c0df25c128a2f /src/mbgl/layout/symbol_layout.hpp | |
parent | dbda6cc9e889278f391e45d952f57c95234b3f55 (diff) | |
download | qtlocation-mapboxgl-c770c2326261ee22b22216538a2eaaed3648bc0d.tar.gz |
[core] fix mixed sdf + non-sdf icon rendering in one layer (#15456)
* [core] fix icon symbol rendring when sdf and non-sdf icon in the same symbol layer
* fix build error
* fix typo
* revert renderableSegment change
* simplify codes
* fix build error
* refine sdf icon flag
* [core] fix mixed sdf + non-sdf icon rendering in one layer
* remove iconstatus getter in stymbol bucket
* fix review findings
* provide bitwise operator for SymbolContent enum
* use MBGL_MBGL_CONSTEXPR
* add one missing update for sdfIcon
* make renderer symbol type as enum
Diffstat (limited to 'src/mbgl/layout/symbol_layout.hpp')
-rw-r--r-- | src/mbgl/layout/symbol_layout.hpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mbgl/layout/symbol_layout.hpp b/src/mbgl/layout/symbol_layout.hpp index 6cc21c6d91..8d4c51148a 100644 --- a/src/mbgl/layout/symbol_layout.hpp +++ b/src/mbgl/layout/symbol_layout.hpp @@ -53,7 +53,8 @@ private: const ShapedTextOrientations& shapedTextOrientations, optional<PositionedIcon> shapedIcon, const GlyphPositions&, - Point<float> textOffset); + Point<float> textOffset, + const SymbolContent iconType); bool anchorIsTooClose(const std::u16string& text, const float repeatDistance, const Anchor&); std::map<std::u16string, std::vector<Anchor>> compareText; @@ -93,7 +94,6 @@ private: const uint32_t tileSize; const float tilePixelRatio; - bool sdfIcons = false; bool iconsNeedLinear = false; bool sortFeaturesByY = false; bool allowVerticalPlacement = false; |