Skip to content

Reproduced texture size issue (WebGPU) using Material Design Icons font + Dear Imgui's wchar32 feature/setting. #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Reproduced texture size issue (WebGPU) using Material Design Icons font + Dear Imgui's wchar32 feature/setting. #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e77e938
Reproduced texture size issue (WebGPU) using Material Design Icons fo…
andreamancuso Jun 3, 2024
13ac346
Setting icons_config.OversampleH = 1 - which does fix the texture siz…
andreamancuso Jun 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 26 additions & 24 deletions packages/dear-imgui/cpp/imguiview.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// #include "IconsMaterialDesignIcons.h"
#include "IconsFontAwesome6.h"
#include "IconsMaterialDesignIcons.h"
// #include "IconsFontAwesome6.h"
#include "imgui.h"
#include "imgui_impl_glfw.h"
#include "imgui_impl_wgpu.h"
Expand Down Expand Up @@ -38,11 +38,12 @@ class ImGuiView : public View {
m_imGuiCtx = ImGui::CreateContext();

ImGuiIO& io = ImGui::GetIO(); (void)io;
io.Fonts->TexDesiredWidth = 4096;

auto fontDefs = json::parse(rawFontDefs);

static const ImWchar icons_ranges[] = { ICON_MIN_FA, ICON_MAX_16_FA, 0 };
// static const ImWchar icons_ranges[] = { ICON_MIN_MDI, ICON_MAX_16_MDI, 0 };
// static const ImWchar icons_ranges[] = { ICON_MIN_FA, ICON_MAX_16_FA, 0 };
static const ImWchar icons_ranges[] = { ICON_MIN_MDI, ICON_MAX_MDI, 0 };



Expand Down Expand Up @@ -74,11 +75,12 @@ class ImGuiView : public View {
icons_config.MergeMode = true;
icons_config.PixelSnapH = true;
icons_config.GlyphMinAdvanceX = iconFontSize;
auto pathToFaFontFile = std::format("fonts/{}", FONT_ICON_FILE_NAME_FAS);
// auto pathToMdiFontFile = std::format("fonts/{}", FONT_ICON_FILE_NAME_MDI);
icons_config.OversampleH = 1;
// auto pathToFaFontFile = std::format("fonts/{}", FONT_ICON_FILE_NAME_FAS);
auto pathToMdiFontFile = std::format("fonts/{}", FONT_ICON_FILE_NAME_MDI);

io.Fonts->AddFontFromFileTTF(pathToFaFontFile.c_str(), iconFontSize, &icons_config, icons_ranges);
// io.Fonts->AddFontFromFileTTF(pathToMdiFontFile.c_str(), fontSize, &icons_config, icons_ranges);
// io.Fonts->AddFontFromFileTTF(pathToFaFontFile.c_str(), iconFontSize, &icons_config, icons_ranges);
io.Fonts->AddFontFromFileTTF(pathToMdiFontFile.c_str(), fontSize, &icons_config, icons_ranges);
}
}
}
Expand All @@ -102,25 +104,25 @@ class ImGuiView : public View {
}

// If not custom fonts defined, ensure font-awesome are still available
if (m_loadedFonts.size() == 0) {
io.Fonts->AddFontDefault();
float baseFontSize = 13.0f; // 13.0f is the size of the default font.
float iconFontSize = baseFontSize * 2.0f / 3.0f; // FontAwesome fonts need to have their sizes reduced by 2.0f/3.0f in order to align correctly

ImFontConfig icons_config;
icons_config.MergeMode = true;
icons_config.PixelSnapH = true;
icons_config.GlyphMinAdvanceX = iconFontSize;
auto pathToFaFontFile = std::format("fonts/{}", FONT_ICON_FILE_NAME_FAS);
// if (m_loadedFonts.size() == 0) {
// io.Fonts->AddFontDefault();
// float baseFontSize = 13.0f; // 13.0f is the size of the default font.
// float iconFontSize = baseFontSize * 2.0f / 3.0f; // FontAwesome fonts need to have their sizes reduced by 2.0f/3.0f in order to align correctly

// ImFontConfig icons_config;
// icons_config.MergeMode = true;
// icons_config.PixelSnapH = true;
// icons_config.GlyphMinAdvanceX = iconFontSize;
// auto pathToFaFontFile = std::format("fonts/{}", FONT_ICON_FILE_NAME_FAS);

m_loadedFonts.push_back(
io.Fonts->AddFontFromFileTTF(pathToFaFontFile.c_str(), iconFontSize, &icons_config, icons_ranges)
);
// m_loadedFonts.push_back(
// io.Fonts->AddFontFromFileTTF(pathToFaFontFile.c_str(), iconFontSize, &icons_config, icons_ranges)
// );

io.Fonts->Build();
// io.Fonts->Build();

SetFontDefault(0);
}
// SetFontDefault(0);
// }

ImVec4 v4 = ImVec4(0.45f, 0.55f, 0.60f, 1.00f);
m_clearColor = { v4.x * v4.w, v4.y * v4.w, v4.z * v4.w, v4.w };
Expand Down
3 changes: 2 additions & 1 deletion packages/dear-imgui/cpp/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
"features": [
"glfw-binding",
"opengl3-binding",
"wgpu-binding"
"wgpu-binding",
"wchar32"
]
},
"implot",
Expand Down
2 changes: 1 addition & 1 deletion packages/dear-imgui/ts/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,4 +103,4 @@
"yaml": "^2.4.3"
},
"packageManager": "[email protected]"
}
}
4 changes: 3 additions & 1 deletion packages/dear-imgui/ts/src/lib/components/ImGuiDemo/ImGuiDemo.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,12 @@ export const ImGuiDemo = () => {

const nonDefaultFontCombo = useMemo(() => ({ name: "roboto-regular", size: 24 }), []);

const icon = "\u{F0004}";

return (
<ReactImgui.Fragment>
<ReactImgui.UnformattedText
text={`dear imgui says hello! ${faIconMap["address-book"]} ${faIconMap["wine-bottle"]}`}
text={`dear imgui says hello! ${icon}`}
font={nonDefaultFontCombo}
color="ff0000"
/>
Expand Down