github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-14 02:27:21 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

No longer require game restart, but in exchange all differently sized fonts need to be preloaded

Browse source
This commit is contained in:
nclok1405 2025-06-20 16:18:12 +09:00
commit 6502b35951
2 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

19
soh/soh/OTRGlobals.cpp
View file

@ -346,6 +346,11 @@ void OTRGlobals::Initialize() {
auto overlay = context->GetInstance()->GetWindow()->GetGui()->GetGameOverlay();
overlay->LoadFont("Fipps", 32.0f, "fonts/Fipps-Regular.otf");
// Currently, differently sized fonts require preloading (reloading font at runtime crashes the game)
overlay->LoadFont("Press Start 2P", 12.0f, "fonts/PressStart2P-Regular.ttf");
overlay->LoadFont("Press Start 2P 24", 24.0f, "fonts/PressStart2P-Regular.ttf");
overlay->LoadFont("Press Start 2P 32", 32.0f, "fonts/PressStart2P-Regular.ttf");
overlay->LoadFont("Press Start 2P 40", 40.0f, "fonts/PressStart2P-Regular.ttf");
LoadOverlayTextFont();
context->InitAudio({ .SampleRate = 32000, .SampleLength = 1024, .DesiredBuffered = 1680 });
@ -513,27 +518,23 @@ void OTRGlobals::ScaleImGui() {
}
void OTRGlobals::LoadOverlayTextFont() {
// TODO: Currenty, reloading a font causes crash.
// TODO: Is Fipps font used in somewhere?
auto overlay = context->GetInstance()->GetWindow()->GetGui()->GetGameOverlay();
float fontSize;
switch (CVarGetInteger(CVAR_SETTING("OverlayTextScale"), 0)) {
case 0:
default:
fontSize = 12.0f;
overlay->SetCurrentFont("Press Start 2P");
break;
case 1:
fontSize = 24.0f;
overlay->SetCurrentFont("Press Start 2P 24");
break;
case 2:
fontSize = 32.0f;
overlay->SetCurrentFont("Press Start 2P 32");
break;
case 3:
fontSize = 40.0f;
overlay->SetCurrentFont("Press Start 2P 40");
break;
}
SPDLOG_DEBUG("Loading Overlay Text Font with size {}", fontSize);
overlay->LoadFont("Press Start 2P", fontSize, "fonts/PressStart2P-Regular.ttf");
overlay->SetCurrentFont(CVarGetString(CVAR_GAME_OVERLAY_FONT, "Press Start 2P"));
}
ImFont* OTRGlobals::CreateDefaultFontWithSize(float size) {

5
soh/soh/SohGui/SohMenuSettings.cpp
View file

@ -256,10 +256,11 @@ void SohMenu::AddMenuSettings() {
.RaceDisable(false)
.Options(ComboboxOptions()
.ComboMap(overlayTextScaleOptions)
.Tooltip("Changes the font size of Overlay Text.\n(REQUIRES RESTART)")
.Tooltip("Changes the font size of Overlay Text.")
.DefaultIndex(0)
.ComponentAlignment(ComponentAlignments::Right)
.LabelPosition(LabelPositions::Far));
.LabelPosition(LabelPositions::Far))
.Callback([](WidgetInfo& info) { OTRGlobals::Instance->LoadOverlayTextFont(); });
// General - About
path.column = SECTION_COLUMN_2;