From 715d4879fdd096ac82367984fdb22117d48737a4 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Wed, 15 Feb 2023 02:26:06 +0000
Subject: First cut of the model factory and the hardcoded Brush 47 model

Requires temporary change to the fragment shader to hardcode some visible colour to the model
---
 assetFactory/object.cpp | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 assetFactory/object.cpp

(limited to 'assetFactory/object.cpp')

diff --git a/assetFactory/object.cpp b/assetFactory/object.cpp
new file mode 100644
index 0000000..8b70676
--- /dev/null
+++ b/assetFactory/object.cpp
@@ -0,0 +1,17 @@
+#include "object.h"
+#include <algorithm>
+
+Object::Object(std::string i) : id {std::move(i)} { }
+
+Object::CreatedFaces
+Object::createMesh(ModelFactoryMesh & mesh, const Mutation::Matrix & mutation) const
+{
+	CreatedFaces faces;
+	for (const auto & use : uses) {
+		auto useFaces = use->createMesh(mesh, mutation);
+		std::transform(useFaces.begin(), useFaces.end(), std::inserter(faces, faces.end()), [this](auto && face) {
+			return std::make_pair(id + ":" + face.first, std::move(face.second));
+		});
+	}
+	return faces;
+}
-- 
cgit v1.2.3


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

---
 assetFactory/object.cpp | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

(limited to 'assetFactory/object.cpp')

diff --git a/assetFactory/object.cpp b/assetFactory/object.cpp
index 8b70676..faa9a17 100644
--- a/assetFactory/object.cpp
+++ b/assetFactory/object.cpp
@@ -15,3 +15,25 @@ Object::createMesh(ModelFactoryMesh & mesh, const Mutation::Matrix & mutation) c
 	}
 	return faces;
 }
+
+template<typename Container, typename Type> struct Appender : public Persistence::SelectionT<std::shared_ptr<Type>> {
+	Appender(Container & c) : Persistence::SelectionT<std::shared_ptr<Type>> {s}, container {c} { }
+	using Persistence::SelectionT<std::shared_ptr<Type>>::SelectionT;
+	void
+	endObject(Persistence::Stack & stk) override
+	{
+		container.emplace_back(s);
+		stk.pop();
+	}
+
+private:
+	std::shared_ptr<Type> s;
+	Container & container;
+};
+
+bool
+Object::persist(Persistence::PersistenceStore & store)
+{
+	using UseAppend = Appender<Use::Collection, Use>;
+	return STORE_TYPE && STORE_MEMBER(id) && STORE_NAME_HELPER("use", uses, UseAppend);
+}
-- 
cgit v1.2.3


From f91e2ea8d9e30b1e62c4f8784fddfd4eb9578d2d Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Tue, 21 Feb 2023 20:09:41 +0000
Subject: Move Appender in Persistence NS and simplify types

---
 assetFactory/object.cpp | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

(limited to 'assetFactory/object.cpp')

diff --git a/assetFactory/object.cpp b/assetFactory/object.cpp
index faa9a17..ae5a301 100644
--- a/assetFactory/object.cpp
+++ b/assetFactory/object.cpp
@@ -16,24 +16,8 @@ Object::createMesh(ModelFactoryMesh & mesh, const Mutation::Matrix & mutation) c
 	return faces;
 }
 
-template<typename Container, typename Type> struct Appender : public Persistence::SelectionT<std::shared_ptr<Type>> {
-	Appender(Container & c) : Persistence::SelectionT<std::shared_ptr<Type>> {s}, container {c} { }
-	using Persistence::SelectionT<std::shared_ptr<Type>>::SelectionT;
-	void
-	endObject(Persistence::Stack & stk) override
-	{
-		container.emplace_back(s);
-		stk.pop();
-	}
-
-private:
-	std::shared_ptr<Type> s;
-	Container & container;
-};
-
 bool
 Object::persist(Persistence::PersistenceStore & store)
 {
-	using UseAppend = Appender<Use::Collection, Use>;
-	return STORE_TYPE && STORE_MEMBER(id) && STORE_NAME_HELPER("use", uses, UseAppend);
+	return STORE_TYPE && STORE_MEMBER(id) && STORE_NAME_HELPER("use", uses, Persistence::Appender<Use::Collection>);
 }
-- 
cgit v1.2.3