diff options
author | Clyne Sullivan <tullivan99@gmail.com> | 2017-01-09 19:06:36 -0500 |
---|---|---|
committer | Clyne Sullivan <tullivan99@gmail.com> | 2017-01-09 19:06:36 -0500 |
commit | 0aae714d4d894a4bfa9582c71ee8a1778260a047 (patch) | |
tree | 0bdda17698baaa7cd3bd7325c6a310e917166e99 /main.cpp | |
parent | 9d7b4c9a40261b5b6b961f6ca6174fd23c40f6b8 (diff) |
ui menu cleanup
Diffstat (limited to 'main.cpp')
-rw-r--r-- | main.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
@@ -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<WorldSystem>()->render(); game::engine.getSystem<ParticleSystem>()->render(); |