From 20a30e41b71321b7bb9201c68e866059848fbcf7 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 11 May 2023 23:44:37 +0000 Subject: [PATCH] Drawable Renderer (#1570), [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- src/mbgl/renderer/layer_group.cpp | 6 +++--- src/mbgl/renderer/layers/render_fill_layer.cpp | 8 ++++---- src/mbgl/renderer/layers/render_fill_layer.hpp | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/mbgl/renderer/layer_group.cpp b/src/mbgl/renderer/layer_group.cpp index 0d3ebe61b..c647e9fef 100644 --- a/src/mbgl/renderer/layer_group.cpp +++ b/src/mbgl/renderer/layer_group.cpp @@ -56,7 +56,8 @@ gfx::UniqueDrawable TileLayerGroup::removeDrawable(mbgl::RenderPass pass, const } bool TileLayerGroup::addDrawable(mbgl::RenderPass pass, const OverscaledTileID& id, gfx::UniqueDrawable&& drawable) { - const auto result = impl->tileDrawables.insert(std::make_pair(TileLayerGroupTileKey{pass, id}, gfx::UniqueDrawable())); + const auto result = impl->tileDrawables.insert( + std::make_pair(TileLayerGroupTileKey{pass, id}, gfx::UniqueDrawable())); if (result.second) { return false; } else { @@ -66,7 +67,6 @@ bool TileLayerGroup::addDrawable(mbgl::RenderPass pass, const OverscaledTileID& } void TileLayerGroup::render([[maybe_unused]] RenderOrchestrator& orchestrator, - [[maybe_unused]] PaintParameters& parameters) { -} + [[maybe_unused]] PaintParameters& parameters) {} } // namespace mbgl diff --git a/src/mbgl/renderer/layers/render_fill_layer.cpp b/src/mbgl/renderer/layers/render_fill_layer.cpp index db38f603b..1c01a6961 100644 --- a/src/mbgl/renderer/layers/render_fill_layer.cpp +++ b/src/mbgl/renderer/layers/render_fill_layer.cpp @@ -396,7 +396,7 @@ void RenderFillLayer::update(const int32_t layerIndex, auto& tileDrawable = tileLayerGroup->getDrawable(renderPass, tileID); - const auto removeTile = [&](){ + const auto removeTile = [&]() { if (tileDrawable) { changes.emplace_back(std::make_unique(tileDrawable->getId())); tileLayerGroup->removeDrawable(renderPass, tileID); @@ -409,7 +409,7 @@ void RenderFillLayer::update(const int32_t layerIndex, removeTile(); continue; } - + auto& bucket = static_cast(*renderData->bucket); const auto& evaluated = getEvaluated(renderData->layerProperties); const auto evalColor = evaluated.get().constantOr(Color()); @@ -482,8 +482,8 @@ void RenderFillLayer::update(const int32_t layerIndex, // if (evaluated.get() && parameters.pass == RenderPass::Translucent) { // draw(*fillOutlineProgram, // gfx::Lines{2.0f}, - // parameters.depthModeForSublayer(unevaluated.get().isUndefined() ? 2 - // : 0, + // parameters.depthModeForSublayer(unevaluated.get().isUndefined() + // ? 2 : 0, // gfx::DepthMaskType::ReadOnly), // *bucket.lineIndexBuffer, // bucket.lineSegments, diff --git a/src/mbgl/renderer/layers/render_fill_layer.hpp b/src/mbgl/renderer/layers/render_fill_layer.hpp index 70178f126..3997d459c 100644 --- a/src/mbgl/renderer/layers/render_fill_layer.hpp +++ b/src/mbgl/renderer/layers/render_fill_layer.hpp @@ -54,7 +54,7 @@ private: std::shared_ptr fillPatternProgram; std::shared_ptr fillOutlineProgram; std::shared_ptr fillOutlinePatternProgram; - + TileLayerGroupPtr tileLayerGroup; };