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/renderer/buckets/symbol_bucket.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/renderer/buckets/symbol_bucket.hpp')
| -rw-r--r-- | src/mbgl/renderer/buckets/symbol_bucket.hpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mbgl/renderer/buckets/symbol_bucket.hpp b/src/mbgl/renderer/buckets/symbol_bucket.hpp index 20c0c5b790..d813707c2f 100644 --- a/src/mbgl/renderer/buckets/symbol_bucket.hpp +++ b/src/mbgl/renderer/buckets/symbol_bucket.hpp @@ -55,7 +55,6 @@ public: const style::PropertyValue<float>& textSize, const style::PropertyValue<float>& iconSize, float zoom, - bool sdfIcons, bool iconsNeedLinear, bool sortFeaturesByY, const std::string bucketLeaderID, @@ -72,6 +71,7 @@ public: void updateVertices(Placement&, bool updateOpacities, const TransformState&, const RenderTile&, std::set<uint32_t>&) override; bool hasTextData() const; bool hasIconData() const; + bool hasSdfIconData() const; bool hasCollisionBoxData() const; bool hasCollisionCircleData() const; bool hasFormatSectionOverrides() const; @@ -86,7 +86,6 @@ public: float sortedAngle = std::numeric_limits<float>::max(); // Flags - const bool sdfIcons : 1; const bool iconsNeedLinear : 1; const bool sortFeaturesByY : 1; bool staticUploaded : 1; @@ -124,7 +123,8 @@ public: std::unique_ptr<SymbolSizeBinder> iconSizeBinder; Buffer icon; - + Buffer sdfIcon; + struct CollisionBuffer { gfx::VertexVector<gfx::Vertex<CollisionBoxLayoutAttributes>> vertices; gfx::VertexVector<gfx::Vertex<CollisionBoxDynamicAttributes>> dynamicVertices; |