load fonts from conf and merge
Some checks failed
ContinuousDelivery / windows (push) Waiting to run
ContinuousDelivery / windows-asan (push) Waiting to run
ContinuousDelivery / release (push) Blocked by required conditions
ContinuousIntegration / macos (push) Waiting to run
ContinuousIntegration / windows (push) Waiting to run
ContinuousDelivery / linux-ubuntu (push) Failing after 13m18s
ContinuousDelivery / android (map[ndk_abi:arm64-v8a vcpkg_toolkit:arm64-android]) (push) Failing after 5m25s
ContinuousDelivery / android (map[ndk_abi:x86_64 vcpkg_toolkit:x64-android]) (push) Failing after 5m37s
ContinuousIntegration / linux (push) Successful in 4m0s
ContinuousIntegration / android (map[ndk_abi:arm64-v8a vcpkg_toolkit:arm64-android]) (push) Failing after 5m13s
ContinuousIntegration / android (map[ndk_abi:x86_64 vcpkg_toolkit:x64-android]) (push) Failing after 5m16s
Some checks failed
ContinuousDelivery / windows (push) Waiting to run
ContinuousDelivery / windows-asan (push) Waiting to run
ContinuousDelivery / release (push) Blocked by required conditions
ContinuousIntegration / macos (push) Waiting to run
ContinuousIntegration / windows (push) Waiting to run
ContinuousDelivery / linux-ubuntu (push) Failing after 13m18s
ContinuousDelivery / android (map[ndk_abi:arm64-v8a vcpkg_toolkit:arm64-android]) (push) Failing after 5m25s
ContinuousDelivery / android (map[ndk_abi:x86_64 vcpkg_toolkit:x64-android]) (push) Failing after 5m37s
ContinuousIntegration / linux (push) Successful in 4m0s
ContinuousIntegration / android (map[ndk_abi:arm64-v8a vcpkg_toolkit:arm64-android]) (push) Failing after 5m13s
ContinuousIntegration / android (map[ndk_abi:x86_64 vcpkg_toolkit:x64-android]) (push) Failing after 5m16s
This commit is contained in:
56
src/main.cpp
56
src/main.cpp
@ -93,62 +93,6 @@ int main(int argc, char** argv) {
|
||||
theme = getDefaultThemeDark();
|
||||
}
|
||||
|
||||
{
|
||||
auto* font_atlas = ImGui::GetIO().Fonts;
|
||||
font_atlas->ClearFonts();
|
||||
{
|
||||
ImFontConfig fontcfg;
|
||||
|
||||
// upsampling to int looks almost ok
|
||||
const float font_size_scale = 1.3f * display_scale;
|
||||
const float font_oversample = 4.f;
|
||||
|
||||
// default font is pixel perfect at 13
|
||||
fontcfg.SizePixels = 13.f * font_size_scale;
|
||||
fontcfg.RasterizerDensity = font_oversample/font_size_scale;
|
||||
// normally density would be set to dpi scale of the display
|
||||
|
||||
font_atlas->AddFontDefault(&fontcfg);
|
||||
}
|
||||
if constexpr (false) {
|
||||
ImFontConfig fontcfg;
|
||||
//fontcfg.SizePixels = 16.f;
|
||||
fontcfg.RasterizerDensity = 1.f;
|
||||
fontcfg.OversampleH = 1;
|
||||
fontcfg.OversampleV = 1;
|
||||
fontcfg.PixelSnapH = true;
|
||||
|
||||
//ImFontGlyphRangesBuilder glyphbld;
|
||||
//glyphbld.AddRanges(font_atlas->GetGlyphRangesDefault());
|
||||
//glyphbld.AddRanges(font_atlas->GetGlyphRangesGreek());
|
||||
//glyphbld.AddRanges(font_atlas->GetGlyphRangesCyrillic());
|
||||
//glyphbld.AddRanges(font_atlas->GetGlyphRangesChineseSimplifiedCommon());
|
||||
|
||||
font_atlas->AddFontFromFileTTF(
|
||||
"/nix/store/7fjwhgbz16i08xm171arr081bqpivv7k-hack-font-3.003/share/fonts/truetype/Hack-Regular.ttf",
|
||||
20.f*display_scale,
|
||||
&fontcfg,
|
||||
font_atlas->GetGlyphRangesGreek()
|
||||
);
|
||||
|
||||
fontcfg.MergeMode = true;
|
||||
|
||||
font_atlas->AddFontFromFileTTF(
|
||||
"/nix/store/7fjwhgbz16i08xm171arr081bqpivv7k-hack-font-3.003/share/fonts/truetype/Hack-Regular.ttf",
|
||||
20.f*display_scale,
|
||||
&fontcfg,
|
||||
font_atlas->GetGlyphRangesCyrillic()
|
||||
);
|
||||
|
||||
font_atlas->AddFontFromFileTTF(
|
||||
"/nix/store/7fjwhgbz16i08xm171arr081bqpivv7k-hack-font-3.003/share/fonts/truetype/Hack-Regular.ttf",
|
||||
20.f*display_scale,
|
||||
&fontcfg,
|
||||
font_atlas->GetGlyphRangesChineseSimplifiedCommon()
|
||||
);
|
||||
}
|
||||
font_atlas->Build();
|
||||
}
|
||||
|
||||
ImGui_ImplSDL3_InitForSDLRenderer(window.get(), renderer.get());
|
||||
ImGui_ImplSDLRenderer3_Init(renderer.get());
|
||||
|
Reference in New Issue
Block a user