From 8b11fd78f360157386af57e33b369c06b2a119ca Mon Sep 17 00:00:00 2001 From: kts Date: Fri, 13 Feb 2015 15:12:26 -0800 Subject: [PATCH] Re-added VAO code to mesh building, hopefully to no error. --- src/Mesh.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/Mesh.cpp b/src/Mesh.cpp index 5517b85..e910e8e 100644 --- a/src/Mesh.cpp +++ b/src/Mesh.cpp @@ -211,10 +211,15 @@ int Mesh::loadArrays(Vec3 *in_vertices, int v_count, Vec2 *in_uvs, int uv_count, int Mesh::buildMesh() { if (!(flags & MESH_LOADED)) return 1; if (flags & MESH_BUILT) destroyMesh(); + // generate our vertex array object + glGenVertexArrays(1, &vao); + glBindVertexArray(vao); // generate our vertex buffer object from our given points glGenBuffers(1, &vbo); glBindBuffer(GL_ARRAY_BUFFER, vbo); glBufferData(GL_ARRAY_BUFFER, vertices.size()*sizeof(Vec3), &vertices[0], mode); + // unbind vao to disallow external mucking + glBindVertexArray(0); flags |= MESH_BUILT; return 0; }