From ed7c2a6a73f24f97a0f04c2e6be6862ffe54b585 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Tue, 21 Feb 2023 01:25:34 +0000
Subject: Support for loading objects, uses and model factories from an XML
 resource

---
 res/brush47.xml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 res/brush47.xml

(limited to 'res')

diff --git a/res/brush47.xml b/res/brush47.xml
new file mode 100644
index 0000000..8f1d934
--- /dev/null
+++ b/res/brush47.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<ilt p.id="modelFactory">
+  <object id="wheel">
+    <use type="cylinder" position="0,0,0.571" scale="1.142,1.142,0.07" rotation="0,0,90"/>
+  </object>
+  <object id="axel">
+    <use type="wheel" position="0.717,0,0"/>
+    <use type="wheel" position="-0.717,0,0" rotation="0,90,0"/>
+  </object>
+  <object id="bogey">
+    <use type="axel" position="0,0,0"/>
+    <use type="axel" position="0,2,0"/>
+    <use type="axel" position="0,-2,0"/>
+  </object>
+</ilt>
-- 
cgit v1.2.3


From 5e561d390dc82b08c20532de0952f428e7b14283 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Tue, 21 Feb 2023 19:34:16 +0000
Subject: Rename ModelFactory to AssetFactory

---
 assetFactory/assetFactory.cpp |  31 ++++++++
 assetFactory/assetFactory.h   |  19 +++++
 assetFactory/modelFactory.cpp |  31 --------
 assetFactory/modelFactory.h   |  19 -----
 assetFactory/use.cpp          |   4 +-
 res/brush47.xml               |   2 +-
 test/Jamfile.jam              |   2 +-
 test/test-assetFactory.cpp    | 173 ++++++++++++++++++++++++++++++++++++++++++
 test/test-modelFactory.cpp    | 173 ------------------------------------------
 9 files changed, 227 insertions(+), 227 deletions(-)
 create mode 100644 assetFactory/assetFactory.cpp
 create mode 100644 assetFactory/assetFactory.h
 delete mode 100644 assetFactory/modelFactory.cpp
 delete mode 100644 assetFactory/modelFactory.h
 create mode 100644 test/test-assetFactory.cpp
 delete mode 100644 test/test-modelFactory.cpp

(limited to 'res')

diff --git a/assetFactory/assetFactory.cpp b/assetFactory/assetFactory.cpp
new file mode 100644
index 0000000..0ee1f94
--- /dev/null
+++ b/assetFactory/assetFactory.cpp
@@ -0,0 +1,31 @@
+#include "assetFactory.h"
+#include "cuboid.h"
+#include "cylinder.h"
+#include "modelFactoryMesh_fwd.h"
+#include "object.h"
+#include "plane.h"
+#include "saxParse-persistence.h"
+#include <filesystem.h>
+
+AssetFactory::AssetFactory() :
+	shapes {
+			{"plane", std::make_shared<Plane>()},
+			{"cuboid", std::make_shared<Cuboid>()},
+			{"cylinder", std::make_shared<Cylinder>()},
+	}
+{
+}
+
+std::shared_ptr<AssetFactory>
+AssetFactory::loadXML(const std::filesystem::path & filename)
+{
+	filesystem::FileStar file {filename.c_str(), "r"};
+	return Persistence::SAXParsePersistence {}.loadState<std::shared_ptr<AssetFactory>>(file);
+}
+
+bool
+AssetFactory::persist(Persistence::PersistenceStore & store)
+{
+	using MapObjects = Persistence::MapByMember<Shapes, Object>;
+	return STORE_TYPE && STORE_NAME_HELPER("object", shapes, MapObjects);
+}
diff --git a/assetFactory/assetFactory.h b/assetFactory/assetFactory.h
new file mode 100644
index 0000000..5cf90dd
--- /dev/null
+++ b/assetFactory/assetFactory.h
@@ -0,0 +1,19 @@
+#pragma once
+
+#include "persistence.h"
+#include "shape.h"
+#include <filesystem>
+
+class AssetFactory : public Persistence::Persistable {
+public:
+	using Shapes = std::map<std::string, Shape::CPtr, std::less<>>;
+
+	AssetFactory();
+	[[nodiscard]] static std::shared_ptr<AssetFactory> loadXML(const std::filesystem::path &);
+
+	Shapes shapes;
+
+private:
+	friend Persistence::SelectionPtrBase<std::shared_ptr<AssetFactory>, true>;
+	bool persist(Persistence::PersistenceStore & store) override;
+};
diff --git a/assetFactory/modelFactory.cpp b/assetFactory/modelFactory.cpp
deleted file mode 100644
index 2642900..0000000
--- a/assetFactory/modelFactory.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-#include "modelFactory.h"
-#include "cuboid.h"
-#include "cylinder.h"
-#include "modelFactoryMesh_fwd.h"
-#include "object.h"
-#include "plane.h"
-#include "saxParse-persistence.h"
-#include <filesystem.h>
-
-ModelFactory::ModelFactory() :
-	shapes {
-			{"plane", std::make_shared<Plane>()},
-			{"cuboid", std::make_shared<Cuboid>()},
-			{"cylinder", std::make_shared<Cylinder>()},
-	}
-{
-}
-
-std::shared_ptr<ModelFactory>
-ModelFactory::loadXML(const std::filesystem::path & filename)
-{
-	filesystem::FileStar file {filename.c_str(), "r"};
-	return Persistence::SAXParsePersistence {}.loadState<std::shared_ptr<ModelFactory>>(file);
-}
-
-bool
-ModelFactory::persist(Persistence::PersistenceStore & store)
-{
-	using MapObjects = Persistence::MapByMember<Shapes, Object>;
-	return STORE_TYPE && STORE_NAME_HELPER("object", shapes, MapObjects);
-}
diff --git a/assetFactory/modelFactory.h b/assetFactory/modelFactory.h
deleted file mode 100644
index 94db055..0000000
--- a/assetFactory/modelFactory.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma once
-
-#include "persistence.h"
-#include "shape.h"
-#include <filesystem>
-
-class ModelFactory : public Persistence::Persistable {
-public:
-	using Shapes = std::map<std::string, Shape::CPtr, std::less<>>;
-
-	ModelFactory();
-	[[nodiscard]] static std::shared_ptr<ModelFactory> loadXML(const std::filesystem::path &);
-
-	Shapes shapes;
-
-private:
-	friend Persistence::SelectionPtrBase<std::shared_ptr<ModelFactory>, true>;
-	bool persist(Persistence::PersistenceStore & store) override;
-};
diff --git a/assetFactory/use.cpp b/assetFactory/use.cpp
index 21e26f3..3b574c3 100644
--- a/assetFactory/use.cpp
+++ b/assetFactory/use.cpp
@@ -1,5 +1,5 @@
 #include "use.h"
-#include "modelFactory.h"
+#include "assetFactory.h"
 
 Shape::CreatedFaces
 Use::createMesh(ModelFactoryMesh & mesh, const Mutation::Matrix & mutation) const
@@ -17,7 +17,7 @@ struct Lookup : public Persistence::SelectionV<Shape::CPtr> {
 	void
 	setValue(std::string && str) override
 	{
-		if (auto mf = std::dynamic_pointer_cast<const ModelFactory>(Persistence::sharedObjects.at("modelFactory"))) {
+		if (auto mf = std::dynamic_pointer_cast<const AssetFactory>(Persistence::sharedObjects.at("assetFactory"))) {
 			v = mf->shapes.at(str);
 		}
 	}
diff --git a/res/brush47.xml b/res/brush47.xml
index 8f1d934..3c6705a 100644
--- a/res/brush47.xml
+++ b/res/brush47.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<ilt p.id="modelFactory">
+<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,90"/>
   </object>
diff --git a/test/Jamfile.jam b/test/Jamfile.jam
index 027b880..06f907a 100644
--- a/test/Jamfile.jam
+++ b/test/Jamfile.jam
@@ -52,6 +52,6 @@ run test-text.cpp ;
 run test-enumDetails.cpp ;
 run test-render.cpp : : : <library>test ;
 run test-glContextBhvr.cpp ;
-run test-modelFactory.cpp : -- : ../res/brush47.xml : <library>test ;
+run test-assetFactory.cpp : -- : ../res/brush47.xml : <library>test ;
 compile test-static-enumDetails.cpp ;
 compile test-static-stream_support.cpp ;
diff --git a/test/test-assetFactory.cpp b/test/test-assetFactory.cpp
new file mode 100644
index 0000000..64d6a62
--- /dev/null
+++ b/test/test-assetFactory.cpp
@@ -0,0 +1,173 @@
+#define BOOST_TEST_MODULE test_asset_factory
+
+#include "testHelpers.h"
+#include "testRenderOutput.h"
+#include <boost/test/data/test_case.hpp>
+#include <boost/test/unit_test.hpp>
+
+#include "assetFactory/assetFactory.h"
+#include "assetFactory/factoryMesh.h"
+#include "assetFactory/object.h"
+#include "gfx/gl/sceneRenderer.h"
+#include "lib/collection.hpp"
+#include "lib/location.hpp"
+#include "testMainWindow.h"
+#include "ui/applicationBase.h"
+
+BOOST_GLOBAL_FIXTURE(ApplicationBase);
+BOOST_GLOBAL_FIXTURE(TestMainWindow);
+
+const std::filesystem::path TMP {"/tmp"};
+class FactoryFixture : public TestRenderOutputSize<glm::ivec2 {2048, 2048}>, public SceneProvider {
+public:
+	FactoryFixture() : sceneRenderer {size, output} { }
+	~FactoryFixture()
+	{
+		glDisable(GL_DEBUG_OUTPUT);
+		auto outpath = (TMP / boost::unit_test::framework::current_test_case().full_name()).replace_extension(".tga");
+		std::filesystem::create_directories(outpath.parent_path());
+		Texture::save(outImage, size, outpath.c_str());
+	}
+	void
+	content(const SceneShader & shader) const override
+	{
+		shader.basic.use(Location {{0, 0, 0}, {0, 0, 0}});
+		meshes.apply(&Mesh::Draw);
+	}
+	void
+	lights(const SceneShader & shader) const override
+	{
+		shader.pointLight.add({-3, 1, 5}, {1, 1, 1}, .1F);
+	}
+	void
+	environment(const SceneShader &, const SceneRenderer & sceneRenderer) const override
+	{
+		sceneRenderer.setAmbientLight({.2, .2, .2});
+		sceneRenderer.setDirectionalLight({.3, .3, .3}, east + south + south + down, *this);
+	}
+	void
+	shadows(const ShadowMapper & mapper) const override
+	{
+		mapper.dynamicPoint.use(Location {{0, 0, 0}, {0, 0, 0}});
+		meshes.apply(&Mesh::Draw);
+	}
+	void
+	render(float dist = 10.f)
+	{
+		sceneRenderer.camera.setView({dist, dist, dist}, south + west + down);
+		sceneRenderer.render(*this);
+	}
+	Collection<const Mesh> meshes;
+
+private:
+	SceneRenderer sceneRenderer;
+};
+
+BOOST_FIXTURE_TEST_SUITE(m, FactoryFixture);
+BOOST_AUTO_TEST_CASE(brush47)
+{
+	AssetFactory assetFactory;
+	{
+		auto wheel = std::make_shared<Object>("wheel");
+		{
+			auto wheelCylinder = wheel->uses.emplace_back(std::make_shared<Use>());
+			wheelCylinder->type = assetFactory.shapes.at("cylinder");
+			wheelCylinder->position = {0, 0, 0.571};
+			wheelCylinder->scale = {1.142, 1.142, 0.07};
+			wheelCylinder->rotation = {0, 0, half_pi};
+			wheelCylinder->colour = "#2C3539";
+		}
+		assetFactory.shapes.emplace(wheel->id, wheel);
+	}
+	{
+		auto axel = std::make_shared<Object>("axel");
+		for (float x : {-1.f, 1.f}) {
+			auto wheel = axel->uses.emplace_back(std::make_shared<Use>());
+			wheel->type = assetFactory.shapes.at("wheel");
+			wheel->position = {x * 0.717f, 0, 0};
+			wheel->rotation = {0, x == 1.f ? pi : 0.f, 0};
+		}
+		assetFactory.shapes.emplace(axel->id, axel);
+	}
+	{
+		auto bogey = std::make_shared<Object>("bogey");
+		for (float y : {-2.f, 0.f, 2.f}) {
+			auto axel = bogey->uses.emplace_back(std::make_shared<Use>());
+			axel->type = assetFactory.shapes.at("axel");
+			axel->position = {0, y, 0};
+		}
+		assetFactory.shapes.emplace(bogey->id, bogey);
+	}
+	FactoryMesh::Collection factoryMeshes;
+	{
+		unsigned short b {0};
+		for (float y : {-6.f, 6.f}) {
+			auto bogey = factoryMeshes.emplace_back(std::make_shared<FactoryMesh>());
+			bogey->id = "bogey" + std::to_string(b);
+			auto bogeyUse = bogey->uses.emplace_back(std::make_shared<Use>());
+			bogeyUse->type = assetFactory.shapes.at("bogey");
+			bogeyUse->position = {0, y, 0};
+			bogeyUse->rotation = {0, b * pi, 0};
+			b++;
+		}
+	}
+	{
+		auto body = factoryMeshes.emplace_back(std::make_shared<FactoryMesh>());
+		body->id = "body";
+		body->size = {2.69f, 19.38f, 3.9f};
+		{
+			auto bodyLower = body->uses.emplace_back(std::make_shared<Use>());
+			bodyLower->type = assetFactory.shapes.at("cuboid");
+			bodyLower->position = {0, 0, 1.2};
+			bodyLower->scale = {2.69, 19.38, 1.5};
+			bodyLower->colour = "#1111DD";
+			bodyLower->faceControllers["bottom"].colour = "#2C3539";
+			auto & bodyUpper = bodyLower->faceControllers["top"];
+			bodyUpper.type = "extrude";
+			bodyUpper.scale = {1, .95f, 1};
+			bodyUpper.position = {0, 0, 1.0};
+			auto & roof = bodyUpper.faceControllers["top"];
+			roof.type = "extrude";
+			roof.scale = {.6f, .9f, 0};
+			roof.position = {0, 0, 0.2};
+			roof.smooth = true;
+		}
+		{
+			auto batteryBox = body->uses.emplace_back(std::make_shared<Use>());
+			batteryBox->type = assetFactory.shapes.at("cuboid");
+			batteryBox->position = {0, 0, .2};
+			batteryBox->scale = {2.6, 4.5, 1};
+			batteryBox->colour = "#2C3539";
+		}
+	}
+	std::transform(factoryMeshes.begin(), factoryMeshes.end(), std::back_inserter(meshes.objects),
+			[](const FactoryMesh::CPtr & factoryMesh) -> Mesh::Ptr {
+				return factoryMesh->createMesh();
+			});
+
+	render(20);
+}
+BOOST_AUTO_TEST_CASE(brush47xml)
+{
+	auto mf = AssetFactory::loadXML(RESDIR "/brush47.xml");
+	BOOST_REQUIRE(mf);
+	BOOST_REQUIRE_EQUAL(6, mf->shapes.size());
+	BOOST_CHECK(mf->shapes.at("plane"));
+	BOOST_CHECK(mf->shapes.at("cylinder"));
+	BOOST_CHECK(mf->shapes.at("cuboid"));
+	BOOST_CHECK(mf->shapes.at("wheel"));
+	BOOST_CHECK(mf->shapes.at("axel"));
+	auto bogey = mf->shapes.at("bogey");
+	BOOST_REQUIRE(bogey);
+	auto bogeyObj = std::dynamic_pointer_cast<const Object>(bogey);
+	BOOST_CHECK_EQUAL(3, bogeyObj->uses.size());
+
+	FactoryMesh::Collection factoryMeshes;
+	std::transform(factoryMeshes.begin(), factoryMeshes.end(), std::back_inserter(meshes.objects),
+			[](const FactoryMesh::CPtr & factoryMesh) -> Mesh::Ptr {
+				return factoryMesh->createMesh();
+			});
+
+	render(20);
+}
+BOOST_AUTO_TEST_SUITE_END();
diff --git a/test/test-modelFactory.cpp b/test/test-modelFactory.cpp
deleted file mode 100644
index 8f2d56c..0000000
--- a/test/test-modelFactory.cpp
+++ /dev/null
@@ -1,173 +0,0 @@
-#define BOOST_TEST_MODULE test_model_factory
-
-#include "testHelpers.h"
-#include "testRenderOutput.h"
-#include <boost/test/data/test_case.hpp>
-#include <boost/test/unit_test.hpp>
-
-#include "assetFactory/factoryMesh.h"
-#include "assetFactory/modelFactory.h"
-#include "assetFactory/object.h"
-#include "gfx/gl/sceneRenderer.h"
-#include "lib/collection.hpp"
-#include "lib/location.hpp"
-#include "testMainWindow.h"
-#include "ui/applicationBase.h"
-
-BOOST_GLOBAL_FIXTURE(ApplicationBase);
-BOOST_GLOBAL_FIXTURE(TestMainWindow);
-
-const std::filesystem::path TMP {"/tmp"};
-class FactoryFixture : public TestRenderOutputSize<glm::ivec2 {2048, 2048}>, public SceneProvider {
-public:
-	FactoryFixture() : sceneRenderer {size, output} { }
-	~FactoryFixture()
-	{
-		glDisable(GL_DEBUG_OUTPUT);
-		auto outpath = (TMP / boost::unit_test::framework::current_test_case().full_name()).replace_extension(".tga");
-		std::filesystem::create_directories(outpath.parent_path());
-		Texture::save(outImage, size, outpath.c_str());
-	}
-	void
-	content(const SceneShader & shader) const override
-	{
-		shader.basic.use(Location {{0, 0, 0}, {0, 0, 0}});
-		meshes.apply(&Mesh::Draw);
-	}
-	void
-	lights(const SceneShader & shader) const override
-	{
-		shader.pointLight.add({-3, 1, 5}, {1, 1, 1}, .1F);
-	}
-	void
-	environment(const SceneShader &, const SceneRenderer & sceneRenderer) const override
-	{
-		sceneRenderer.setAmbientLight({.2, .2, .2});
-		sceneRenderer.setDirectionalLight({.3, .3, .3}, east + south + south + down, *this);
-	}
-	void
-	shadows(const ShadowMapper & mapper) const override
-	{
-		mapper.dynamicPoint.use(Location {{0, 0, 0}, {0, 0, 0}});
-		meshes.apply(&Mesh::Draw);
-	}
-	void
-	render(float dist = 10.f)
-	{
-		sceneRenderer.camera.setView({dist, dist, dist}, south + west + down);
-		sceneRenderer.render(*this);
-	}
-	Collection<const Mesh> meshes;
-
-private:
-	SceneRenderer sceneRenderer;
-};
-
-BOOST_FIXTURE_TEST_SUITE(m, FactoryFixture);
-BOOST_AUTO_TEST_CASE(brush47)
-{
-	ModelFactory modelFactory;
-	{
-		auto wheel = std::make_shared<Object>("wheel");
-		{
-			auto wheelCylinder = wheel->uses.emplace_back(std::make_shared<Use>());
-			wheelCylinder->type = modelFactory.shapes.at("cylinder");
-			wheelCylinder->position = {0, 0, 0.571};
-			wheelCylinder->scale = {1.142, 1.142, 0.07};
-			wheelCylinder->rotation = {0, 0, half_pi};
-			wheelCylinder->colour = "#2C3539";
-		}
-		modelFactory.shapes.emplace(wheel->id, wheel);
-	}
-	{
-		auto axel = std::make_shared<Object>("axel");
-		for (float x : {-1.f, 1.f}) {
-			auto wheel = axel->uses.emplace_back(std::make_shared<Use>());
-			wheel->type = modelFactory.shapes.at("wheel");
-			wheel->position = {x * 0.717f, 0, 0};
-			wheel->rotation = {0, x == 1.f ? pi : 0.f, 0};
-		}
-		modelFactory.shapes.emplace(axel->id, axel);
-	}
-	{
-		auto bogey = std::make_shared<Object>("bogey");
-		for (float y : {-2.f, 0.f, 2.f}) {
-			auto axel = bogey->uses.emplace_back(std::make_shared<Use>());
-			axel->type = modelFactory.shapes.at("axel");
-			axel->position = {0, y, 0};
-		}
-		modelFactory.shapes.emplace(bogey->id, bogey);
-	}
-	FactoryMesh::Collection factoryMeshes;
-	{
-		unsigned short b {0};
-		for (float y : {-6.f, 6.f}) {
-			auto bogey = factoryMeshes.emplace_back(std::make_shared<FactoryMesh>());
-			bogey->id = "bogey" + std::to_string(b);
-			auto bogeyUse = bogey->uses.emplace_back(std::make_shared<Use>());
-			bogeyUse->type = modelFactory.shapes.at("bogey");
-			bogeyUse->position = {0, y, 0};
-			bogeyUse->rotation = {0, b * pi, 0};
-			b++;
-		}
-	}
-	{
-		auto body = factoryMeshes.emplace_back(std::make_shared<FactoryMesh>());
-		body->id = "body";
-		body->size = {2.69f, 19.38f, 3.9f};
-		{
-			auto bodyLower = body->uses.emplace_back(std::make_shared<Use>());
-			bodyLower->type = modelFactory.shapes.at("cuboid");
-			bodyLower->position = {0, 0, 1.2};
-			bodyLower->scale = {2.69, 19.38, 1.5};
-			bodyLower->colour = "#1111DD";
-			bodyLower->faceControllers["bottom"].colour = "#2C3539";
-			auto & bodyUpper = bodyLower->faceControllers["top"];
-			bodyUpper.type = "extrude";
-			bodyUpper.scale = {1, .95f, 1};
-			bodyUpper.position = {0, 0, 1.0};
-			auto & roof = bodyUpper.faceControllers["top"];
-			roof.type = "extrude";
-			roof.scale = {.6f, .9f, 0};
-			roof.position = {0, 0, 0.2};
-			roof.smooth = true;
-		}
-		{
-			auto batteryBox = body->uses.emplace_back(std::make_shared<Use>());
-			batteryBox->type = modelFactory.shapes.at("cuboid");
-			batteryBox->position = {0, 0, .2};
-			batteryBox->scale = {2.6, 4.5, 1};
-			batteryBox->colour = "#2C3539";
-		}
-	}
-	std::transform(factoryMeshes.begin(), factoryMeshes.end(), std::back_inserter(meshes.objects),
-			[](const FactoryMesh::CPtr & factoryMesh) -> Mesh::Ptr {
-				return factoryMesh->createMesh();
-			});
-
-	render(20);
-}
-BOOST_AUTO_TEST_CASE(brush47xml)
-{
-	auto mf = ModelFactory::loadXML(RESDIR "/brush47.xml");
-	BOOST_REQUIRE(mf);
-	BOOST_REQUIRE_EQUAL(6, mf->shapes.size());
-	BOOST_CHECK(mf->shapes.at("plane"));
-	BOOST_CHECK(mf->shapes.at("cylinder"));
-	BOOST_CHECK(mf->shapes.at("cuboid"));
-	BOOST_CHECK(mf->shapes.at("wheel"));
-	BOOST_CHECK(mf->shapes.at("axel"));
-	auto bogey = mf->shapes.at("bogey");
-	BOOST_REQUIRE(bogey);
-	auto bogeyObj = std::dynamic_pointer_cast<const Object>(bogey);
-	BOOST_CHECK_EQUAL(3, bogeyObj->uses.size());
-
-	FactoryMesh::Collection factoryMeshes;
-	std::transform(factoryMeshes.begin(), factoryMeshes.end(), std::back_inserter(meshes.objects),
-			[](const FactoryMesh::CPtr & factoryMesh) -> Mesh::Ptr {
-				return factoryMesh->createMesh();
-			});
-
-	render(20);
-}
-BOOST_AUTO_TEST_SUITE_END();
-- 
cgit v1.2.3


From df2a078c51cee464905c6fb1d1c7c4aa7873f6a1 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Wed, 22 Feb 2023 23:40:46 +0000
Subject: Implement loading asset, mesh and face definitions

---
 assetFactory/assetFactory.cpp   | 11 ++++++-
 assetFactory/assetFactory.h     | 18 +++++++++-
 assetFactory/faceController.cpp | 10 +++++-
 assetFactory/faceController.h   | 14 ++++++--
 assetFactory/factoryMesh.cpp    |  7 ++++
 assetFactory/factoryMesh.h      |  6 +++-
 assetFactory/use.cpp            |  5 +--
 assetFactory/use.h              |  2 +-
 res/brush47.xml                 | 24 ++++++++++++--
 test/test-assetFactory.cpp      | 73 +++++++++++++++++++++++------------------
 10 files changed, 126 insertions(+), 44 deletions(-)

(limited to 'res')

diff --git a/assetFactory/assetFactory.cpp b/assetFactory/assetFactory.cpp
index 470eacf..564ea28 100644
--- a/assetFactory/assetFactory.cpp
+++ b/assetFactory/assetFactory.cpp
@@ -27,5 +27,14 @@ bool
 AssetFactory::persist(Persistence::PersistenceStore & store)
 {
 	using MapObjects = Persistence::MapByMember<Shapes, std::shared_ptr<Object>>;
-	return STORE_TYPE && STORE_NAME_HELPER("object", shapes, MapObjects);
+	using MapAssets = Persistence::MapByMember<Assets>;
+	return STORE_TYPE && STORE_NAME_HELPER("object", shapes, MapObjects)
+			&& STORE_NAME_HELPER("asset", assets, MapAssets);
+}
+
+bool
+Asset::persist(Persistence::PersistenceStore & store)
+{
+	return STORE_TYPE && STORE_MEMBER(id) && STORE_MEMBER(name)
+			&& STORE_NAME_HELPER("mesh", meshes, Persistence::Appender<FactoryMesh::Collection>);
 }
diff --git a/assetFactory/assetFactory.h b/assetFactory/assetFactory.h
index 5cf90dd..9d79827 100644
--- a/assetFactory/assetFactory.h
+++ b/assetFactory/assetFactory.h
@@ -1,17 +1,33 @@
 #pragma once
 
+#include "factoryMesh.h"
 #include "persistence.h"
 #include "shape.h"
 #include <filesystem>
+#include <stdTypeDefs.hpp>
+
+class Asset : public Persistence::Persistable, public StdTypeDefs<Asset> {
+public:
+	std::string id;
+	std::string name;
+
+	FactoryMesh::Collection meshes;
+
+private:
+	friend Persistence::SelectionPtrBase<std::shared_ptr<Asset>, true>;
+	bool persist(Persistence::PersistenceStore & store) override;
+};
 
 class AssetFactory : public Persistence::Persistable {
 public:
-	using Shapes = std::map<std::string, Shape::CPtr, std::less<>>;
+	using Shapes = std::map<std::string, Shape::Ptr, std::less<>>;
+	using Assets = std::map<std::string, Asset::Ptr, std::less<>>;
 
 	AssetFactory();
 	[[nodiscard]] static std::shared_ptr<AssetFactory> loadXML(const std::filesystem::path &);
 
 	Shapes shapes;
+	Assets assets;
 
 private:
 	friend Persistence::SelectionPtrBase<std::shared_ptr<AssetFactory>, true>;
diff --git a/assetFactory/faceController.cpp b/assetFactory/faceController.cpp
index 7ec7820..499f7e4 100644
--- a/assetFactory/faceController.cpp
+++ b/assetFactory/faceController.cpp
@@ -52,10 +52,18 @@ FaceController::apply(ModelFactoryMesh & mesh, const std::string & name, Shape::
 					}
 				}
 				for (const auto & [name, faceController] : faceControllers) {
-					faceController.apply(mesh, name, newFaces);
+					faceController->apply(mesh, name, newFaces);
 				}
 				faces.merge(std::move(newFaces));
 			}
 		}
 	}
 }
+
+bool
+FaceController::persist(Persistence::PersistenceStore & store)
+{
+	return STORE_TYPE && STORE_MEMBER(id) && STORE_MEMBER(colour) && STORE_MEMBER(type) && STORE_MEMBER(smooth)
+			&& STORE_MEMBER(scale) && STORE_MEMBER(position) && STORE_MEMBER(rotation)
+			&& STORE_NAME_HELPER("face", faceControllers, Persistence::MapByMember<FaceControllers>);
+}
diff --git a/assetFactory/faceController.h b/assetFactory/faceController.h
index 9974caf..296210d 100644
--- a/assetFactory/faceController.h
+++ b/assetFactory/faceController.h
@@ -2,13 +2,14 @@
 
 #include "modelFactoryMesh_fwd.h"
 #include "mutation.h"
+#include "persistence.h"
 #include "shape.h"
 #include <map>
 #include <string>
 
-class FaceController : public Mutation {
+class FaceController : public Mutation, public Persistence::Persistable {
 public:
-	using FaceControllers = std::map<std::string, FaceController>;
+	using FaceControllers = std::map<std::string, std::unique_ptr<FaceController>>;
 
 	void apply(ModelFactoryMesh & mesh, const std::string & name, Shape::CreatedFaces & faces) const;
 
@@ -17,4 +18,13 @@ public:
 	std::string type;
 	bool smooth {false};
 	FaceControllers faceControllers;
+
+private:
+	friend Persistence::SelectionPtrBase<std::unique_ptr<FaceController>, false>;
+	bool persist(Persistence::PersistenceStore & store) override;
+	std::string
+	getId() const override
+	{
+		return {};
+	};
 };
diff --git a/assetFactory/factoryMesh.cpp b/assetFactory/factoryMesh.cpp
index baa031d..0fb72ad 100644
--- a/assetFactory/factoryMesh.cpp
+++ b/assetFactory/factoryMesh.cpp
@@ -29,3 +29,10 @@ FactoryMesh::createMesh() const
 	}
 	return std::make_shared<Mesh>(vertices, vectorOfN(vertices.size()));
 }
+
+bool
+FactoryMesh::persist(Persistence::PersistenceStore & store)
+{
+	return STORE_TYPE && STORE_MEMBER(id) && STORE_MEMBER(size)
+			&& STORE_NAME_HELPER("use", uses, Persistence::Appender<Use::Collection>);
+}
diff --git a/assetFactory/factoryMesh.h b/assetFactory/factoryMesh.h
index f850893..4b6d3e5 100644
--- a/assetFactory/factoryMesh.h
+++ b/assetFactory/factoryMesh.h
@@ -4,11 +4,15 @@
 #include "stdTypeDefs.hpp"
 #include "use.h"
 
-class FactoryMesh : public StdTypeDefs<FactoryMesh> {
+class FactoryMesh : public Persistence::Persistable, public StdTypeDefs<FactoryMesh> {
 public:
 	Mesh::Ptr createMesh() const;
 
 	std::string id;
 	glm::vec3 size;
 	Use::Collection uses;
+
+private:
+	friend Persistence::SelectionPtrBase<std::shared_ptr<FactoryMesh>, true>;
+	bool persist(Persistence::PersistenceStore & store) override;
 };
diff --git a/assetFactory/use.cpp b/assetFactory/use.cpp
index 3b574c3..1f28332 100644
--- a/assetFactory/use.cpp
+++ b/assetFactory/use.cpp
@@ -6,7 +6,7 @@ Use::createMesh(ModelFactoryMesh & mesh, const Mutation::Matrix & mutation) cons
 {
 	auto faces = type->createMesh(mesh, mutation * getMatrix());
 	for (const auto & [name, faceController] : faceControllers) {
-		faceController.apply(mesh, name, faces);
+		faceController->apply(mesh, name, faces);
 	}
 	return faces;
 }
@@ -27,5 +27,6 @@ bool
 Use::persist(Persistence::PersistenceStore & store)
 {
 	return STORE_TYPE && STORE_HELPER(type, Lookup) && STORE_MEMBER(position) && STORE_MEMBER(scale)
-			&& STORE_MEMBER(rotation);
+			&& STORE_MEMBER(rotation) && STORE_MEMBER(colour)
+			&& STORE_NAME_HELPER("face", faceControllers, Persistence::MapByMember<FaceControllers>);
 }
diff --git a/assetFactory/use.h b/assetFactory/use.h
index 96f07f6..853af23 100644
--- a/assetFactory/use.h
+++ b/assetFactory/use.h
@@ -8,7 +8,7 @@
 
 class Use : public StdTypeDefs<Use>, public Mutation, public Persistence::Persistable {
 public:
-	using FaceControllers = std::map<std::string, FaceController>;
+	using FaceControllers = std::map<std::string, std::unique_ptr<FaceController>>;
 
 	Shape::CreatedFaces createMesh(ModelFactoryMesh & mesh, const Mutation::Matrix & mutation) const;
 
diff --git a/res/brush47.xml b/res/brush47.xml
index 3c6705a..9cd654f 100644
--- a/res/brush47.xml
+++ b/res/brush47.xml
@@ -1,15 +1,33 @@
 <?xml version="1.0"?>
 <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,90"/>
+    <use type="cylinder" position="0,0,0.571" scale="1.142,1.142,0.07" rotation="0,0,1.5708"/>
   </object>
   <object id="axel">
     <use type="wheel" position="0.717,0,0"/>
-    <use type="wheel" position="-0.717,0,0" rotation="0,90,0"/>
+    <use type="wheel" position="-0.717,0,0" rotation="0,3.14159,0"/>
   </object>
-  <object id="bogey">
+  <object id="bogie">
     <use type="axel" position="0,0,0"/>
     <use type="axel" position="0,2,0"/>
     <use type="axel" position="0,-2,0"/>
   </object>
+  <asset id="brush-47" name="Brush 47">
+    <mesh id="body" size="2.69,19.38,3.9">
+      <use type="cuboid" position="0,0,1.2" scale="2.69,19.38,1.5" colour="#1111dd">
+        <face id="bottom" colour="#2C3539"/>
+        <face id="top" type="extrude" scale="1,0.95,1" position="0,0,1.0">
+          <face id="top" type="extrude" scale="0.6,0.9,0" position="0,0,0.2"/>
+          <!--smooth="true"-->
+        </face>
+      </use>
+      <use type="cuboid" position="0,0,0.2" scale="2.6,4.5,1" colour="#2C3539"/>
+    </mesh>
+    <mesh id="bogie1">
+      <use type="bogie" position="0,6,0"/>
+    </mesh>
+    <mesh id="bogie2">
+      <use type="bogie" position="0,-6,0" rotation="0,3.14159,0"/>
+    </mesh>
+  </asset>
 </ilt>
diff --git a/test/test-assetFactory.cpp b/test/test-assetFactory.cpp
index 64d6a62..fd7a41d 100644
--- a/test/test-assetFactory.cpp
+++ b/test/test-assetFactory.cpp
@@ -90,24 +90,24 @@ BOOST_AUTO_TEST_CASE(brush47)
 		assetFactory.shapes.emplace(axel->id, axel);
 	}
 	{
-		auto bogey = std::make_shared<Object>("bogey");
+		auto bogie = std::make_shared<Object>("bogie");
 		for (float y : {-2.f, 0.f, 2.f}) {
-			auto axel = bogey->uses.emplace_back(std::make_shared<Use>());
+			auto axel = bogie->uses.emplace_back(std::make_shared<Use>());
 			axel->type = assetFactory.shapes.at("axel");
 			axel->position = {0, y, 0};
 		}
-		assetFactory.shapes.emplace(bogey->id, bogey);
+		assetFactory.shapes.emplace(bogie->id, bogie);
 	}
 	FactoryMesh::Collection factoryMeshes;
 	{
 		unsigned short b {0};
 		for (float y : {-6.f, 6.f}) {
-			auto bogey = factoryMeshes.emplace_back(std::make_shared<FactoryMesh>());
-			bogey->id = "bogey" + std::to_string(b);
-			auto bogeyUse = bogey->uses.emplace_back(std::make_shared<Use>());
-			bogeyUse->type = assetFactory.shapes.at("bogey");
-			bogeyUse->position = {0, y, 0};
-			bogeyUse->rotation = {0, b * pi, 0};
+			auto bogie = factoryMeshes.emplace_back(std::make_shared<FactoryMesh>());
+			bogie->id = "bogie" + std::to_string(b);
+			auto bogieUse = bogie->uses.emplace_back(std::make_shared<Use>());
+			bogieUse->type = assetFactory.shapes.at("bogie");
+			bogieUse->position = {0, y, 0};
+			bogieUse->rotation = {0, b * pi, 0};
 			b++;
 		}
 	}
@@ -115,23 +115,25 @@ BOOST_AUTO_TEST_CASE(brush47)
 		auto body = factoryMeshes.emplace_back(std::make_shared<FactoryMesh>());
 		body->id = "body";
 		body->size = {2.69f, 19.38f, 3.9f};
-		{
-			auto bodyLower = body->uses.emplace_back(std::make_shared<Use>());
-			bodyLower->type = assetFactory.shapes.at("cuboid");
-			bodyLower->position = {0, 0, 1.2};
-			bodyLower->scale = {2.69, 19.38, 1.5};
-			bodyLower->colour = "#1111DD";
-			bodyLower->faceControllers["bottom"].colour = "#2C3539";
-			auto & bodyUpper = bodyLower->faceControllers["top"];
-			bodyUpper.type = "extrude";
-			bodyUpper.scale = {1, .95f, 1};
-			bodyUpper.position = {0, 0, 1.0};
-			auto & roof = bodyUpper.faceControllers["top"];
-			roof.type = "extrude";
-			roof.scale = {.6f, .9f, 0};
-			roof.position = {0, 0, 0.2};
-			roof.smooth = true;
-		}
+		auto bodyLower = body->uses.emplace_back(std::make_shared<Use>());
+		bodyLower->type = assetFactory.shapes.at("cuboid");
+		bodyLower->position = {0, 0, 1.2};
+		bodyLower->scale = {2.69, 19.38, 1.5};
+		bodyLower->colour = "#1111DD";
+		auto & bottom = bodyLower->faceControllers["bottom"];
+		bottom = std::make_unique<FaceController>();
+		bottom->colour = "#2C3539";
+		auto & bodyUpper = bodyLower->faceControllers["top"];
+		bodyUpper = std::make_unique<FaceController>();
+		bodyUpper->type = "extrude";
+		bodyUpper->scale = {1, .95f, 1};
+		bodyUpper->position = {0, 0, 1.0};
+		auto & roof = bodyUpper->faceControllers["top"];
+		roof = std::make_unique<FaceController>();
+		roof->type = "extrude";
+		roof->scale = {.6f, .9f, 0};
+		roof->position = {0, 0, 0.2};
+		roof->smooth = true;
 		{
 			auto batteryBox = body->uses.emplace_back(std::make_shared<Use>());
 			batteryBox->type = assetFactory.shapes.at("cuboid");
@@ -157,13 +159,20 @@ BOOST_AUTO_TEST_CASE(brush47xml)
 	BOOST_CHECK(mf->shapes.at("cuboid"));
 	BOOST_CHECK(mf->shapes.at("wheel"));
 	BOOST_CHECK(mf->shapes.at("axel"));
-	auto bogey = mf->shapes.at("bogey");
-	BOOST_REQUIRE(bogey);
-	auto bogeyObj = std::dynamic_pointer_cast<const Object>(bogey);
-	BOOST_CHECK_EQUAL(3, bogeyObj->uses.size());
+	auto bogie = mf->shapes.at("bogie");
+	BOOST_REQUIRE(bogie);
+	auto bogieObj = std::dynamic_pointer_cast<const Object>(bogie);
+	BOOST_CHECK_EQUAL(3, bogieObj->uses.size());
+	BOOST_CHECK_EQUAL(1, mf->assets.size());
+	auto brush47 = mf->assets.at("brush-47");
+	BOOST_REQUIRE(brush47);
+	BOOST_CHECK_EQUAL(3, brush47->meshes.size());
+	auto body = brush47->meshes.at(0);
+	BOOST_REQUIRE(body);
+	BOOST_CHECK_EQUAL("body", body->id);
+	BOOST_CHECK_EQUAL(2, body->uses.size());
 
-	FactoryMesh::Collection factoryMeshes;
-	std::transform(factoryMeshes.begin(), factoryMeshes.end(), std::back_inserter(meshes.objects),
+	std::transform(brush47->meshes.begin(), brush47->meshes.end(), std::back_inserter(meshes.objects),
 			[](const FactoryMesh::CPtr & factoryMesh) -> Mesh::Ptr {
 				return factoryMesh->createMesh();
 			});
-- 
cgit v1.2.3


From 96560a2f927831d1b98e654e80ee085f3ef562d8 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Thu, 23 Feb 2023 00:42:40 +0000
Subject: Smooth roof now supported

---
 res/brush47.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'res')

diff --git a/res/brush47.xml b/res/brush47.xml
index 9cd654f..841c951 100644
--- a/res/brush47.xml
+++ b/res/brush47.xml
@@ -17,8 +17,7 @@
       <use type="cuboid" position="0,0,1.2" scale="2.69,19.38,1.5" colour="#1111dd">
         <face id="bottom" colour="#2C3539"/>
         <face id="top" type="extrude" scale="1,0.95,1" position="0,0,1.0">
-          <face id="top" type="extrude" scale="0.6,0.9,0" position="0,0,0.2"/>
-          <!--smooth="true"-->
+          <face id="top" type="extrude" scale="0.6,0.9,0" position="0,0,0.2" smooth="true"/>
         </face>
       </use>
       <use type="cuboid" position="0,0,0.2" scale="2.6,4.5,1" colour="#2C3539"/>
-- 
cgit v1.2.3


From 27c9f248d374d1327e90e1627ae3a98d148f8972 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Thu, 23 Feb 2023 00:55:36 +0000
Subject: Fix axel definition

Test output images now identical
---
 res/brush47.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'res')

diff --git a/res/brush47.xml b/res/brush47.xml
index 841c951..9fd4fe2 100644
--- a/res/brush47.xml
+++ b/res/brush47.xml
@@ -4,8 +4,8 @@
     <use type="cylinder" position="0,0,0.571" scale="1.142,1.142,0.07" rotation="0,0,1.5708"/>
   </object>
   <object id="axel">
-    <use type="wheel" position="0.717,0,0"/>
-    <use type="wheel" position="-0.717,0,0" rotation="0,3.14159,0"/>
+    <use type="wheel" position="-0.717,0,0"/>
+    <use type="wheel" position="0.717,0,0" rotation="0,3.14159,0"/>
   </object>
   <object id="bogie">
     <use type="axel" position="0,0,0"/>
-- 
cgit v1.2.3


From 7d0decccaac3aa564b549d91a36279e7aca0814e Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Fri, 24 Feb 2023 19:30:30 +0000
Subject: Support for recursive colouring of asset factory faces

Updates colours in sample model.
---
 assetFactory/faceController.cpp | 29 +++++++++++++-------
 assetFactory/faceController.h   |  7 ++---
 assetFactory/factoryMesh.cpp    |  4 ++-
 assetFactory/modelFactoryMesh.h |  3 ++-
 assetFactory/style.cpp          | 59 +++++++++++++++++++++++++++++++++++++++++
 assetFactory/style.h            | 22 +++++++++++++++
 assetFactory/use.cpp            |  5 ++--
 assetFactory/use.h              |  4 +--
 res/brush47.xml                 | 16 ++++++-----
 9 files changed, 124 insertions(+), 25 deletions(-)
 create mode 100644 assetFactory/style.cpp
 create mode 100644 assetFactory/style.h

(limited to 'res')

diff --git a/assetFactory/faceController.cpp b/assetFactory/faceController.cpp
index 499f7e4..9f057da 100644
--- a/assetFactory/faceController.cpp
+++ b/assetFactory/faceController.cpp
@@ -1,14 +1,19 @@
 #include "faceController.h"
+#include "collections.hpp"
 #include "maths.h"
 #include "modelFactoryMesh.h"
 
 void
-FaceController::apply(ModelFactoryMesh & mesh, const std::string & name, Shape::CreatedFaces & faces) const
+FaceController::apply(ModelFactoryMesh & mesh, const StyleStack & parents, const std::string & name,
+		Shape::CreatedFaces & faces) const
 {
+	const auto controlledFacesRange = faces.equal_range(name);
+	const std::vector controlledFaces(controlledFacesRange.first, controlledFacesRange.second);
+	if (controlledFaces.empty()) {
+		throw std::runtime_error("Named face(s) do not exist: " + name);
+	}
 	if (!type.empty()) {
 		const auto mutation = getMatrix();
-		const auto controlledFacesRange = faces.equal_range(name);
-		const std::vector controlledFaces(controlledFacesRange.first, controlledFacesRange.second);
 		faces.erase(name);
 		for (const auto & cf : controlledFaces) {
 			// get face vertices
@@ -23,9 +28,6 @@ FaceController::apply(ModelFactoryMesh & mesh, const std::string & name, Shape::
 			const auto vertexCount = points.size();
 			const auto centre
 					= std::accumulate(points.begin(), points.end(), glm::vec3 {}) / static_cast<float>(vertexCount);
-			if (smooth) {
-				mesh.property(mesh.smoothFaceProperty, cf.second) = true;
-			}
 			if (type == "extrude") {
 				Shape::CreatedFaces newFaces;
 				// mutate points
@@ -38,7 +40,6 @@ FaceController::apply(ModelFactoryMesh & mesh, const std::string & name, Shape::
 					return mesh.add_vertex({p.x, p.y, p.z});
 				});
 				// create new faces
-
 				mesh.delete_face(cf.second);
 				for (size_t idx {}; idx < vertexCount; ++idx) {
 					const auto next = (idx + 1) % vertexCount;
@@ -51,11 +52,21 @@ FaceController::apply(ModelFactoryMesh & mesh, const std::string & name, Shape::
 						mesh.property(mesh.smoothFaceProperty, face) = true;
 					}
 				}
+				applyStyle(mesh, parents + this, newFaces);
 				for (const auto & [name, faceController] : faceControllers) {
-					faceController->apply(mesh, name, newFaces);
+					faceController->apply(mesh, parents + this, name, newFaces);
 				}
 				faces.merge(std::move(newFaces));
 			}
+			else {
+				mesh.property(mesh.smoothFaceProperty, cf.second) = smooth;
+				applyStyle(mesh, parents + this, cf.second);
+			}
+		}
+	}
+	else {
+		for (const auto & cf : controlledFaces) {
+			applyStyle(mesh, parents + this, cf.second);
 		}
 	}
 }
@@ -63,7 +74,7 @@ FaceController::apply(ModelFactoryMesh & mesh, const std::string & name, Shape::
 bool
 FaceController::persist(Persistence::PersistenceStore & store)
 {
-	return STORE_TYPE && STORE_MEMBER(id) && STORE_MEMBER(colour) && STORE_MEMBER(type) && STORE_MEMBER(smooth)
+	return STORE_TYPE && STORE_MEMBER(id) && Style::persist(store) && STORE_MEMBER(type) && STORE_MEMBER(smooth)
 			&& STORE_MEMBER(scale) && STORE_MEMBER(position) && STORE_MEMBER(rotation)
 			&& STORE_NAME_HELPER("face", faceControllers, Persistence::MapByMember<FaceControllers>);
 }
diff --git a/assetFactory/faceController.h b/assetFactory/faceController.h
index 296210d..0618388 100644
--- a/assetFactory/faceController.h
+++ b/assetFactory/faceController.h
@@ -4,17 +4,18 @@
 #include "mutation.h"
 #include "persistence.h"
 #include "shape.h"
+#include "style.h"
 #include <map>
 #include <string>
 
-class FaceController : public Mutation, public Persistence::Persistable {
+class FaceController : public Mutation, public Style, public Persistence::Persistable {
 public:
 	using FaceControllers = std::map<std::string, std::unique_ptr<FaceController>>;
 
-	void apply(ModelFactoryMesh & mesh, const std::string & name, Shape::CreatedFaces & faces) const;
+	void apply(ModelFactoryMesh & mesh, const Style::StyleStack & parents, const std::string & name,
+			Shape::CreatedFaces & faces) const;
 
 	std::string id;
-	std::string colour;
 	std::string type;
 	bool smooth {false};
 	FaceControllers faceControllers;
diff --git a/assetFactory/factoryMesh.cpp b/assetFactory/factoryMesh.cpp
index 0fb72ad..0cfed85 100644
--- a/assetFactory/factoryMesh.cpp
+++ b/assetFactory/factoryMesh.cpp
@@ -21,10 +21,12 @@ FactoryMesh::createMesh() const
 	std::vector<Vertex> vertices;
 	for (const auto & face : mesh.faces()) {
 		const auto smooth = mesh.property(mesh.smoothFaceProperty, face);
+		const auto colour = mesh.color(face);
 		for (const auto & vertex : mesh.fv_range(face)) {
 			vertices.emplace_back(mesh.point(vertex), NullUV,
 					smooth ? mesh.property(mesh.vertex_normals_pph(), vertex)
-						   : mesh.property(mesh.face_normals_pph(), face));
+						   : mesh.property(mesh.face_normals_pph(), face),
+					colour);
 		}
 	}
 	return std::make_shared<Mesh>(vertices, vectorOfN(vertices.size()));
diff --git a/assetFactory/modelFactoryMesh.h b/assetFactory/modelFactoryMesh.h
index d0ffc26..7d222f5 100644
--- a/assetFactory/modelFactoryMesh.h
+++ b/assetFactory/modelFactoryMesh.h
@@ -20,11 +20,12 @@ namespace OpenMesh {
 }
 
 struct ModelFactoryTraits : public OpenMesh::DefaultTraits {
-	FaceAttributes(OpenMesh::Attributes::Normal | OpenMesh::Attributes::Status);
+	FaceAttributes(OpenMesh::Attributes::Normal | OpenMesh::Attributes::Status | OpenMesh::Attributes::Color);
 	EdgeAttributes(OpenMesh::Attributes::Status);
 	VertexAttributes(OpenMesh::Attributes::Normal | OpenMesh::Attributes::Status);
 	using Point = OpenMesh::glmvec<float, 3>;
 	using Normal = OpenMesh::glmvec<float, 3>;
+	using Color = OpenMesh::glmvec<float, 4>;
 };
 
 struct ModelFactoryMesh : public OpenMesh::PolyMesh_ArrayKernelT<ModelFactoryTraits> {
diff --git a/assetFactory/style.cpp b/assetFactory/style.cpp
new file mode 100644
index 0000000..099d81a
--- /dev/null
+++ b/assetFactory/style.cpp
@@ -0,0 +1,59 @@
+#include "style.h"
+
+ModelFactoryMesh::Color
+Style::parseColour(const std::string_view & in)
+{
+	if (in.empty()) {
+		return {};
+	}
+	if (in[0] == '#') {
+		ModelFactoryMesh::Color out {0, 0, 0, 1};
+		std::generate_n(out.begin(), (in.length() - 1) / 2, [in = in.data() + 1]() mutable {
+			uint8_t channel;
+			std::from_chars(in, in + 2, channel, 16);
+			in += 2;
+			return static_cast<float>(channel) / 256.F;
+		});
+		return out;
+	}
+	return {};
+}
+
+void
+Style::applyStyle(ModelFactoryMesh & mesh, const StyleStack & parents, const Shape::CreatedFaces & faces) const
+{
+	if (const auto effectiveColour = getProperty(parents, &Style::colour); !effectiveColour.empty()) {
+		const auto parsedColour = parseColour(effectiveColour);
+		for (const auto & face : faces) {
+			mesh.set_color(face.second, parsedColour);
+		}
+	}
+}
+
+void
+Style::applyStyle(ModelFactoryMesh & mesh, const StyleStack & parents, const ModelFactoryMesh::FaceHandle & face) const
+{
+	if (const auto effectiveColour = getProperty(parents, &Style::colour); !effectiveColour.empty()) {
+		const auto parsedColour = parseColour(effectiveColour);
+		mesh.set_color(face, parsedColour);
+	}
+}
+
+std::string_view
+Style::getProperty(const StyleStack & parents, std::string Style::*member)
+{
+	if (const auto itr = std::find_if(parents.rbegin(), parents.rend(),
+				[&member](auto && s) {
+					return !(s->*member).empty();
+				});
+			itr != parents.rend()) {
+		return (*itr)->*member;
+	}
+	return {};
+}
+
+bool
+Style::persist(Persistence::PersistenceStore & store)
+{
+	return STORE_MEMBER(colour);
+}
diff --git a/assetFactory/style.h b/assetFactory/style.h
new file mode 100644
index 0000000..0c7ad5a
--- /dev/null
+++ b/assetFactory/style.h
@@ -0,0 +1,22 @@
+#pragma once
+
+#include "modelFactoryMesh.h"
+#include "persistence.h"
+#include "shape.h"
+#include <string>
+
+class Style {
+public:
+	using StyleStack = std::vector<const Style *>;
+
+	static ModelFactoryMesh::Color parseColour(const std::string_view &);
+	void applyStyle(ModelFactoryMesh &, const StyleStack & parents, const Shape::CreatedFaces &) const;
+	void applyStyle(ModelFactoryMesh &, const StyleStack & parents, const ModelFactoryMesh::FaceHandle &) const;
+
+	static std::string_view getProperty(const StyleStack & parents, std::string Style::*member);
+
+	std::string colour;
+
+protected:
+	bool persist(Persistence::PersistenceStore & store);
+};
diff --git a/assetFactory/use.cpp b/assetFactory/use.cpp
index 1f28332..a6fac5c 100644
--- a/assetFactory/use.cpp
+++ b/assetFactory/use.cpp
@@ -5,8 +5,9 @@ Shape::CreatedFaces
 Use::createMesh(ModelFactoryMesh & mesh, const Mutation::Matrix & mutation) const
 {
 	auto faces = type->createMesh(mesh, mutation * getMatrix());
+	applyStyle(mesh, {this}, faces);
 	for (const auto & [name, faceController] : faceControllers) {
-		faceController->apply(mesh, name, faces);
+		faceController->apply(mesh, {this}, name, faces);
 	}
 	return faces;
 }
@@ -27,6 +28,6 @@ bool
 Use::persist(Persistence::PersistenceStore & store)
 {
 	return STORE_TYPE && STORE_HELPER(type, Lookup) && STORE_MEMBER(position) && STORE_MEMBER(scale)
-			&& STORE_MEMBER(rotation) && STORE_MEMBER(colour)
+			&& STORE_MEMBER(rotation) && Style::persist(store)
 			&& STORE_NAME_HELPER("face", faceControllers, Persistence::MapByMember<FaceControllers>);
 }
diff --git a/assetFactory/use.h b/assetFactory/use.h
index 853af23..5b61eca 100644
--- a/assetFactory/use.h
+++ b/assetFactory/use.h
@@ -5,15 +5,15 @@
 #include "persistence.h"
 #include "shape.h"
 #include "stdTypeDefs.hpp"
+#include "style.h"
 
-class Use : public StdTypeDefs<Use>, public Mutation, public Persistence::Persistable {
+class Use : public StdTypeDefs<Use>, public Mutation, public Style, public Persistence::Persistable {
 public:
 	using FaceControllers = std::map<std::string, std::unique_ptr<FaceController>>;
 
 	Shape::CreatedFaces createMesh(ModelFactoryMesh & mesh, const Mutation::Matrix & mutation) const;
 
 	Shape::CPtr type;
-	std::string colour;
 	FaceControllers faceControllers;
 
 private:
diff --git a/res/brush47.xml b/res/brush47.xml
index 9fd4fe2..fe3d114 100644
--- a/res/brush47.xml
+++ b/res/brush47.xml
@@ -14,19 +14,21 @@
   </object>
   <asset id="brush-47" name="Brush 47">
     <mesh id="body" size="2.69,19.38,3.9">
-      <use type="cuboid" position="0,0,1.2" scale="2.69,19.38,1.5" colour="#1111dd">
-        <face id="bottom" colour="#2C3539"/>
-        <face id="top" type="extrude" scale="1,0.95,1" position="0,0,1.0">
-          <face id="top" type="extrude" scale="0.6,0.9,0" position="0,0,0.2" smooth="true"/>
+      <use type="cuboid" position="0,0,1.2" scale="2.69,19.38,1.5" colour="#2c4f5a">
+        <face id="bottom" colour="#2c3539"/>
+        <face id="front" colour="#fbc32f"/>
+        <face id="back" colour="#fbc32f"/>
+        <face id="top" type="extrude" scale="1,0.95,1" position="0,0,0.8">
+          <face id="top" type="extrude" scale="0.5,0.8,0" position="0,0,0.4" smooth="true" colour="#aeb0b0"/>
         </face>
       </use>
-      <use type="cuboid" position="0,0,0.2" scale="2.6,4.5,1" colour="#2C3539"/>
+      <use type="cuboid" position="0,0,0.2" scale="2.6,4.5,1" colour="#413b3a"/>
     </mesh>
     <mesh id="bogie1">
-      <use type="bogie" position="0,6,0"/>
+      <use type="bogie" position="0,6,0" colour="#413b3a"/>
     </mesh>
     <mesh id="bogie2">
-      <use type="bogie" position="0,-6,0" rotation="0,3.14159,0"/>
+      <use type="bogie" position="0,-6,0" rotation="0,3.14159,0" colour="#413b3a"/>
     </mesh>
   </asset>
 </ilt>
-- 
cgit v1.2.3


From 29faadd99b2c6fd8dd5bfd9842d1361d82690f96 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Sat, 25 Feb 2023 03:32:24 +0000
Subject: Colour windows of sample model

---
 res/brush47.xml | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'res')

diff --git a/res/brush47.xml b/res/brush47.xml
index fe3d114..1ece78f 100644
--- a/res/brush47.xml
+++ b/res/brush47.xml
@@ -19,6 +19,8 @@
         <face id="front" colour="#fbc32f"/>
         <face id="back" colour="#fbc32f"/>
         <face id="top" type="extrude" scale="1,0.95,1" position="0,0,0.8">
+          <face id="front" colour="#e1eff3"/>
+          <face id="back" colour="#e1eff3"/>
           <face id="top" type="extrude" scale="0.5,0.8,0" position="0,0,0.4" smooth="true" colour="#aeb0b0"/>
         </face>
       </use>
-- 
cgit v1.2.3


From 5c703a1549b88339ca48ac3c48f67ab7503d223a Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Mon, 27 Feb 2023 23:56:03 +0000
Subject: Support for named colours in assets

Fixes up some error handling in colour parser.
---
 assetFactory/style.cpp | 14 ++++++++++++--
 res/brush47.xml        |  6 +++---
 2 files changed, 15 insertions(+), 5 deletions(-)

(limited to 'res')

diff --git a/assetFactory/style.cpp b/assetFactory/style.cpp
index 099d81a..d2977a7 100644
--- a/assetFactory/style.cpp
+++ b/assetFactory/style.cpp
@@ -1,12 +1,16 @@
 #include "style.h"
+#include "assetFactory.h"
 
 ModelFactoryMesh::Color
 Style::parseColour(const std::string_view & in)
 {
 	if (in.empty()) {
-		return {};
+		throw std::runtime_error("Empty colour specification");
 	}
 	if (in[0] == '#') {
+		if (in.length() > 9 || in.length() % 2 == 0) {
+			throw std::runtime_error("Invalid hex colour specification");
+		}
 		ModelFactoryMesh::Color out {0, 0, 0, 1};
 		std::generate_n(out.begin(), (in.length() - 1) / 2, [in = in.data() + 1]() mutable {
 			uint8_t channel;
@@ -16,7 +20,13 @@ Style::parseColour(const std::string_view & in)
 		});
 		return out;
 	}
-	return {};
+	if (auto mf = std::dynamic_pointer_cast<const AssetFactory>(Persistence::sharedObjects.at("assetFactory"))) {
+		if (const auto colour = mf->colours.find(in); colour != mf->colours.end()) {
+			const auto out = glm::vec3 {colour->second} / 256.F;
+			return {out.r, out.g, out.b, 1.f};
+		}
+	}
+	throw std::runtime_error("No such asset factory colour");
 }
 
 void
diff --git a/res/brush47.xml b/res/brush47.xml
index 1ece78f..477610c 100644
--- a/res/brush47.xml
+++ b/res/brush47.xml
@@ -16,15 +16,15 @@
     <mesh id="body" size="2.69,19.38,3.9">
       <use type="cuboid" position="0,0,1.2" scale="2.69,19.38,1.5" colour="#2c4f5a">
         <face id="bottom" colour="#2c3539"/>
-        <face id="front" colour="#fbc32f"/>
-        <face id="back" colour="#fbc32f"/>
+        <face id="front" colour="goldenrod"/>
+        <face id="back" colour="goldenrod"/>
         <face id="top" type="extrude" scale="1,0.95,1" position="0,0,0.8">
           <face id="front" colour="#e1eff3"/>
           <face id="back" colour="#e1eff3"/>
           <face id="top" type="extrude" scale="0.5,0.8,0" position="0,0,0.4" smooth="true" colour="#aeb0b0"/>
         </face>
       </use>
-      <use type="cuboid" position="0,0,0.2" scale="2.6,4.5,1" colour="#413b3a"/>
+      <use type="cuboid" position="0,0,0.2" scale="2.6,4.5,1" colour="grey30"/>
     </mesh>
     <mesh id="bogie1">
       <use type="bogie" position="0,6,0" colour="#413b3a"/>
-- 
cgit v1.2.3


From 54ddcd3da0916b6a46f5fcf3f33ff0fbffe375ce Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Sat, 4 Mar 2023 14:27:23 +0000
Subject: Support and load factory asset directly into a RailVehicleClass
 instance

---
 assetFactory/asset.cpp             |  3 +--
 assetFactory/asset.h               |  2 --
 game/vehicles/railVehicleClass.cpp |  9 +++++++++
 game/vehicles/railVehicleClass.h   |  8 +++++++-
 res/brush47.xml                    | 14 +++++++-------
 test/test-assetFactory.cpp         | 18 +++++++++---------
 6 files changed, 33 insertions(+), 21 deletions(-)

(limited to 'res')

diff --git a/assetFactory/asset.cpp b/assetFactory/asset.cpp
index 659a950..3ab2f1c 100644
--- a/assetFactory/asset.cpp
+++ b/assetFactory/asset.cpp
@@ -3,8 +3,7 @@
 bool
 Asset::persist(Persistence::PersistenceStore & store)
 {
-	return STORE_MEMBER(id) && STORE_MEMBER(name)
-			&& STORE_NAME_HELPER("mesh", meshes, Persistence::Appender<FactoryMesh::Collection>);
+	return STORE_MEMBER(id) && STORE_MEMBER(name);
 }
 
 Asset::MeshConstruct::MeshConstruct(Mesh::Ptr & m) :
diff --git a/assetFactory/asset.h b/assetFactory/asset.h
index 8dd1ecb..e3318e4 100644
--- a/assetFactory/asset.h
+++ b/assetFactory/asset.h
@@ -9,8 +9,6 @@ public:
 	std::string id;
 	std::string name;
 
-	FactoryMesh::Collection meshes;
-
 protected:
 	struct MeshConstruct : public Persistence::SelectionPtrBase<FactoryMesh::Ptr> {
 		using Persistence::SelectionPtrBase<FactoryMesh::Ptr>::setValue;
diff --git a/game/vehicles/railVehicleClass.cpp b/game/vehicles/railVehicleClass.cpp
index dff1416..7052396 100644
--- a/game/vehicles/railVehicleClass.cpp
+++ b/game/vehicles/railVehicleClass.cpp
@@ -39,6 +39,15 @@ RailVehicleClass::RailVehicleClass(std::unique_ptr<ObjParser> o, std::shared_ptr
 	bogies[1] = m.at("Bogie2");
 }
 
+RailVehicleClass::RailVehicleClass() { }
+
+bool
+RailVehicleClass::persist(Persistence::PersistenceStore & store)
+{
+	return STORE_TYPE && STORE_MEMBER(maxSpeed) && STORE_NAME_HELPER("bogie", bogies, Asset::MeshArrayConstruct)
+			&& STORE_HELPER(bodyMesh, Asset::MeshConstruct) && Asset::persist(store);
+}
+
 void
 RailVehicleClass::render(
 		const SceneShader & shader, const Location & location, const std::array<Location, 2> & bl) const
diff --git a/game/vehicles/railVehicleClass.h b/game/vehicles/railVehicleClass.h
index bd74ab9..c50dacc 100644
--- a/game/vehicles/railVehicleClass.h
+++ b/game/vehicles/railVehicleClass.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "assetFactory/asset.h"
 #include "gfx/models/mesh.h"
 #include <array>
 #include <memory>
@@ -11,9 +12,10 @@ class Texture;
 class ObjParser;
 class Location;
 
-class RailVehicleClass {
+class RailVehicleClass : public Asset {
 public:
 	explicit RailVehicleClass(const std::string & name);
+	RailVehicleClass();
 
 	void render(const SceneShader &, const Location &, const std::array<Location, 2> &) const;
 	void shadows(const ShadowMapper &, const Location &) const;
@@ -25,6 +27,10 @@ public:
 	float length;
 	float maxSpeed;
 
+protected:
+	friend Persistence::SelectionPtrBase<std::shared_ptr<RailVehicleClass>>;
+	bool persist(Persistence::PersistenceStore & store) override;
+
 private:
 	RailVehicleClass(std::unique_ptr<ObjParser> obj, std::shared_ptr<Texture>);
 	static float bogieOffset(ObjParser & o);
diff --git a/res/brush47.xml b/res/brush47.xml
index 477610c..796641a 100644
--- a/res/brush47.xml
+++ b/res/brush47.xml
@@ -12,8 +12,8 @@
     <use type="axel" position="0,2,0"/>
     <use type="axel" position="0,-2,0"/>
   </object>
-  <asset id="brush-47" name="Brush 47">
-    <mesh id="body" size="2.69,19.38,3.9">
+  <asset p.typeid="RailVehicleClass" id="brush-47" name="Brush 47">
+    <bodyMesh id="body" size="2.69,19.38,3.9">
       <use type="cuboid" position="0,0,1.2" scale="2.69,19.38,1.5" colour="#2c4f5a">
         <face id="bottom" colour="#2c3539"/>
         <face id="front" colour="goldenrod"/>
@@ -25,12 +25,12 @@
         </face>
       </use>
       <use type="cuboid" position="0,0,0.2" scale="2.6,4.5,1" colour="grey30"/>
-    </mesh>
-    <mesh id="bogie1">
+    </bodyMesh>
+    <bogie id="bogie1">
       <use type="bogie" position="0,6,0" colour="#413b3a"/>
-    </mesh>
-    <mesh id="bogie2">
+    </bogie>
+    <bogie id="bogie2">
       <use type="bogie" position="0,-6,0" rotation="0,3.14159,0" colour="#413b3a"/>
-    </mesh>
+    </bogie>
   </asset>
 </ilt>
diff --git a/test/test-assetFactory.cpp b/test/test-assetFactory.cpp
index 8feb831..9930714 100644
--- a/test/test-assetFactory.cpp
+++ b/test/test-assetFactory.cpp
@@ -8,6 +8,7 @@
 #include "assetFactory/assetFactory.h"
 #include "assetFactory/factoryMesh.h"
 #include "assetFactory/object.h"
+#include "game/vehicles/railVehicleClass.h"
 #include "gfx/gl/sceneRenderer.h"
 #include "lib/collection.hpp"
 #include "lib/location.hpp"
@@ -167,16 +168,15 @@ BOOST_AUTO_TEST_CASE(brush47xml)
 	BOOST_CHECK_EQUAL(1, mf->assets.size());
 	auto brush47 = mf->assets.at("brush-47");
 	BOOST_REQUIRE(brush47);
-	BOOST_CHECK_EQUAL(3, brush47->meshes.size());
-	auto body = brush47->meshes.at(0);
-	BOOST_REQUIRE(body);
-	BOOST_CHECK_EQUAL("body", body->id);
-	BOOST_CHECK_EQUAL(2, body->uses.size());
+	auto brush47rvc = std::dynamic_pointer_cast<RailVehicleClass>(brush47);
+	BOOST_REQUIRE(brush47rvc);
+	BOOST_REQUIRE(brush47rvc->bodyMesh);
+	BOOST_REQUIRE(brush47rvc->bogies.front());
+	BOOST_REQUIRE(brush47rvc->bogies.back());
 
-	std::transform(brush47->meshes.begin(), brush47->meshes.end(), std::back_inserter(meshes.objects),
-			[](const FactoryMesh::CPtr & factoryMesh) -> Mesh::Ptr {
-				return factoryMesh->createMesh();
-			});
+	meshes.objects.push_back(brush47rvc->bodyMesh);
+	meshes.objects.push_back(brush47rvc->bogies.front());
+	meshes.objects.push_back(brush47rvc->bogies.back());
 
 	render(20);
 }
-- 
cgit v1.2.3


From c8ecaaddeee46900540e24e096f86306e77493f7 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Sat, 4 Mar 2023 15:12:30 +0000
Subject: Load length, wheelBase and maxSpeed RailVehicleClass properties from
 XML

Adjusts bogie position to appear correct according to wheelBase
---
 game/vehicles/railVehicleClass.cpp | 3 ++-
 res/brush47.xml                    | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'res')

diff --git a/game/vehicles/railVehicleClass.cpp b/game/vehicles/railVehicleClass.cpp
index c0740cc..90a06bd 100644
--- a/game/vehicles/railVehicleClass.cpp
+++ b/game/vehicles/railVehicleClass.cpp
@@ -44,7 +44,8 @@ RailVehicleClass::RailVehicleClass() { }
 bool
 RailVehicleClass::persist(Persistence::PersistenceStore & store)
 {
-	return STORE_TYPE && STORE_MEMBER(maxSpeed) && STORE_NAME_HELPER("bogie", bogies, Asset::MeshArrayConstruct)
+	return STORE_TYPE && STORE_MEMBER(length) && STORE_MEMBER(wheelBase) && STORE_MEMBER(maxSpeed)
+			&& STORE_NAME_HELPER("bogie", bogies, Asset::MeshArrayConstruct)
 			&& STORE_HELPER(bodyMesh, Asset::MeshConstruct) && Asset::persist(store);
 }
 
diff --git a/res/brush47.xml b/res/brush47.xml
index 796641a..9c7d2a8 100644
--- a/res/brush47.xml
+++ b/res/brush47.xml
@@ -12,7 +12,7 @@
     <use type="axel" position="0,2,0"/>
     <use type="axel" position="0,-2,0"/>
   </object>
-  <asset p.typeid="RailVehicleClass" id="brush-47" name="Brush 47">
+  <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,1.5" colour="#2c4f5a">
         <face id="bottom" colour="#2c3539"/>
@@ -27,10 +27,10 @@
       <use type="cuboid" position="0,0,0.2" scale="2.6,4.5,1" colour="grey30"/>
     </bodyMesh>
     <bogie id="bogie1">
-      <use type="bogie" position="0,6,0" colour="#413b3a"/>
+      <use type="bogie" position="0,-1.85,0" colour="#413b3a"/>
     </bogie>
     <bogie id="bogie2">
-      <use type="bogie" position="0,-6,0" rotation="0,3.14159,0" colour="#413b3a"/>
+      <use type="bogie" position="0,1.85,0" rotation="0,3.14159,0" colour="#413b3a"/>
     </bogie>
   </asset>
 </ilt>
-- 
cgit v1.2.3