vrmiguel
/
sm64pc
mirror of https://github.com/sm64pc/sm64pc.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Readded default font & removed useless log

This commit is contained in:
KiritoDv 2021-08-23 01:00:06 -05:00
parent 84fca27f6a
commit 52acb4fadd
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/moon/imgui/imgui_impl.cpp
View File

@ -131,14 +131,13 @@ namespace MoonInternal {
ImGuiIO& io = ImGui::GetIO(); ImGuiIO& io = ImGui::GetIO();
// for (auto entry = Moon::fonts.begin(); entry != Moon::fonts.end(); entry++){ // for (auto entry = Moon::fonts.begin(); entry != Moon::fonts.end(); entry++){
// if(entry->first == FONT_ICON_FILE_NAME_FK) continue; // if(entry->first == FONT_ICON_FILE_NAME_FK) continue;
//
// ImFontConfig font_cfg; // ImFontConfig font_cfg;
// ImFont* tmp = io.Fonts->AddFontFromMemoryTTF((void*) entry->second->data, entry->second->size, 18.f, &font_cfg); // ImFont* tmp = io.Fonts->AddFontFromMemoryTTF((void*) entry->second->data, entry->second->size, 18.f, &font_cfg);
// cout << "Loading font: " << entry->first << endl; // cout << "Loading font: " << entry->first << endl;
// fontMap[entry->first] = tmp; // fontMap[entry->first] = tmp;
// } // }
//
// io.FontDefault = fontMap["monogram.ttf"]; io.FontDefault = fontMap["monogram.ttf"];
// Setup Material Design Icons // Setup Material Design Icons
static const ImWchar icons_ranges[] = { ICON_MIN_MD, ICON_MAX_MD, 0 }; static const ImWchar icons_ranges[] = { ICON_MIN_MD, ICON_MAX_MD, 0 };

2
src/pc/gfx/gfx_opengl.cpp
View File

@ -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) { static GLuint gfx_opengl_new_texture(void) {
GLuint texture_id; GLuint texture_id;
glGenTextures(1, &texture_id); glGenTextures(1, &texture_id);
cout << texture_id << endl;
texture_map[texture_id] = new GLTexture(); texture_map[texture_id] = new GLTexture();
return texture_id; return texture_id;
} }