diff options
| author | ladevieq <ladevie.quentin@gmail.com> | 2022-09-06 22:41:00 +0200 |
|---|---|---|
| committer | ladevieq <ladevie.quentin@gmail.com> | 2022-09-06 22:41:00 +0200 |
| commit | b0708f165601fad16aa59715dbe32796a6e7081e (patch) | |
| tree | 7741e0fd5e180905618d27ac4003c74633b96a13 /include/mesh.hpp | |
| parent | 24b02adbf6189025c00d62417fb4b49346f22c98 (diff) | |
Setup for texture upload system
Diffstat (limited to 'include/mesh.hpp')
| -rw-r--r-- | include/mesh.hpp | 6 |
1 files changed, 3 insertions, 3 deletions
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<attribute, ATTRIBUTE_TYPE::MAX_ATTRIBUTE> 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) { |