From 0aae714d4d894a4bfa9582c71ee8a1778260a047 Mon Sep 17 00:00:00 2001 From: Clyne Sullivan Date: Mon, 9 Jan 2017 19:06:36 -0500 Subject: ui menu cleanup --- main.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'main.cpp') diff --git a/main.cpp b/main.cpp index d2ae419..a9ccac8 100644 --- a/main.cpp +++ b/main.cpp @@ -304,15 +304,17 @@ void render() { // TODO add depth glEnable(GL_DEPTH_TEST); - Render::textShader.use(); - glUniformMatrix4fv(Render::textShader.uniform[WU_transform], 1, GL_FALSE, glm::value_ptr(ortho)); - glUniform4f(Render::textShader.uniform[WU_tex_color], 1.0, 1.0, 1.0, 1.0); - Render::textShader.unuse(); + Render::worldShader.use(); glUniformMatrix4fv(Render::worldShader.uniform[WU_ortho], 1, GL_FALSE, glm::value_ptr(ortho)); glUniformMatrix4fv(Render::worldShader.uniform[WU_transform], 1, GL_FALSE, glm::value_ptr(glm::mat4(1.0f))); Render::worldShader.unuse(); + Render::textShader.use(); + glUniformMatrix4fv(Render::textShader.uniform[WU_transform], 1, GL_FALSE, glm::value_ptr(ortho)); + glUniform4f(Render::textShader.uniform[WU_tex_color], 1.0, 1.0, 1.0, 1.0); + Render::textShader.unuse(); + // draw the world and player game::engine.getSystem()->render(); game::engine.getSystem()->render(); -- cgit v1.2.3