From b0708f165601fad16aa59715dbe32796a6e7081e Mon Sep 17 00:00:00 2001 From: ladevieq Date: Tue, 6 Sep 2022 22:41:00 +0200 Subject: Setup for texture upload system --- include/mesh.hpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'include/mesh.hpp') diff --git a/include/mesh.hpp b/include/mesh.hpp index b95c2a8..9a30be6 100644 --- a/include/mesh.hpp +++ b/include/mesh.hpp @@ -20,7 +20,7 @@ class Mesh { uint32_t vertex_offset; uint32_t index_offset; size_t element_count; - uint32_t mat_id; + material& material; }; public: @@ -39,14 +39,14 @@ public: std::array attributes; uint32_t vertex_count = 0; uint32_t index_count = 0; - // material& mat; + // material& material; }; Mesh() = default; [[nodiscard]] mesh_instance instantiate () const; - void add_submesh(const submesh& submesh); + void add_submesh(const submesh& submesh, material& material); static inline uint32_t attribute_components(enum ATTRIBUTE_TYPE attribute_type) { switch(attribute_type) { -- cgit v1.3