From acc262b019206d09ce0d297f7b185862fe432601 Mon Sep 17 00:00:00 2001 From: sanine-a Date: Sun, 25 Oct 2020 19:37:42 -0500 Subject: remove model/* and add shader bindings --- src/mesh/mesh.c | 4 ++-- src/mesh/mesh.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/mesh') diff --git a/src/mesh/mesh.c b/src/mesh/mesh.c index 231fcc9..99210eb 100644 --- a/src/mesh/mesh.c +++ b/src/mesh/mesh.c @@ -66,8 +66,8 @@ honey_result honey_mesh_new(honey_mesh* mesh, /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ -void honey_mesh_draw(honey_mesh mesh, honey_shader shader) { - honey_shader_use(shader); +void honey_mesh_draw(honey_mesh mesh, int shader) { + glUseProgram(shader); glBindVertexArray(mesh.vertex_array); glDrawElements(GL_TRIANGLES, mesh.n_indices, GL_UNSIGNED_INT, 0); diff --git a/src/mesh/mesh.h b/src/mesh/mesh.h index a3e1e2a..6392faa 100644 --- a/src/mesh/mesh.h +++ b/src/mesh/mesh.h @@ -46,7 +46,7 @@ honey_result honey_mesh_new(honey_mesh* mesh, * @param[in] shader The shader to use when drawing the mesh */ void honey_mesh_draw(honey_mesh mesh, - honey_shader shader); + int shader); /** @brief Delete a mesh. * -- cgit v1.2.1