mirror of https://github.com/sm64pc/sm64pc.git
Readded default font & removed useless log
This commit is contained in:
parent
84fca27f6a
commit
52acb4fadd
|
@ -131,14 +131,13 @@ namespace MoonInternal {
|
|||
ImGuiIO& io = ImGui::GetIO();
|
||||
// for (auto entry = Moon::fonts.begin(); entry != Moon::fonts.end(); entry++){
|
||||
// if(entry->first == FONT_ICON_FILE_NAME_FK) continue;
|
||||
//
|
||||
// ImFontConfig font_cfg;
|
||||
// ImFont* tmp = io.Fonts->AddFontFromMemoryTTF((void*) entry->second->data, entry->second->size, 18.f, &font_cfg);
|
||||
// cout << "Loading font: " << entry->first << endl;
|
||||
// fontMap[entry->first] = tmp;
|
||||
// }
|
||||
//
|
||||
// io.FontDefault = fontMap["monogram.ttf"];
|
||||
|
||||
io.FontDefault = fontMap["monogram.ttf"];
|
||||
|
||||
// Setup Material Design Icons
|
||||
static const ImWchar icons_ranges[] = { ICON_MIN_MD, ICON_MAX_MD, 0 };
|
||||
|
|
|
@ -515,8 +515,6 @@ static void gfx_opengl_shader_get_info(struct ShaderProgram *prg, uint8_t *num_i
|
|||
static GLuint gfx_opengl_new_texture(void) {
|
||||
GLuint texture_id;
|
||||
glGenTextures(1, &texture_id);
|
||||
|
||||
cout << texture_id << endl;
|
||||
texture_map[texture_id] = new GLTexture();
|
||||
return texture_id;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue