chenlin/Mujoco_WASM
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Only build fonts when using filament backend.

Browse Source 
PiperOrigin-RevId: 837054382
Change-Id: I7ef3b6b954738776f266533f4c48ac4e3c43b4bf
This commit is contained in:
Haroon Qureshi
2025-11-26 03:59:41 -08:00
committed by Copybara-Service
parent ae24034f24
commit ed69fe85f1
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/experimental/toolbox/window.cc
+12 -11
View File
@@ -36,10 +36,12 @@
namespace mujoco::toolbox { namespace mujoco::toolbox {
static void InitImGui(SDL_Window* window, const LoadAssetFn& load_asset_fn) { static void InitImGui(SDL_Window* window, const LoadAssetFn& load_asset_fn,
bool build_fonts) {
ImGui::CreateContext(); ImGui::CreateContext();
ImGuiIO& io = ImGui::GetIO(); ImGuiIO& io = ImGui::GetIO();
io.BackendFlags |= ImGuiBackendFlags_RendererHasTextures;
io.ConfigFlags |= ImGuiConfigFlags_DockingEnable; io.ConfigFlags |= ImGuiConfigFlags_DockingEnable;
io.IniFilename = nullptr; io.IniFilename = nullptr;
ImGui::StyleColorsDark(); ImGui::StyleColorsDark();
@@ -47,25 +49,24 @@ static void InitImGui(SDL_Window* window, const LoadAssetFn& load_asset_fn) {
#ifndef __EMSCRIPTEN__ #ifndef __EMSCRIPTEN__
// TODO: Get font loading working for wasm. // TODO: Get font loading working for wasm.
// Note: fonts are stored statically because they aren't actually loaded
// until the fonts are built.
ImFontConfig main_cfg; ImFontConfig main_cfg;
main_cfg.OversampleH = 8; static auto main_font = load_asset_fn("OpenSans-Regular.ttf");
main_cfg.OversampleV = 4;
main_cfg.GlyphExtraAdvanceX = 0.3f;
auto main_font = load_asset_fn("OpenSans-Regular.ttf");
io.Fonts->AddFontFromMemoryTTF(main_font.data(), main_font.size(), 20.f, io.Fonts->AddFontFromMemoryTTF(main_font.data(), main_font.size(), 20.f,
&main_cfg); &main_cfg);
ImFontConfig icon_cfg; ImFontConfig icon_cfg;
icon_cfg.OversampleH = 3;
icon_cfg.OversampleV = 3;
icon_cfg.MergeMode = true; icon_cfg.MergeMode = true;
icon_cfg.GlyphMinAdvanceX = 14.0f; static auto icon_font = load_asset_fn("fontawesome-webfont.ttf");
auto icon_font = load_asset_fn("fontawesome-webfont.ttf");
constexpr ImWchar icon_ranges[] = {0xf000, 0xf3ff, 0x000}; constexpr ImWchar icon_ranges[] = {0xf000, 0xf3ff, 0x000};
io.Fonts->AddFontFromMemoryTTF(icon_font.data(), icon_font.size(), 14.f, io.Fonts->AddFontFromMemoryTTF(icon_font.data(), icon_font.size(), 14.f,
&icon_cfg, icon_ranges); &icon_cfg, icon_ranges);
#endif #endif
io.Fonts->Build();
if (build_fonts) {
io.Fonts->Build();
}
} }
Window::Window(std::string_view title, int width, int height, Config config, Window::Window(std::string_view title, int width, int height, Config config,
@@ -109,7 +110,7 @@ Window::Window(std::string_view title, int width, int height, Config config,
mju_error("Error creating window: %s", SDL_GetError()); mju_error("Error creating window: %s", SDL_GetError());
} }
InitImGui(sdl_window_, load_asset_fn); InitImGui(sdl_window_, load_asset_fn, (render_config != kClassicOpenGL));
if (render_config == kFilamentWebGL || render_config == kClassicOpenGL) { if (render_config == kFilamentWebGL || render_config == kClassicOpenGL) {
SDL_GLContext gl_context = SDL_GL_CreateContext(sdl_window_); SDL_GLContext gl_context = SDL_GL_CreateContext(sdl_window_);