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

fix use of the wrong builder, simplify (#1320)

Browse Source
This commit is contained in:
Tim Sylvester
2023-07-07 08:46:55 -07:00
committed by Bart Louwers
parent d755e40619
commit 7e7fa37fd0
1 changed files with 14 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/mbgl/renderer/layers/render_fill_layer.cpp
View File

@@ -435,14 +435,6 @@ void RenderFillLayer::update(gfx::ShaderRegistry& shaders,
fillVertexAttrs.clear();
outlineVertexAttrs.clear();
gfx::DrawableTweakerPtr tweaker;
if (fillBuilder) {
fillBuilder->clearTweakers();
}
if (outlineBuilder) {
outlineBuilder->clearTweakers();
}
// `Fill*Program` all use `style::FillPaintProperties`
const auto fillUniformProps =
fillVertexAttrs.readDataDrivenPaintProperties<FillColor, FillOpacity, FillOutlineColor, FillPattern>(
@@ -529,9 +521,6 @@ void RenderFillLayer::update(gfx::ShaderRegistry& shaders,
builder->setColorMode(gfx::ColorMode::alphaBlended());
builder->setSubLayerIndex(1);
builder->setRenderPass(RenderPass::Translucent);
if (tweaker) {
builder->addTweaker(tweaker);
}
patternBuilder = std::move(builder);
}
}
@@ -543,24 +532,28 @@ void RenderFillLayer::update(gfx::ShaderRegistry& shaders,
builder->setColorMode(gfx::ColorMode::alphaBlended());
builder->setSubLayerIndex(2);
builder->setRenderPass(RenderPass::Translucent);
if (tweaker) {
builder->addTweaker(tweaker);
}
outlinePatternBuilder = std::move(builder);
}
}
if ((patternBuilder || outlineBuilder) && !tweaker) {
gfx::DrawableTweakerPtr tweaker;
if (patternBuilder) {
patternBuilder->clearTweakers();
}
if (outlinePatternBuilder) {
outlinePatternBuilder->clearTweakers();
}
if ((patternBuilder || outlinePatternBuilder) && !tweaker) {
if (const auto& atlases = tile.getAtlasTextures()) {
tweaker = std::make_shared<gfx::DrawableAtlasesTweaker>(atlases,
/*glyphName=*/std::string(),
std::string(IconTextureName),
/*isText=*/false);
auto tweaker = std::make_shared<gfx::DrawableAtlasesTweaker>(atlases,
/*glyphName=*/std::string(),
std::string(IconTextureName),
/*isText=*/false);
if (patternBuilder) {
patternBuilder->addTweaker(tweaker);
}
if (outlineBuilder) {
outlineBuilder->addTweaker(tweaker);
if (outlinePatternBuilder) {
outlinePatternBuilder->addTweaker(std::move(tweaker));
}
}
}