From e6d0c7d8b9782e1e896373f694cfb54063a56f8c Mon Sep 17 00:00:00 2001 From: Mikhail Pozdnyakov Date: Thu, 4 Apr 2019 19:04:50 +0300 Subject: [core] Pass crossfade parameters by const reference --- src/mbgl/renderer/paint_property_binder.hpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/mbgl/renderer/paint_property_binder.hpp b/src/mbgl/renderer/paint_property_binder.hpp index dd56afb2e8..a54cb8fc34 100644 --- a/src/mbgl/renderer/paint_property_binder.hpp +++ b/src/mbgl/renderer/paint_property_binder.hpp @@ -100,7 +100,7 @@ public: const optional&, const style::expression::Value&) = 0; virtual void upload(gfx::Context& context) = 0; - virtual void setPatternParameters(const optional&, const optional&, CrossfadeParameters&) = 0; + virtual void setPatternParameters(const optional&, const optional&, const CrossfadeParameters&) = 0; virtual std::tuple>...> attributeBinding(const PossiblyEvaluatedType& currentValue) const = 0; virtual std::tuple...> interpolationFactor(float currentZoom) const = 0; virtual std::tuple...> uniformValue(const PossiblyEvaluatedType& currentValue) const = 0; @@ -119,7 +119,7 @@ public: void populateVertexVector(const GeometryTileFeature&, std::size_t, const ImagePositions&, const optional&, const style::expression::Value&) override {} void upload(gfx::Context&) override {} - void setPatternParameters(const optional&, const optional&, CrossfadeParameters&) override {}; + void setPatternParameters(const optional&, const optional&, const CrossfadeParameters&) override {}; std::tuple> attributeBinding(const PossiblyEvaluatedPropertyValue&) const override { return {}; @@ -147,7 +147,7 @@ public: void populateVertexVector(const GeometryTileFeature&, std::size_t, const ImagePositions&, const optional&, const style::expression::Value&) override {} void upload(gfx::Context&) override {} - void setPatternParameters(const optional& posA, const optional& posB, CrossfadeParameters&) override { + void setPatternParameters(const optional& posA, const optional& posB, const CrossfadeParameters&) override { if (!posA || !posB) { return; } else { @@ -185,7 +185,7 @@ public: : expression(std::move(expression_)), defaultValue(std::move(defaultValue_)) { } - void setPatternParameters(const optional&, const optional&, CrossfadeParameters&) override {}; + void setPatternParameters(const optional&, const optional&, const CrossfadeParameters&) override {}; void populateVertexVector(const GeometryTileFeature& feature, std::size_t length, const ImagePositions&, const optional&, const style::expression::Value& formattedSection) override { using style::expression::EvaluationContext; auto evaluated = expression.evaluate(EvaluationContext(&feature).withFormattedSection(&formattedSection), defaultValue); @@ -243,7 +243,7 @@ public: defaultValue(std::move(defaultValue_)), zoomRange({zoom, zoom + 1}) { } - void setPatternParameters(const optional&, const optional&, CrossfadeParameters&) override {}; + void setPatternParameters(const optional&, const optional&, const CrossfadeParameters&) override {}; void populateVertexVector(const GeometryTileFeature& feature, std::size_t length, const ImagePositions&, const optional&, const style::expression::Value& formattedSection) override { using style::expression::EvaluationContext; Range range = { @@ -317,7 +317,7 @@ public: zoomRange({zoom, zoom + 1}) { } - void setPatternParameters(const optional&, const optional&, CrossfadeParameters& crossfade_) override { + void setPatternParameters(const optional&, const optional&, const CrossfadeParameters& crossfade_) override { crossfade = crossfade_; }; @@ -486,7 +486,7 @@ public: }); } - void setPatternParameters(const optional& posA, const optional& posB, CrossfadeParameters& crossfade) const { + void setPatternParameters(const optional& posA, const optional& posB, const CrossfadeParameters& crossfade) const { util::ignore({ (binders.template get()->setPatternParameters(posA, posB, crossfade), 0)... }); -- cgit v1.2.1