diff options
Diffstat (limited to 'src/ui.cpp')
-rw-r--r-- | src/ui.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -238,7 +238,7 @@ namespace ui { void setFontSize(unsigned int size) { (void)size; - /*if (size == 16) { + if (size == 16) { if (!ft16loaded) { loadFontSize(fontSize = size, ftex16, ftdat16); ft16loaded = true; @@ -254,7 +254,7 @@ namespace ui { ftex = &ftex24; ftdat = &ftdat24; fontSize = 24; - }*/ + } } /* @@ -303,9 +303,11 @@ namespace ui { * Draw the character: */ + glActiveTexture(GL_TEXTURE0); glBindTexture(GL_TEXTURE_2D,(*ftex)[c-33]); glUniform1i(Render::textShader.uniform[WU_texture], 0); + glUniform4f(Render::textShader.uniform[WU_tex_color], 1.0f, 1.0f, 1.0f, 1.0f); //glDisable(GL_DEPTH_TEST); |