mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-12-23 00:28:51 -05:00
Code Issues Projects Releases Wiki Activity

ADD: Color for the bottom text

Browse Source
This commit is contained in:
PurpleHato 2022-06-13 18:15:26 +02:00 committed by Nicholas Estelami
parent f7bcbe3049
commit 8d4b15325a
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libultraship/libultraship/SohImGuiImpl.cpp
View File

@ -77,6 +77,7 @@ namespace SohImGui {
ImVec4 rupee_colors; ImVec4 rupee_colors;
ImVec4 smolekey_colors; ImVec4 smolekey_colors;
ImVec4 fileselect_colors; ImVec4 fileselect_colors;
ImVec4 fileselect_text_colors;
ImVec4 kokiri_col; ImVec4 kokiri_col;
ImVec4 goron_col; ImVec4 goron_col;
ImVec4 zora_col; ImVec4 zora_col;
@ -96,7 +97,7 @@ namespace SohImGui {
"gCCABtnPrim","gCCBBtnPrim","gCCCBtnPrim","gCCStartBtnPrim", "gCCABtnPrim","gCCBBtnPrim","gCCCBtnPrim","gCCStartBtnPrim",
"gCCMagicBorderPrim","gCCMagicPrim","gCCMagicUsePrim", "gCCMagicBorderPrim","gCCMagicPrim","gCCMagicUsePrim",
"gCCMinimapPrim","gCCRupeePrim","gCCKeysPrim", "gCCMinimapPrim","gCCRupeePrim","gCCKeysPrim",
"gCCFileChoosePrim" "gCCFileChoosePrim", "gCCFileChooseTextPrim"
}; };
const char* filters[3] = { const char* filters[3] = {
@ -1273,6 +1274,8 @@ namespace SohImGui {
EnhancementColor("File Choose color", "gCCFileChoosePrim", fileselect_colors, ImVec4(100, 150, 255, 255)); EnhancementColor("File Choose color", "gCCFileChoosePrim", fileselect_colors, ImVec4(100, 150, 255, 255));
Tooltip("Affect the File Select."); Tooltip("Affect the File Select.");
ImGui::Separator(); ImGui::Separator();
EnhancementColor("Bottom text color", "gCCFileChooseTextPrim", fileselect_text_colors, ImVec4(0, 100, 255, 255));
Tooltip("Affect the File Select.");
ImGui::EndTabItem(); ImGui::EndTabItem();
} }
ImGui::EndTabBar(); ImGui::EndTabBar();

9
soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c
View File

@ -1768,7 +1768,14 @@ void FileChoose_Main(GameState* thisx) {
gDPSetCombineLERP(POLY_OPA_DISP++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0, gDPSetCombineLERP(POLY_OPA_DISP++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0,
PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0); PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0);
gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 100, 255, 255, this->controlsAlpha);
if (CVar_GetS32("gHudColors", 1) == 2) {
gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, CVar_GetS32("gCCFileChooseTextPrimR", 0),
CVar_GetS32("gCCFileChooseTextPrimG", 100), CVar_GetS32("gCCFileChooseTextPrimB", 255),
this->controlsAlpha);
} else {
gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 100, 255, 255, this->controlsAlpha);
}
gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 0, 0); gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 0, 0);
gDPLoadTextureBlock(POLY_OPA_DISP++, controlsTextures[gSaveContext.language], G_IM_FMT_IA, G_IM_SIZ_8b, 144, 16, gDPLoadTextureBlock(POLY_OPA_DISP++, controlsTextures[gSaveContext.language], G_IM_FMT_IA, G_IM_SIZ_8b, 144, 16,
0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK,