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

Add an option to use Fipps as overlay font.

Browse source 
(Previously, this font was accesible only by manually editing "gSettings.OverlayFont" setting)
This commit is contained in:
nclok1405 2025-06-20 16:42:08 +09:00
commit 3db4d55676
2 changed files with 54 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

53
soh/soh/OTRGlobals.cpp
View file

@ -345,12 +345,15 @@ void OTRGlobals::Initialize() {
context->InitWindow(sohFast3dWindow);
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");
overlay->LoadFont("Press Start 2P Normal", 24.0f, "fonts/PressStart2P-Regular.ttf");
overlay->LoadFont("Press Start 2P Large", 32.0f, "fonts/PressStart2P-Regular.ttf");
overlay->LoadFont("Press Start 2P X-Large", 40.0f, "fonts/PressStart2P-Regular.ttf");
overlay->LoadFont("Fipps", 24.0f, "fonts/Fipps-Regular.otf");
overlay->LoadFont("Fipps Normal", 32.0f, "fonts/Fipps-Regular.otf");
overlay->LoadFont("Fipps Large", 40.0f, "fonts/Fipps-Regular.otf");
overlay->LoadFont("Fipps X-Large", 48.0f, "fonts/Fipps-Regular.otf");
LoadOverlayTextFont();
context->InitAudio({ .SampleRate = 32000, .SampleLength = 1024, .DesiredBuffered = 1680 });
@ -518,21 +521,43 @@ void OTRGlobals::ScaleImGui() {
}
void OTRGlobals::LoadOverlayTextFont() {
// TODO: Is Fipps font used in somewhere?
auto overlay = context->GetInstance()->GetWindow()->GetGui()->GetGameOverlay();
switch (CVarGetInteger(CVAR_SETTING("OverlayTextScale"), 0)) {
switch (CVarGetInteger(CVAR_SETTING("OverlayTextFont"), 0)) {
case 0:
default:
overlay->SetCurrentFont("Press Start 2P");
switch (CVarGetInteger(CVAR_SETTING("OverlayTextScale"), 0)) {
case 0:
default:
overlay->SetCurrentFont("Press Start 2P");
break;
case 1:
overlay->SetCurrentFont("Press Start 2P Normal");
break;
case 2:
overlay->SetCurrentFont("Press Start 2P Large");
break;
case 3:
overlay->SetCurrentFont("Press Start 2P X-Large");
break;
}
break;
case 1:
overlay->SetCurrentFont("Press Start 2P 24");
break;
case 2:
overlay->SetCurrentFont("Press Start 2P 32");
break;
case 3:
overlay->SetCurrentFont("Press Start 2P 40");
switch (CVarGetInteger(CVAR_SETTING("OverlayTextScale"), 0)) {
case 0:
default:
overlay->SetCurrentFont("Fipps");
break;
case 1:
overlay->SetCurrentFont("Fipps Normal");
break;
case 2:
overlay->SetCurrentFont("Fipps Large");
break;
case 3:
overlay->SetCurrentFont("Fipps X-Large");
break;
}
break;
}
}

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

@ -63,6 +63,11 @@ static std::unordered_map<int32_t, const char*> overlayTextScaleOptions = {
{ 3, "X-Large" },
};
static std::unordered_map<int32_t, const char*> overlayTextFontOptions = {
{ 0, "Press Start 2P" },
{ 1, "Fipps" },
};
const char* GetGameVersionString(uint32_t index) {
uint32_t gameVersion = ResourceMgr_GetGameVersion(index);
switch (gameVersion) {
@ -261,6 +266,16 @@ void SohMenu::AddMenuSettings() {
.ComponentAlignment(ComponentAlignments::Right)
.LabelPosition(LabelPositions::Far))
.Callback([](WidgetInfo& info) { OTRGlobals::Instance->LoadOverlayTextFont(); });
AddWidget(path, "Overlay Text Font", WIDGET_CVAR_COMBOBOX)
.CVar(CVAR_SETTING("OverlayTextFont"))
.RaceDisable(false)
.Options(ComboboxOptions()
.ComboMap(overlayTextFontOptions)
.Tooltip("Changes the font of Overlay Text.")
.DefaultIndex(0)
.ComponentAlignment(ComponentAlignments::Right)
.LabelPosition(LabelPositions::Far))
.Callback([](WidgetInfo& info) { OTRGlobals::Instance->LoadOverlayTextFont(); });
// General - About
path.column = SECTION_COLUMN_2;