From 7bf24d23a7db872f7bd13060da9817a9ee5f816c Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Sun, 12 Mar 2023 01:36:50 +0000
Subject: Dedupe applying style to a face

---
 assetFactory/style.cpp | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

(limited to 'assetFactory/style.cpp')

diff --git a/assetFactory/style.cpp b/assetFactory/style.cpp
index fa585ac..b5ddcf1 100644
--- a/assetFactory/style.cpp
+++ b/assetFactory/style.cpp
@@ -4,22 +4,27 @@
 void
 Style::applyStyle(ModelFactoryMesh & mesh, const StyleStack & parents, const Shape::CreatedFaces & faces) const
 {
-	if (const auto effectiveColour = getColour(parents); effectiveColour.has_value()) {
-		for (const auto & face : faces) {
-			mesh.set_color(face.second, effectiveColour->get());
-		}
+	for (const auto & face : faces) {
+		applyStyle(mesh, face.second, getColour(parents));
 	}
 }
 
 void
 Style::applyStyle(ModelFactoryMesh & mesh, const StyleStack & parents, const ModelFactoryMesh::FaceHandle & face) const
 {
-	if (const auto effectiveColour = getColour(parents); effectiveColour.has_value()) {
+	applyStyle(mesh, face, getColour(parents));
+}
+
+void
+Style::applyStyle(
+		ModelFactoryMesh & mesh, const ModelFactoryMesh::FaceHandle & face, EffectiveColour effectiveColour) const
+{
+	if (effectiveColour.has_value()) {
 		mesh.set_color(face, effectiveColour->get());
 	}
 }
 
-std::optional<std::reference_wrapper<const Style::ColourAlpha>>
+Style::EffectiveColour
 Style::getColour(const StyleStack & parents)
 {
 	return getProperty(parents, &Style::colour, [](auto && style) {
-- 
cgit v1.2.3