From ef9ef1a106b229964c8246a6be0e55dd52a0688e Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 4 May 2023 15:46:04 +0000 Subject: [PATCH] Drawable Renderer (#1570), [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- .../renderer/layers/render_background_layer.cpp | 8 ++++---- src/mbgl/style/layer_impl.hpp | 13 ++++--------- src/mbgl/style/layers/background_layer_impl.hpp | 14 +++----------- 3 files changed, 11 insertions(+), 24 deletions(-) diff --git a/src/mbgl/renderer/layers/render_background_layer.cpp b/src/mbgl/renderer/layers/render_background_layer.cpp index 010d286b4..eb3bcec0d 100644 --- a/src/mbgl/renderer/layers/render_background_layer.cpp +++ b/src/mbgl/renderer/layers/render_background_layer.cpp @@ -40,9 +40,8 @@ void RenderBackgroundLayer::transition(const TransitionParameters& parameters) { void RenderBackgroundLayer::evaluate(const PropertyEvaluationParameters& parameters) { auto evaluated = unevaluated.evaluate(parameters); - auto properties = makeMutable(staticImmutableCast(baseImpl), - parameters.getCrossfadeParameters(), - evaluated); + auto properties = makeMutable( + staticImmutableCast(baseImpl), parameters.getCrossfadeParameters(), evaluated); passes = properties->evaluated.get() == 0.0f ? RenderPass::None : (!unevaluated.get().isUndefined() || @@ -56,7 +55,8 @@ void RenderBackgroundLayer::evaluate(const PropertyEvaluationParameters& paramet // Store a copy in the layer for layer::update. // TODO: This whole method should eventually move to BackgroundLayer const_cast(impl_cast(baseImpl)).setUnevaluated(unevaluated); - const_cast(impl_cast(baseImpl)).setEvaluated(makeMutable(evaluated)); + const_cast(impl_cast(baseImpl)) + .setEvaluated(makeMutable(evaluated)); evaluatedProperties = std::move(properties); } diff --git a/src/mbgl/style/layer_impl.hpp b/src/mbgl/style/layer_impl.hpp index 5a59604d9..27319dd1d 100644 --- a/src/mbgl/style/layer_impl.hpp +++ b/src/mbgl/style/layer_impl.hpp @@ -66,15 +66,10 @@ public: virtual void populateFontStack(std::set& fontStack) const; /// Generate any changes needed by the layer - virtual void update(int32_t /*layerIndex*/, - gfx::Context&, - const TransformState&, - UniqueChangeRequestVec&) const {} + virtual void update(int32_t /*layerIndex*/, gfx::Context&, const TransformState&, UniqueChangeRequestVec&) const {} - virtual void layerAdded(gfx::ShaderRegistry&, - gfx::Context&, - const TransformState&, - UniqueChangeRequestVec&) const {} + virtual void layerAdded(gfx::ShaderRegistry&, gfx::Context&, const TransformState&, UniqueChangeRequestVec&) const { + } virtual void layerRemoved(UniqueChangeRequestVec&) const {} std::string id; @@ -87,7 +82,7 @@ public: protected: Impl(const Impl&) = default; - + // Add a deletion change request for each drawable in a collection template static void removeDrawables(T beg, diff --git a/src/mbgl/style/layers/background_layer_impl.hpp b/src/mbgl/style/layers/background_layer_impl.hpp index 04064e2b9..3fbd11e87 100644 --- a/src/mbgl/style/layers/background_layer_impl.hpp +++ b/src/mbgl/style/layers/background_layer_impl.hpp @@ -31,21 +31,13 @@ public: bool hasLayoutDifference(const Layer::Impl&) const override; void stringifyLayout(rapidjson::Writer&) const override; - void layerAdded(gfx::ShaderRegistry&, - gfx::Context&, - const TransformState&, - UniqueChangeRequestVec&) const override; + void layerAdded(gfx::ShaderRegistry&, gfx::Context&, const TransformState&, UniqueChangeRequestVec&) const override; void layerRemoved(UniqueChangeRequestVec&) const override; /// Generate any changes needed by the layer - void update(int32_t layerIndex, - gfx::Context&, - const TransformState&, - UniqueChangeRequestVec&) const override; + void update(int32_t layerIndex, gfx::Context&, const TransformState&, UniqueChangeRequestVec&) const override; - void setUnevaluated(BackgroundPaintProperties::Unevaluated value) { - unevaluatedProperties = value; - } + void setUnevaluated(BackgroundPaintProperties::Unevaluated value) { unevaluatedProperties = value; } void setEvaluated(Immutable value) { evaluatedProperties = std::move(value); ++stats.propertyEvaluations;