X-Git-Url: https://eleni.mutantstargoat.com/git/?p=demo;a=blobdiff_plain;f=src%2Fopengl%2Fmesh-gl.cc;h=6175aae985586d626c5ae4c5c5893879332a53fc;hp=dd73bf386f8d1d13e31df73a8680da236ac20fbb;hb=1e8963fc3f8191e328bbecd04cfbcba31d7d0bdf;hpb=73b9db25a6deff93da45f3c45290ca8a56fefed3 diff --git a/src/opengl/mesh-gl.cc b/src/opengl/mesh-gl.cc index dd73bf3..6175aae 100644 --- a/src/opengl/mesh-gl.cc +++ b/src/opengl/mesh-gl.cc @@ -74,7 +74,7 @@ MeshGL::~MeshGL() void MeshGL::draw() const { if(!vdata_valid) { - ((MeshGL*)this)->update_vertex_data(); + ((MeshGL *)this)->update_vertex_data(); } glBindVertexArray(vao); @@ -93,12 +93,11 @@ void MeshGL::draw_normals(float scale) const glGenBuffers(1, &nvbo); glBindBuffer(GL_ARRAY_BUFFER, nvbo); - + glBufferData(GL_ARRAY_BUFFER, normals.size() * sizeof(Vec3) * 2, 0, GL_STATIC_DRAW); Vec3 *data = (Vec3 *)glMapBuffer(GL_ARRAY_BUFFER, GL_WRITE_ONLY); - for (size_t i = 0; i < normals.size(); i++) - { + for(size_t i = 0; i < normals.size(); i++) { *data++ = vertices[i]; *data++ = vertices[i] + normals[i] * scale; } @@ -107,7 +106,8 @@ void MeshGL::draw_normals(float scale) const glVertexAttribPointer(MESH_VERTEX, 3, GL_FLOAT, GL_FALSE, sizeof(Vec3), 0); glEnableVertexAttribArray(MESH_VERTEX); glBindBuffer(GL_ARRAY_BUFFER, 0); - } else { + } + else { glBindVertexArray(nvao); } @@ -204,7 +204,7 @@ void MeshGL::destroy_vbo() glDeleteBuffers(1, &vbo_tex_coords); if(ibo) glDeleteBuffers(1, &ibo); - if (vao) + if(vao) glDeleteVertexArrays(1, &vao); if(nvbo)