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

for more information, see https://pre-commit.ci
This commit is contained in:
pre-commit-ci[bot]
2023-06-12 21:23:08 +00:00
committed by Bart Louwers
parent e7a82f78bc
commit d7c9c8b69a
2 changed files with 4 additions and 6 deletions

View File

@@ -547,10 +547,9 @@ void RenderFillLayer::update(gfx::ShaderRegistry& shaders,
patternBuilder->setRenderPass(renderPass);
patternBuilder->setVertexAttributes(fillVertexAttrs);
patternBuilder->addVertices(rawVerts, 0, rawVerts.size());
patternBuilder->setSegments(
gfx::Triangles(),
bucket.triangles.vector(),
reinterpret_cast<const std::vector<SegmentBase>&>(bucket.triangleSegments));
patternBuilder->setSegments(gfx::Triangles(),
bucket.triangles.vector(),
reinterpret_cast<const std::vector<SegmentBase>&>(bucket.triangleSegments));
if (const auto& atlases = tile.getAtlasTextures()) {
if (const auto samplerLocation = fillShader->getSamplerLocation("u_image")) {

View File

@@ -24,8 +24,7 @@ public:
bool isConstant() const { return value.template is<T>(); }
std::optional<T> constant() const {
return value.match([&](const T& t) { return std::optional<T>(t); },
[&](const auto&) { return std::nullopt; });
return value.match([&](const T& t) { return std::optional<T>(t); }, [&](const auto&) { return std::nullopt; });
}
T constantOr(const T& t) const { return constant().value_or(t); }