summaryrefslogtreecommitdiff
path: root/gfx/models/mesh.cpp
diff options
context:
space:
mode:
authorDan Goodliffe <dan@randomdan.homeip.net>2023-04-13 02:13:20 +0100
committerDan Goodliffe <dan@randomdan.homeip.net>2023-04-13 02:13:20 +0100
commit259444e842ac4ec546948a8e828b62bec734f659 (patch)
tree5d4c31127951f307bccb6d89a73361ae41e09b57 /gfx/models/mesh.cpp
parentAdd TextureAtlas class as an extension of Texture (diff)
downloadilt-259444e842ac4ec546948a8e828b62bec734f659.tar.bz2
ilt-259444e842ac4ec546948a8e828b62bec734f659.tar.xz
ilt-259444e842ac4ec546948a8e828b62bec734f659.zip
Add material field to vertex and configure it in mesh
Diffstat (limited to 'gfx/models/mesh.cpp')
-rw-r--r--gfx/models/mesh.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/gfx/models/mesh.cpp b/gfx/models/mesh.cpp
index 3db1ad5..2719211 100644
--- a/gfx/models/mesh.cpp
+++ b/gfx/models/mesh.cpp
@@ -7,7 +7,8 @@
Mesh::Mesh(const std::span<const Vertex> vertices, const std::span<const unsigned int> indices, GLenum m) :
m_numIndices {static_cast<GLsizei>(indices.size())}, mode {m}
{
- VertexArrayObject<Vertex>::configure<&Vertex::pos, &Vertex::texCoord, &Vertex::normal, &Vertex::colour>(
+ VertexArrayObject<Vertex>::configure<&Vertex::pos, &Vertex::texCoord, &Vertex::normal, &Vertex::colour,
+ &Vertex::material>(
m_vertexArrayObject, m_vertexArrayBuffers[0], m_vertexArrayBuffers[1], vertices, indices);
}