From e85db91c6b6a326e3339020bc434063db6c957f9 Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Sat, 20 Feb 2021 15:12:25 +0000 Subject: Fix test-obj by splitting mesh processing Don't invoke GL parts from test code --- gfx/models/obj.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gfx/models/obj.h') diff --git a/gfx/models/obj.h b/gfx/models/obj.h index 2921e34..71733fe 100644 --- a/gfx/models/obj.h +++ b/gfx/models/obj.h @@ -12,6 +12,7 @@ #include class Mesh; +class Vertex; class ObjParser : yyFlexLexer { public: @@ -38,6 +39,8 @@ public: std::vector objects; glm::length_t axis {0}; + using NamedMeshData = std::pair, std::vector>>; + [[nodiscard]] std::vector createMeshData() const; using NamedMesh = std::pair>; [[nodiscard]] std::vector createMeshes() const; }; -- cgit v1.2.3