From 3fea21a2d8f2aa67fd212837fe7e09e4f29ad515 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Tue, 14 Mar 2023 19:16:57 +0000
Subject: Support creating a super texture from fragments

Currently makes wild assumptions about vertices and doesn't actually populate the texture, it's just grey
---
 assetFactory/modelFactoryMesh.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'assetFactory/modelFactoryMesh.h')

diff --git a/assetFactory/modelFactoryMesh.h b/assetFactory/modelFactoryMesh.h
index 149ff1a..493ce1b 100644
--- a/assetFactory/modelFactoryMesh.h
+++ b/assetFactory/modelFactoryMesh.h
@@ -4,6 +4,7 @@
 #include <OpenMesh/Core/Mesh/PolyMesh_ArrayKernelT.hh>
 #include <OpenMesh/Core/Mesh/Traits.hh>
 #include <glm/geometric.hpp>
+#include <glm/vec2.hpp>
 #include <glm/vec3.hpp>
 #include <glm/vec4.hpp>
 
@@ -34,10 +35,11 @@ namespace OpenMesh {
 struct ModelFactoryTraits : public OpenMesh::DefaultTraits {
 	FaceAttributes(OpenMesh::Attributes::Normal | OpenMesh::Attributes::Status | OpenMesh::Attributes::Color);
 	EdgeAttributes(OpenMesh::Attributes::Status);
-	VertexAttributes(OpenMesh::Attributes::Normal | OpenMesh::Attributes::Status);
+	VertexAttributes(OpenMesh::Attributes::Normal | OpenMesh::Attributes::Status | OpenMesh::Attributes::TexCoord2D);
 	using Point = glm::vec3;
 	using Normal = glm::vec3;
 	using Color = glm::vec4;
+	using TexCoord2D = glm::vec2;
 };
 
 struct ModelFactoryMesh : public OpenMesh::PolyMesh_ArrayKernelT<ModelFactoryTraits> {
-- 
cgit v1.2.3


From 51f0f60bd24a3d7ed77cf713f846bc49c2f1aed5 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Sat, 18 Mar 2023 02:44:00 +0000
Subject: Use halfedge for texture coordinates

More unique than vertex as it is also per face, allowing for a different texture on adjacent faces
---
 assetFactory/modelFactoryMesh.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'assetFactory/modelFactoryMesh.h')

diff --git a/assetFactory/modelFactoryMesh.h b/assetFactory/modelFactoryMesh.h
index 493ce1b..a862dc1 100644
--- a/assetFactory/modelFactoryMesh.h
+++ b/assetFactory/modelFactoryMesh.h
@@ -35,7 +35,8 @@ namespace OpenMesh {
 struct ModelFactoryTraits : public OpenMesh::DefaultTraits {
 	FaceAttributes(OpenMesh::Attributes::Normal | OpenMesh::Attributes::Status | OpenMesh::Attributes::Color);
 	EdgeAttributes(OpenMesh::Attributes::Status);
-	VertexAttributes(OpenMesh::Attributes::Normal | OpenMesh::Attributes::Status | OpenMesh::Attributes::TexCoord2D);
+	VertexAttributes(OpenMesh::Attributes::Normal | OpenMesh::Attributes::Status);
+	HalfedgeAttributes(OpenMesh::Attributes::TexCoord2D);
 	using Point = glm::vec3;
 	using Normal = glm::vec3;
 	using Color = glm::vec4;
-- 
cgit v1.2.3


From 7f9e28e4e91ac757680fef56e771122cde14c9db Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Sat, 8 Apr 2023 11:42:43 +0100
Subject: Remember the name of the adjacent face of each halfedge of each named
 face

Used when extruding to remember what the new face name will be, even after the adjacent face has
been removed/replaced/split/etc
---
 assetFactory/modelFactoryMesh.h | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'assetFactory/modelFactoryMesh.h')

diff --git a/assetFactory/modelFactoryMesh.h b/assetFactory/modelFactoryMesh.h
index a862dc1..8ac2edd 100644
--- a/assetFactory/modelFactoryMesh.h
+++ b/assetFactory/modelFactoryMesh.h
@@ -48,13 +48,17 @@ struct ModelFactoryMesh : public OpenMesh::PolyMesh_ArrayKernelT<ModelFactoryTra
 
 	OpenMesh::FPropHandleT<bool> smoothFaceProperty;
 	OpenMesh::FPropHandleT<std::string> nameFaceProperty;
+	OpenMesh::HPropHandleT<std::string> nameAdjFaceProperty;
 
 	template<typename... Vs>
 	std::pair<std::string, OpenMesh::FaceHandle>
 	add_namedFace(std::string name, Vs &&... vs)
 	{
 		const auto handle = add_face(std::forward<Vs>(vs)...);
-		property(nameFaceProperty, handle) = name;
-		return std::make_pair(name, handle);
+		configNamedFace(name, handle);
+		return {std::move(name), handle};
 	}
+
+private:
+	void configNamedFace(const std::string & name, OpenMesh::FaceHandle);
 };
-- 
cgit v1.2.3