From 605db8cd3778bd2f58a956a0776c1001d7286def Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Sun, 21 Feb 2021 16:43:56 +0000
Subject: Named model parts, fix bogie spelling, new brush47 model

---
 gfx/models/obj.h | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'gfx/models/obj.h')

diff --git a/gfx/models/obj.h b/gfx/models/obj.h
index 71733fe..a2d874f 100644
--- a/gfx/models/obj.h
+++ b/gfx/models/obj.h
@@ -8,6 +8,7 @@
 #include <filesystem>
 #include <fstream>
 #include <glm/glm.hpp>
+#include <map>
 #include <memory>
 #include <vector>
 
@@ -39,10 +40,10 @@ public:
 	std::vector<Object> objects;
 	glm::length_t axis {0};
 
-	using NamedMeshData = std::pair<std::string, std::pair<std::vector<Vertex>, std::vector<unsigned int>>>;
-	[[nodiscard]] std::vector<NamedMeshData> createMeshData() const;
-	using NamedMesh = std::pair<std::string, std::shared_ptr<const Mesh>>;
-	[[nodiscard]] std::vector<NamedMesh> createMeshes() const;
+	using NamedMeshesData = std::map<std::string, std::pair<std::vector<Vertex>, std::vector<unsigned int>>>;
+	[[nodiscard]] NamedMeshesData createMeshData() const;
+	using NamedMeshes = std::map<std::string, std::shared_ptr<const Mesh>>;
+	[[nodiscard]] NamedMeshes createMeshes() const;
 };
 
 #endif
-- 
cgit v1.2.3