diff options
author | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2019-04-10 14:25:09 +0300 |
---|---|---|
committer | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2019-04-17 17:21:41 +0300 |
commit | 150b427300af6425e78a687ce275feae4a7ccc9d (patch) | |
tree | 11af7e9ce4de759e7055dd7918efdc64568f5192 /src/mbgl/renderer/buckets/symbol_bucket.hpp | |
parent | a0c83808c0de3129f0737cfed9f311e062b54b16 (diff) | |
download | qtlocation-mapboxgl-150b427300af6425e78a687ce275feae4a7ccc9d.tar.gz |
[core] Update `style::LayerProperties` instances in tiles
Diffstat (limited to 'src/mbgl/renderer/buckets/symbol_bucket.hpp')
-rw-r--r-- | src/mbgl/renderer/buckets/symbol_bucket.hpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/mbgl/renderer/buckets/symbol_bucket.hpp b/src/mbgl/renderer/buckets/symbol_bucket.hpp index ca740c5488..61b4435e77 100644 --- a/src/mbgl/renderer/buckets/symbol_bucket.hpp +++ b/src/mbgl/renderer/buckets/symbol_bucket.hpp @@ -61,10 +61,7 @@ public: bool hasIconData() const; bool hasCollisionBoxData() const; bool hasCollisionCircleData() const; - bool hasFormatSectionOverrides(); - void updatePaintProperties(const std::string& layerID, - style::SymbolPaintProperties::PossiblyEvaluated); - void setPaintPropertyOverrides(style::SymbolPaintProperties::PossiblyEvaluated&); + bool hasFormatSectionOverrides() const; void updateOpacity(); void sortFeatures(const float angle); @@ -86,7 +83,6 @@ public: std::vector<SymbolInstance> symbolInstances; struct PaintProperties { - style::SymbolPaintProperties::PossiblyEvaluated evaluated; SymbolIconProgram::Binders iconBinders; SymbolSDFTextProgram::Binders textBinders; }; @@ -136,7 +132,7 @@ public: const float tilePixelRatio; uint32_t bucketInstanceId = 0; bool justReloaded = false; - optional<bool> hasFormatSectionOverrides_; + mutable optional<bool> hasFormatSectionOverrides_; std::shared_ptr<std::vector<size_t>> featureSortOrder; }; |