diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2021-02-21 16:43:56 +0000 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2021-02-21 16:48:04 +0000 |
| commit | 605db8cd3778bd2f58a956a0776c1001d7286def (patch) | |
| tree | f7cad28fb8480cf6b7f11353907c4fed9856f04c /gfx/models/obj.h | |
| parent | fix.arc (diff) | |
| download | ilt-605db8cd3778bd2f58a956a0776c1001d7286def.tar.bz2 ilt-605db8cd3778bd2f58a956a0776c1001d7286def.tar.xz ilt-605db8cd3778bd2f58a956a0776c1001d7286def.zip | |
Named model parts, fix bogie spelling, new brush47 model
Diffstat (limited to 'gfx/models/obj.h')
| -rw-r--r-- | gfx/models/obj.h | 9 |
1 files changed, 5 insertions, 4 deletions
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 |