diff options
Diffstat (limited to 'src/mbgl/renderer/buckets/symbol_bucket.hpp')
-rw-r--r-- | src/mbgl/renderer/buckets/symbol_bucket.hpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/mbgl/renderer/buckets/symbol_bucket.hpp b/src/mbgl/renderer/buckets/symbol_bucket.hpp index 4f01cf4e1c..5addff40b2 100644 --- a/src/mbgl/renderer/buckets/symbol_bucket.hpp +++ b/src/mbgl/renderer/buckets/symbol_bucket.hpp @@ -41,8 +41,8 @@ class SymbolBucket : public Bucket { public: SymbolBucket(style::SymbolLayoutProperties::PossiblyEvaluated, const std::map<std::string, std::pair<style::IconPaintProperties::PossiblyEvaluated, style::TextPaintProperties::PossiblyEvaluated>>&, - const style::DataDrivenPropertyValue<float>& textSize, - const style::DataDrivenPropertyValue<float>& iconSize, + const style::PropertyValue<float>& textSize, + const style::PropertyValue<float>& iconSize, float zoom, bool sdfIcons, bool iconsNeedLinear, @@ -56,7 +56,7 @@ public: bool hasIconData() const; bool hasCollisionBoxData() const; bool hasCollisionCircleData() const; - + void updateOpacity(); void sortFeatures(const float angle); @@ -64,9 +64,9 @@ public: const bool sdfIcons; const bool iconsNeedLinear; const bool sortFeaturesByY; - + const std::string bucketLeaderID; - + optional<float> sortedAngle; bool staticUploaded = false; @@ -79,7 +79,7 @@ public: std::map<std::string, std::pair< SymbolIconProgram::PaintPropertyBinders, SymbolSDFTextProgram::PaintPropertyBinders>> paintPropertyBinders; - + std::unique_ptr<SymbolSizeBinder> textSizeBinder; struct TextBuffer { @@ -95,9 +95,9 @@ public: optional<gl::VertexBuffer<SymbolOpacityAttributes::Vertex>> opacityVertexBuffer; optional<gl::IndexBuffer<gl::Triangles>> indexBuffer; } text; - + std::unique_ptr<SymbolSizeBinder> iconSizeBinder; - + struct IconBuffer { gl::VertexVector<SymbolLayoutVertex> vertices; gl::VertexVector<SymbolDynamicLayoutAttributes::Vertex> dynamicVertices; @@ -126,7 +126,7 @@ public: gl::IndexVector<gl::Lines> lines; optional<gl::IndexBuffer<gl::Lines>> indexBuffer; } collisionBox; - + struct CollisionCircleBuffer : public CollisionBuffer { gl::IndexVector<gl::Triangles> triangles; optional<gl::IndexBuffer<gl::Triangles>> indexBuffer; @@ -134,7 +134,7 @@ public: uint32_t bucketInstanceId = 0; bool justReloaded = false; - + std::shared_ptr<std::vector<size_t>> featureSortOrder; }; |