diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2023-04-14 18:03:34 +0100 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2023-04-14 18:03:34 +0100 |
| commit | 5776a36b454fac04617313da011d7aa2b0e834d3 (patch) | |
| tree | 1eb96d07e9a17a51e5763f397fc003f762cd2e75 /gfx/models/mesh.cpp | |
| parent | Merge branch 'model-factory-textures' (diff) | |
| parent | Add an asset template and use it to define all the foliage assets in the plan... (diff) | |
| download | ilt-5776a36b454fac04617313da011d7aa2b0e834d3.tar.bz2 ilt-5776a36b454fac04617313da011d7aa2b0e834d3.tar.xz ilt-5776a36b454fac04617313da011d7aa2b0e834d3.zip | |
Merge branch 'assimp'
Diffstat (limited to 'gfx/models/mesh.cpp')
| -rw-r--r-- | gfx/models/mesh.cpp | 3 |
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);
}
|