tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Drawable Renderer (#1570), [pre-commit.ci] auto fixes from pre-commit.com hooks

Browse Source 
for more information, see https://pre-commit.ci
This commit is contained in:
pre-commit-ci[bot]
2023-05-04 15:46:04 +00:00
committed by Bart Louwers
parent 03598ff229
commit ef9ef1a106
3 changed files with 11 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/mbgl/renderer/layers/render_background_layer.cpp
View File

@@ -40,9 +40,8 @@ void RenderBackgroundLayer::transition(const TransitionParameters& parameters) {
void RenderBackgroundLayer::evaluate(const PropertyEvaluationParameters& parameters) {
auto evaluated = unevaluated.evaluate(parameters);
auto properties = makeMutable<BackgroundLayerProperties>(staticImmutableCast<BackgroundLayer::Impl>(baseImpl),
parameters.getCrossfadeParameters(),
evaluated);
auto properties = makeMutable<BackgroundLayerProperties>(
staticImmutableCast<BackgroundLayer::Impl>(baseImpl), parameters.getCrossfadeParameters(), evaluated);
passes = properties->evaluated.get<style::BackgroundOpacity>() == 0.0f ? RenderPass::None
: (!unevaluated.get<style::BackgroundPattern>().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<BackgroundLayer::Impl&>(impl_cast(baseImpl)).setUnevaluated(unevaluated);
const_cast<BackgroundLayer::Impl&>(impl_cast(baseImpl)).setEvaluated(makeMutable<BackgroundPaintProperties::PossiblyEvaluated>(evaluated));
const_cast<BackgroundLayer::Impl&>(impl_cast(baseImpl))
.setEvaluated(makeMutable<BackgroundPaintProperties::PossiblyEvaluated>(evaluated));
evaluatedProperties = std::move(properties);
}

13
src/mbgl/style/layer_impl.hpp
View File

@@ -66,15 +66,10 @@ public:
virtual void populateFontStack(std::set<FontStack>& 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 <typename T>
static void removeDrawables(T beg,

14
src/mbgl/style/layers/background_layer_impl.hpp
View File

@@ -31,21 +31,13 @@ public:
bool hasLayoutDifference(const Layer::Impl&) const override;
void stringifyLayout(rapidjson::Writer<rapidjson::StringBuffer>&) 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<BackgroundPaintProperties::PossiblyEvaluated> value) {
evaluatedProperties = std::move(value);
++stats.propertyEvaluations;