diff options
Diffstat (limited to 'gfx/models/mesh.cpp')
| -rw-r--r-- | gfx/models/mesh.cpp | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/gfx/models/mesh.cpp b/gfx/models/mesh.cpp index a1ce991..1f4dc09 100644 --- a/gfx/models/mesh.cpp +++ b/gfx/models/mesh.cpp @@ -1,28 +1,12 @@ #include "mesh.h" -#include "gfx/gl/vertexArrayObject.h" #include "glArrays.h" #include "vertex.h" #include <cstddef> -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::data(vertices, m_vertexArrayBuffers[0], GL_ARRAY_BUFFER); - VertexArrayObject::data(indices, m_vertexArrayBuffers[1], GL_ARRAY_BUFFER); - configureVAO(m_vertexArrayObject); -} - -VertexArrayObject & -Mesh::configureVAO(VertexArrayObject && vao) const -{ - return vao - .addAttribs<Vertex, &Vertex::pos, &Vertex::texCoord, &Vertex::normal, &Vertex::colour, &Vertex::material>( - m_vertexArrayBuffers[0]) - .addIndices(m_vertexArrayBuffers[1]); -} +MeshBase::MeshBase(GLsizei m_numIndices, GLenum mode) : m_numIndices {m_numIndices}, mode {mode} { } void -Mesh::Draw() const +MeshBase::Draw() const { glBindVertexArray(m_vertexArrayObject); @@ -32,7 +16,7 @@ Mesh::Draw() const } void -Mesh::DrawInstanced(GLuint vao, GLsizei count) const +MeshBase::DrawInstanced(GLuint vao, GLsizei count) const { glBindVertexArray(vao); |