From 88c9d66352c2f4856682efd48482b5b72aca18bf Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Sun, 12 Mar 2023 00:54:24 +0000
Subject: Support loading references to texture fragments

---
 res/brush47.xml                |   2 ++
 res/rail/roofSideWithVents.png | Bin 0 -> 17011 bytes
 res/rail/roofTopWithVents.png  | Bin 0 -> 11921 bytes
 3 files changed, 2 insertions(+)
 create mode 100644 res/rail/roofSideWithVents.png
 create mode 100644 res/rail/roofTopWithVents.png

(limited to 'res')

diff --git a/res/brush47.xml b/res/brush47.xml
index dbd3327..a7e3894 100644
--- a/res/brush47.xml
+++ b/res/brush47.xml
@@ -59,6 +59,8 @@
       </face>
     </use>
   </object>
+  <textureFragment id="roofSideWithVents" path="rail/roofSideWithVents.png"/>
+  <textureFragment id="roofTopWithVents" path="rail/roofTopWithVents.png"/>
   <asset p.typeid="RailVehicleClass" id="brush-47" name="Brush 47" length="19.38" wheelBase="15.70" maxSpeed="42.4688">
     <bodyMesh id="body" size="2.69,19.38,3.9">
       <use type="cuboid" position="0,0,1.2" scale="2.69,19.38,0.3" colour="goldenrod">
diff --git a/res/rail/roofSideWithVents.png b/res/rail/roofSideWithVents.png
new file mode 100644
index 0000000..67ed851
Binary files /dev/null and b/res/rail/roofSideWithVents.png differ
diff --git a/res/rail/roofTopWithVents.png b/res/rail/roofTopWithVents.png
new file mode 100644
index 0000000..0f64ced
Binary files /dev/null and b/res/rail/roofTopWithVents.png differ
-- 
cgit v1.2.3


From 0ee9b8c6036899f95dfd54f151cb60a03645f87a Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Sun, 12 Mar 2023 01:05:18 +0000
Subject: Support loading texture references into faces

---
 assetFactory/style.cpp | 2 +-
 assetFactory/style.h   | 2 ++
 res/brush47.xml        | 6 +++++-
 3 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'res')

diff --git a/assetFactory/style.cpp b/assetFactory/style.cpp
index fc5c34e..5303d96 100644
--- a/assetFactory/style.cpp
+++ b/assetFactory/style.cpp
@@ -42,5 +42,5 @@ Style::persist(Persistence::PersistenceStore & store)
 		}
 	};
 
-	return STORE_HELPER(colour, ColourParser);
+	return STORE_HELPER(colour, ColourParser) && STORE_MEMBER(texture) && STORE_MEMBER(textureRotation);
 }
diff --git a/assetFactory/style.h b/assetFactory/style.h
index e8fd012..84e5dab 100644
--- a/assetFactory/style.h
+++ b/assetFactory/style.h
@@ -28,6 +28,8 @@ public:
 	}
 
 	ColourAlpha colour {};
+	std::string texture;
+	std::string textureRotation; // Multiples of 90deg, no int/enum support
 
 protected:
 	bool persist(Persistence::PersistenceStore & store);
diff --git a/res/brush47.xml b/res/brush47.xml
index a7e3894..c345c82 100644
--- a/res/brush47.xml
+++ b/res/brush47.xml
@@ -71,7 +71,11 @@
           <face id="top" type="extrude" scale="1,0.96,1" position="0,0,0.775">
             <face id="front" colour="#e1eff3"/>
             <face id="back" colour="#e1eff3"/>
-            <face id="top" type="extrude" scale="0.5,0.85,0" smooth="true" position="0,0,0.575" colour="#aeb0b0"/>
+            <face id="top" type="extrude" scale="0.5,0.85,0" smooth="true" position="0,0,0.575" colour="#aeb0b0">
+              <face id="top" texture="roofTopWithVents"/>
+              <face id="left" texture="roofSideWithVents"/>
+              <face id="right" texture="roofSideWithVents"/>
+            </face>
           </face>
         </face>
       </use>
-- 
cgit v1.2.3


From b5db39e7de50cff669920ab1f279df223d257a51 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Mon, 20 Mar 2023 00:26:16 +0000
Subject: Support applying a single face controller to multiple faces

---
 assetFactory/faceController.cpp | 13 ++++++++++++-
 assetFactory/faceController.h   |  5 ++++-
 res/brush47.xml                 | 12 ++++--------
 3 files changed, 20 insertions(+), 10 deletions(-)

(limited to 'res')

diff --git a/assetFactory/faceController.cpp b/assetFactory/faceController.cpp
index 1e563b2..6493300 100644
--- a/assetFactory/faceController.cpp
+++ b/assetFactory/faceController.cpp
@@ -4,7 +4,18 @@
 #include "modelFactoryMesh.h"
 
 void
-FaceController::apply(ModelFactoryMesh & mesh, const StyleStack & parents, const std::string & name,
+FaceController::apply(ModelFactoryMesh & mesh, const StyleStack & parents, const std::string & names,
+		Shape::CreatedFaces & faces) const
+{
+	std::stringstream nameStream {names};
+	std::for_each(std::istream_iterator<std::string>(nameStream), std::istream_iterator<std::string> {},
+			[&](const auto & name) {
+				applySingle(mesh, parents, name, faces);
+			});
+}
+
+void
+FaceController::applySingle(ModelFactoryMesh & mesh, const StyleStack & parents, const std::string & name,
 		Shape::CreatedFaces & faces) const
 {
 	const auto getAdjacentFaceName = [&mesh](const auto & ofrange, OpenMesh::FaceHandle nf) -> std::string {
diff --git a/assetFactory/faceController.h b/assetFactory/faceController.h
index 10a226a..890aafa 100644
--- a/assetFactory/faceController.h
+++ b/assetFactory/faceController.h
@@ -12,7 +12,7 @@ class FaceController : public Mutation, public Style, public Persistence::Persis
 public:
 	using FaceControllers = std::map<std::string, std::unique_ptr<FaceController>>;
 
-	void apply(ModelFactoryMesh & mesh, const Style::StyleStack & parents, const std::string & name,
+	void apply(ModelFactoryMesh & mesh, const Style::StyleStack & parents, const std::string & names,
 			Shape::CreatedFaces & faces) const;
 
 	std::string id;
@@ -28,4 +28,7 @@ private:
 	{
 		return {};
 	};
+
+	void applySingle(ModelFactoryMesh & mesh, const Style::StyleStack & parents, const std::string & name,
+			Shape::CreatedFaces & faces) const;
 };
diff --git a/res/brush47.xml b/res/brush47.xml
index c345c82..f74cb29 100644
--- a/res/brush47.xml
+++ b/res/brush47.xml
@@ -2,8 +2,7 @@
 <ilt p.id="assetFactory">
   <object id="wheel">
     <use type="cylinder" position="0,0,0.571" scale="1.142,1.142,0.07" rotation="0,0,1.5708" colour="silver">
-      <face id="top" colour="#413b3a"/>
-      <face id="bottom" colour="#413b3a"/>
+      <face id="top bottom" colour="#413b3a"/>
     </use>
     <use type="cuboid" scale="0.3,0.5,0.3" position="0.2,0,0.421" colour="grey30"/>
   </object>
@@ -66,15 +65,12 @@
       <use type="cuboid" position="0,0,1.2" scale="2.69,19.38,0.3" colour="goldenrod">
         <face id="bottom" colour="#2c3539"/>
         <face id="top" type="extrude" position="0,0,1.05" colour="#2c4f5a">
-          <face id="front" colour="goldenrod"/>
-          <face id="back" colour="goldenrod"/>
+          <face id="front back" colour="goldenrod"/>
           <face id="top" type="extrude" scale="1,0.96,1" position="0,0,0.775">
-            <face id="front" colour="#e1eff3"/>
-            <face id="back" colour="#e1eff3"/>
+            <face id="front back" colour="#e1eff3"/>
             <face id="top" type="extrude" scale="0.5,0.85,0" smooth="true" position="0,0,0.575" colour="#aeb0b0">
               <face id="top" texture="roofTopWithVents"/>
-              <face id="left" texture="roofSideWithVents"/>
-              <face id="right" texture="roofSideWithVents"/>
+              <face id="right left" texture="roofSideWithVents"/>
             </face>
           </face>
         </face>
-- 
cgit v1.2.3


From 2bcbb86db4061e32005adea8806e4ac552691bcf Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Fri, 7 Apr 2023 23:55:09 +0100
Subject: Extend face controller to support splitting a face along a plane

Individual parts of the splits faces can then be styled separately
---
 assetFactory/faceController.cpp | 83 +++++++++++++++++++++++++++++++++++++----
 assetFactory/faceController.h   | 18 +++++++++
 res/brush47.xml                 |  6 ++-
 3 files changed, 98 insertions(+), 9 deletions(-)

(limited to 'res')

diff --git a/assetFactory/faceController.cpp b/assetFactory/faceController.cpp
index 25bf833..28812d8 100644
--- a/assetFactory/faceController.cpp
+++ b/assetFactory/faceController.cpp
@@ -2,6 +2,7 @@
 #include "collections.hpp"
 #include "maths.h"
 #include "modelFactoryMesh.h"
+#include <glm/gtx/intersect.hpp>
 
 void
 FaceController::apply(ModelFactoryMesh & mesh, const StyleStack & parents, const std::string & names,
@@ -30,24 +31,29 @@ void
 FaceController::applySingle(ModelFactoryMesh & mesh, const StyleStack & parents, const std::string & name,
 		Shape::CreatedFaces & faces) const
 {
-	const auto controlledFaces {materializeRange(faces.equal_range(name))};
-	if (controlledFaces.empty()) {
-		throw std::runtime_error("Named face(s) do not exist: " + name);
-	}
+	auto controlledFaces {materializeRange(faces.equal_range(name))};
 
-	if (!type.empty()) {
+	if (!type.empty() || !splits.empty()) {
 		faces.erase(name);
 	}
-	for (const auto & [faceName, faceHandle] : controlledFaces) {
+	for (auto & [faceName, faceHandle] : controlledFaces) {
+		Shape::CreatedFaces newFaces;
+		for (const auto & [newFaceSuffix, splitDef] : splits) {
+			newFaces.merge(split(mesh, name + newFaceSuffix, faceHandle, *splitDef));
+		}
 		if (type == "extrude") {
-			auto newFaces = extrude(mesh, faceName, faceHandle);
+			newFaces.merge(extrude(mesh, name, faceHandle));
+		}
+		if (!newFaces.empty()) {
 			applyStyle(mesh, parents + this, newFaces);
 			for (const auto & [subFaceName, faceController] : faceControllers) {
 				faceController->apply(mesh, parents + this, subFaceName, newFaces);
 			}
 			faces.merge(std::move(newFaces));
 		}
-		applyStyle(mesh, parents + this, faceHandle);
+		else {
+			applyStyle(mesh, parents + this, faceHandle);
+		}
 	}
 }
 
@@ -88,9 +94,70 @@ FaceController::extrude(ModelFactoryMesh & mesh, const std::string & faceName, O
 	return newFaces;
 }
 
+enum class PlaneRelation { Above, Below, On };
+Shape::CreatedFaces
+FaceController::split(
+		ModelFactoryMesh & mesh, const std::string & name, OpenMesh::FaceHandle & fh, const Split & split) const
+{
+	// Map face vertex handles to their relationship to the split plane
+	const auto vertices = materializeRange(mesh.fv_range(fh));
+	auto vertexRelations = vertices * [&split, &mesh](OpenMesh::VertexHandle vh) {
+		const auto d = glm::dot(split.normal, mesh.point(vh) - split.origin);
+		return std::make_pair(vh, d < 0.f ? PlaneRelation::Below : d > 0.f ? PlaneRelation::Above : PlaneRelation::On);
+	};
+	// Insert new vertices where half edges intersect the split plane
+	for (size_t curIdx = 0; curIdx < vertexRelations.size(); ++curIdx) {
+		const size_t nextIdx = (curIdx + 1) % vertexRelations.size();
+		const auto &current = vertexRelations[curIdx], next = vertexRelations[nextIdx];
+		if ((current.second == PlaneRelation::Above && next.second == PlaneRelation::Below)
+				|| (current.second == PlaneRelation::Below && next.second == PlaneRelation::Above)) {
+			const auto origin = mesh.point(current.first), dir = glm::normalize(mesh.point(next.first) - origin);
+
+			float dist {};
+			glm::intersectRayPlane(origin, dir, split.origin, split.normal, dist);
+			const auto newv = mesh.add_vertex(origin + (dir * dist));
+			auto where = vertexRelations.begin();
+			++curIdx;
+			std::advance(where, curIdx);
+			vertexRelations.emplace(where, newv, PlaneRelation::On);
+		}
+	}
+	// Create vertex vectors
+	std::array<std::vector<OpenMesh::VertexHandle>, 2> out;
+	auto filterVertices = [&vertexRelations](auto & out, auto notRelation) {
+		for (const auto & vhr : vertexRelations) {
+			if (vhr.second != notRelation) {
+				out.emplace_back(vhr.first);
+			}
+		}
+	};
+	filterVertices(out.front(), PlaneRelation::Above);
+	filterVertices(out.back(), PlaneRelation::Below);
+
+	if (out.back().size() > 2) {
+		Shape::CreatedFaces newFaces;
+		const auto oldName = mesh.property(mesh.nameFaceProperty, fh);
+		mesh.delete_face(fh);
+		const auto newf1 = newFaces.insert(mesh.add_namedFace(oldName, out.front()))->second;
+		const auto newf2 = newFaces.insert(mesh.add_namedFace(name, out.back()))->second;
+		mesh.copy_property(mesh.smoothFaceProperty, fh, newf1);
+		mesh.copy_property(mesh.smoothFaceProperty, fh, newf2);
+		fh = newf1;
+		return newFaces;
+	}
+	return {};
+}
+
 bool
 FaceController::persist(Persistence::PersistenceStore & store)
 {
 	return STORE_TYPE && STORE_MEMBER(id) && Style::persist(store) && STORE_MEMBER(type) && Mutation::persist(store)
+			&& STORE_NAME_HELPER("split", splits, Persistence::MapByMember<Splits>)
 			&& STORE_NAME_HELPER("face", faceControllers, Persistence::MapByMember<FaceControllers>);
 }
+
+bool
+FaceController::Split::persist(Persistence::PersistenceStore & store)
+{
+	return STORE_TYPE && STORE_MEMBER(id) && STORE_MEMBER(origin) && STORE_MEMBER(normal);
+}
diff --git a/assetFactory/faceController.h b/assetFactory/faceController.h
index 851292a..91860f4 100644
--- a/assetFactory/faceController.h
+++ b/assetFactory/faceController.h
@@ -10,7 +10,22 @@
 
 class FaceController : public Mutation, public Style, public Persistence::Persistable {
 public:
+	class Split : public Persistable {
+	public:
+		std::string id;
+		glm::vec3 origin, normal;
+
+	private:
+		friend Persistence::SelectionPtrBase<std::unique_ptr<Split>>;
+		bool persist(Persistence::PersistenceStore & store) override;
+		std::string
+		getId() const override
+		{
+			return {};
+		};
+	};
 	using FaceControllers = std::map<std::string, std::unique_ptr<FaceController>>;
+	using Splits = std::map<std::string, std::unique_ptr<Split>>;
 
 	void apply(ModelFactoryMesh & mesh, const Style::StyleStack & parents, const std::string & names,
 			Shape::CreatedFaces & faces) const;
@@ -18,6 +33,7 @@ public:
 	std::string id;
 	std::string type;
 	FaceControllers faceControllers;
+	Splits splits;
 
 private:
 	friend Persistence::SelectionPtrBase<std::unique_ptr<FaceController>>;
@@ -33,4 +49,6 @@ private:
 	static std::string getAdjacentFaceName(const ModelFactoryMesh & mesh,
 			const std::span<const OpenMesh::FaceHandle> ofrange, OpenMesh::FaceHandle nf);
 	Shape::CreatedFaces extrude(ModelFactoryMesh & mesh, const std::string & faceName, OpenMesh::FaceHandle) const;
+	Shape::CreatedFaces split(
+			ModelFactoryMesh & mesh, const std::string & faceName, OpenMesh::FaceHandle &, const Split &) const;
 };
diff --git a/res/brush47.xml b/res/brush47.xml
index f74cb29..20c43c8 100644
--- a/res/brush47.xml
+++ b/res/brush47.xml
@@ -70,7 +70,11 @@
             <face id="front back" colour="#e1eff3"/>
             <face id="top" type="extrude" scale="0.5,0.85,0" smooth="true" position="0,0,0.575" colour="#aeb0b0">
               <face id="top" texture="roofTopWithVents"/>
-              <face id="right left" texture="roofSideWithVents"/>
+              <face id="right left">
+                <split id="frontcorner" origin="0,7.90704,0" normal="0,1,0"/>
+                <split id="backcorner" origin="0,-7.90704,0" normal="0,-1,0"/>
+                <face id="right left" texture="roofSideWithVents"/>
+              </face>
             </face>
           </face>
         </face>
-- 
cgit v1.2.3


From 26219bd0e3a1a0da74282509357f0ffcbcbafd7e Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Sat, 8 Apr 2023 11:50:40 +0100
Subject: Update Brush47 with yellow cab parts and window texture

Note: side window distorted still.
---
 res/brush47.xml             |  13 ++++++++++++-
 res/rail/cabWindowFront.png | Bin 0 -> 630 bytes
 2 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 res/rail/cabWindowFront.png

(limited to 'res')

diff --git a/res/brush47.xml b/res/brush47.xml
index 20c43c8..31518c8 100644
--- a/res/brush47.xml
+++ b/res/brush47.xml
@@ -60,14 +60,25 @@
   </object>
   <textureFragment id="roofSideWithVents" path="rail/roofSideWithVents.png"/>
   <textureFragment id="roofTopWithVents" path="rail/roofTopWithVents.png"/>
+  <textureFragment id="cabWindowFront" path="rail/cabWindowFront.png"/>
   <asset p.typeid="RailVehicleClass" id="brush-47" name="Brush 47" length="19.38" wheelBase="15.70" maxSpeed="42.4688">
     <bodyMesh id="body" size="2.69,19.38,3.9">
       <use type="cuboid" position="0,0,1.2" scale="2.69,19.38,0.3" colour="goldenrod">
         <face id="bottom" colour="#2c3539"/>
         <face id="top" type="extrude" position="0,0,1.05" colour="#2c4f5a">
           <face id="front back" colour="goldenrod"/>
+          <face id="right left">
+            <split id="frontcorner" origin="0,7.90704,0" normal="0,1,0"/>
+            <split id="backcorner" origin="0,-7.90704,0" normal="0,-1,0"/>
+            <face id="rightfrontcorner leftfrontcorner rightbackcorner leftbackcorner" colour="goldenrod"/>
+          </face>
           <face id="top" type="extrude" scale="1,0.96,1" position="0,0,0.775">
-            <face id="front back" colour="#e1eff3"/>
+            <face id="front back" texture="cabWindowFront"/>
+            <face id="right left">
+              <split id="frontcorner" origin="0,7.90704,0" normal="0,1,0"/>
+              <split id="backcorner" origin="0,-7.90704,0" normal="0,-1,0"/>
+              <face id="rightfrontcorner leftfrontcorner rightbackcorner leftbackcorner" texture="cabWindowFront"/>
+            </face>
             <face id="top" type="extrude" scale="0.5,0.85,0" smooth="true" position="0,0,0.575" colour="#aeb0b0">
               <face id="top" texture="roofTopWithVents"/>
               <face id="right left">
diff --git a/res/rail/cabWindowFront.png b/res/rail/cabWindowFront.png
new file mode 100644
index 0000000..3803f21
Binary files /dev/null and b/res/rail/cabWindowFront.png differ
-- 
cgit v1.2.3