Skip to content
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

Tweak font oversample and size for high DPI / large texture atlases #955

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Tweak font oversample and size for high DPI / large texture atlases #955

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 12 additions & 11 deletions src/StudioCore/MapStudioNew.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,15 +183,16 @@ private unsafe void SetupFonts()
Marshal.Copy(fontIcon, 0, fontIconNative, fontIcon.Length);
ImFontAtlasClear(fonts);

var scale = GetUIScale();
var scaleFine = (float)Math.Round(14.0f * GetUIScale());
var scaleLarge = (float)Math.Round(16.0f * GetUIScale());

// English fonts
{
ImFontConfig* cfg = ImFontConfigImFontConfig();
cfg->GlyphMinAdvanceX = 5.0f;
cfg->OversampleH = 5;
cfg->OversampleV = 5;
ImFontAtlasAddFontFromMemoryTTF(fonts, fontEnNative.ToPointer(), fontEn.Length, (float)Math.Round(14.0f * scale), cfg,
cfg->OversampleH = 3;
cfg->OversampleV = 2;
ImFontAtlasAddFontFromMemoryTTF(fonts, fontEnNative.ToPointer(), fontEn.Length, scaleFine, cfg,
ImFontAtlasGetGlyphRangesDefault(fonts));
}

Expand All @@ -200,8 +201,8 @@ private unsafe void SetupFonts()
ImFontConfig* cfg = ImFontConfigImFontConfig();
cfg->MergeMode = true;
cfg->GlyphMinAdvanceX = 7.0f;
cfg->OversampleH = 5;
cfg->OversampleV = 5;
cfg->OversampleH = 2;
cfg->OversampleV = 2;

ImFontGlyphRangesBuilder* glyphRanges = ImFontGlyphRangesBuilderImFontGlyphRangesBuilder();
ImFontGlyphRangesBuilderAddRanges(glyphRanges, ImFontAtlasGetGlyphRangesJapanese(fonts));
Expand Down Expand Up @@ -237,7 +238,7 @@ private unsafe void SetupFonts()

ImVectorImWchar glyphRange;
ImFontGlyphRangesBuilderBuildRanges(glyphRanges, &glyphRange);
ImFontAtlasAddFontFromMemoryTTF(fonts, fontOtherNative.ToPointer(), fontOther.Length, 16.0f * scale, cfg, glyphRange.Data);
ImFontAtlasAddFontFromMemoryTTF(fonts, fontOtherNative.ToPointer(), fontOther.Length, scaleLarge, cfg, glyphRange.Data);
ImFontGlyphRangesBuilderDestroy(glyphRanges);
}

Expand All @@ -247,12 +248,12 @@ private unsafe void SetupFonts()
ImFontConfig* cfg = ImFontConfigImFontConfig();
cfg->MergeMode = true;
cfg->GlyphMinAdvanceX = 12.0f;
cfg->OversampleH = 5;
cfg->OversampleV = 5;
cfg->OversampleH = 3;
cfg->OversampleV = 3;

fixed (ushort* r = ranges)
{
ImFontAtlasAddFontFromMemoryTTF(fonts, fontIconNative.ToPointer(), fontIcon.Length, 16.0f * scale, cfg, r);
ImFontAtlasAddFontFromMemoryTTF(fonts, fontIconNative.ToPointer(), fontIcon.Length, scaleLarge, cfg, r);
}
}

Expand Down Expand Up @@ -1417,7 +1418,7 @@ private static unsafe void UpdateDpi()
{
var window = _context.Window.SdlWindowHandle;
int index = SdlProvider.SDL.Value.GetWindowDisplayIndex(window);
float ddpi = 96f;
float ddpi = DefaultDpi;
float _ = 0f;
SdlProvider.SDL.Value.GetDisplayDPI(index, ref ddpi, ref _, ref _);

Expand Down
Loading