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

TWEAK: Forgot to push the sohimgui

Browse Source
This commit is contained in:
PurpleHato 2022-06-11 05:38:10 +02:00 committed by Nicholas Estelami
parent 5dc5c85588
commit e66c4751ea
1 changed files with 143 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
libultraship/libultraship/SohImGuiImpl.cpp
View File

@ -76,6 +76,7 @@ namespace SohImGui {
ImVec4 minimap_colors; ImVec4 minimap_colors;
ImVec4 rupee_colors; ImVec4 rupee_colors;
ImVec4 smolekey_colors; ImVec4 smolekey_colors;
ImVec4 fileselect_colors;
ImVec4 kokiri_col; ImVec4 kokiri_col;
ImVec4 goron_col; ImVec4 goron_col;
ImVec4 zora_col; ImVec4 zora_col;
@ -94,7 +95,8 @@ namespace SohImGui {
"gCCHeartsPrim","gDDCCHeartsPrim", "gCCHeartsPrim","gDDCCHeartsPrim",
"gCCABtnPrim","gCCBBtnPrim","gCCCBtnPrim","gCCStartBtnPrim", "gCCABtnPrim","gCCBBtnPrim","gCCCBtnPrim","gCCStartBtnPrim",
"gCCMagicBorderPrim","gCCMagicPrim","gCCMagicUsePrim", "gCCMagicBorderPrim","gCCMagicPrim","gCCMagicUsePrim",
"gCCMinimapPrim","gCCRupeePrim","gCCKeysPrim" "gCCMinimapPrim","gCCRupeePrim","gCCKeysPrim",
"gCCFileChoosePrim"
}; };
const char* filters[3] = { const char* filters[3] = {
@ -669,7 +671,8 @@ namespace SohImGui {
CVar_SetS32(Cvar_Blue.c_str(), ClampFloatToInt(ColorRGBA.z * 255, 0, 255)); CVar_SetS32(Cvar_Blue.c_str(), ClampFloatToInt(ColorRGBA.z * 255, 0, 255));
needs_save = true; needs_save = true;
} }
} else { }
else {
if (ImGui::ColorEdit4(text, (float*)&ColorRGBA, flags)) { if (ImGui::ColorEdit4(text, (float*)&ColorRGBA, flags)) {
CVar_SetS32(Cvar_Red.c_str(), ClampFloatToInt(ColorRGBA.x * 255, 0, 255)); CVar_SetS32(Cvar_Red.c_str(), ClampFloatToInt(ColorRGBA.x * 255, 0, 255));
CVar_SetS32(Cvar_Green.c_str(), ClampFloatToInt(ColorRGBA.y * 255, 0, 255)); CVar_SetS32(Cvar_Green.c_str(), ClampFloatToInt(ColorRGBA.y * 255, 0, 255));
@ -679,7 +682,8 @@ namespace SohImGui {
} }
} }
ImGui::SameLine(); //ImGui::SameLine(); // Removing that one to gain some width spacing on the HUD editor
ImGui::NewLine();
ResetColor(cvarName, &ColorRGBA, default_colors, has_alpha); ResetColor(cvarName, &ColorRGBA, default_colors, has_alpha);
ImGui::SameLine(); ImGui::SameLine();
RandomizeColor(cvarName, &ColorRGBA); RandomizeColor(cvarName, &ColorRGBA);
@ -1189,40 +1193,73 @@ namespace SohImGui {
ImGui::SetNextWindowSize(ImVec2(215, 627), ImGuiCond_FirstUseEver); ImGui::SetNextWindowSize(ImVec2(215, 627), ImGuiCond_FirstUseEver);
ImGui::Begin("Interface Editor", nullptr, ImGuiWindowFlags_NoFocusOnAppearing); ImGui::Begin("Interface Editor", nullptr, ImGuiWindowFlags_NoFocusOnAppearing);
if (ImGui::BeginTabBar("Interface Editor", ImGuiTabBarFlags_NoCloseWithMiddleMouseButton)) { if (ImGui::BeginTabBar("Interface Editor", ImGuiTabBarFlags_NoCloseWithMiddleMouseButton)) {
if (ImGui::BeginTabItem("Hearts")) { if (ImGui::BeginTabItem("HUD")) {
if (ImGui::BeginTable("tableInterfaceEditor", 3, ImGuiTableFlags_BordersH | ImGuiTableFlags_BordersV)) {
ImGui::TableSetupColumn("Hearts", ImGuiTableColumnFlags_WidthStretch, 200.0f);
ImGui::TableSetupColumn("Magic Bar", ImGuiTableColumnFlags_WidthStretch, 200.0f);
ImGui::TableSetupColumn("Buttons", ImGuiTableColumnFlags_WidthStretch, 200.0f);
ImGui::TableHeadersRow();
ImGui::TableNextRow();
ImGui::TableNextColumn();
// COLUMN 1.1 - HEARTS
EnhancementColor("Hearts inner", "gCCHeartsPrim", hearts_colors, ImVec4(255, 70, 50, 255)); EnhancementColor("Hearts inner", "gCCHeartsPrim", hearts_colors, ImVec4(255, 70, 50, 255));
Tooltip("Hearts inner color (red in original)\nAffect both Normal Hearts and the ones in Double Defense"); Tooltip("Hearts inner color (red in original)\nAffect both Normal Hearts and the ones in Double Defense");
ImGui::Separator();
EnhancementColor("Hearts double def", "gDDCCHeartsPrim", hearts_dd_colors, ImVec4(255, 255, 255, 255)); EnhancementColor("Hearts double def", "gDDCCHeartsPrim", hearts_dd_colors, ImVec4(255, 255, 255, 255));
Tooltip("Hearts outline color (white in original)\nAffect Double Defense outline only."); Tooltip("Hearts outline color (white in original)\nAffect Double Defense outline only.");
ImGui::EndTabItem(); ImGui::Separator();
} if (ImGui::BeginTable("tableMisc", 1, ImGuiTableFlags_BordersH | ImGuiTableFlags_BordersV)) {
if (ImGui::BeginTabItem("Buttons")) { ImGui::TableSetupColumn("Misc", ImGuiTableColumnFlags_WidthStretch, 600.0f);
EnhancementColor("A Buttons", "gCCABtnPrim", a_btn_colors, ImVec4(90,90,255,255)); ImGui::TableHeadersRow();
Tooltip("A Buttons colors (Green in original GameCube)\nAffect A buttons colors on interface, in shops, messages boxes, ocarina notes and inventory cursors."); ImGui::TableNextRow();
EnhancementColor("B Buttons", "gCCBBtnPrim", b_btn_colors, ImVec4(0,150,0,255)); ImGui::TableNextColumn();
Tooltip("B Button colors (Red in original GameCube)\nAffect B button colors on interface"); // COLUMN 1.2 - MISC
EnhancementColor("C Buttons", "gCCCBtnPrim", c_btn_colors, ImVec4(255,160,0,255));
Tooltip("C Buttons colors (Yellowish / Oranges in originals)\nAffect C buttons colors on interface, in inventory and ocarina notes");
EnhancementColor("Start Buttons", "gCCStartBtnPrim", start_btn_colors, ImVec4(120,120,120,255));
Tooltip("Start Button colors (gray in GameCube)\nAffect Start button colors in inventory");
ImGui::EndTabItem();
}
if (ImGui::BeginTabItem("Magic Bar")) {
EnhancementColor("Magic bar borders", "gCCMagicBorderPrim", magic_border_colors, ImVec4(255,255,255,255));
Tooltip("Affect the border of the magic bar when being used\nWhite flash in original game.");
EnhancementColor("Magic bar main color", "gCCMagicPrim", magic_remaining_colors, ImVec4(0,200,0,255));
Tooltip("Affect the magic bar color\nGreen in original game.");
EnhancementColor("Magic bar being used", "gCCMagicUsePrim", magic_use_colors, ImVec4(250,250,0,255));
Tooltip("Affect the magic bar when being used\nYellow in original game.");
ImGui::EndTabItem();
}
if (ImGui::BeginTabItem("Misc")) {
EnhancementColor("Minimap color", "gCCMinimapPrim", minimap_colors, ImVec4(0, 255, 255, 255)); EnhancementColor("Minimap color", "gCCMinimapPrim", minimap_colors, ImVec4(0, 255, 255, 255));
Tooltip("Affect the Dungeon and Overworld minimaps."); Tooltip("Affect the Dungeon and Overworld minimaps.");
ImGui::Separator();
EnhancementColor("Rupee icon color", "gCCRupeePrim", rupee_colors, ImVec4(120, 120, 120, 255)); EnhancementColor("Rupee icon color", "gCCRupeePrim", rupee_colors, ImVec4(120, 120, 120, 255));
Tooltip("Affect the Rupee icon on interface\nGreen by default."); Tooltip("Affect the Rupee icon on interface\nGreen by default.");
ImGui::Separator();
EnhancementColor("Small Keys icon color", "gCCKeysPrim", smolekey_colors, ImVec4(200, 230, 255, 255)); EnhancementColor("Small Keys icon color", "gCCKeysPrim", smolekey_colors, ImVec4(200, 230, 255, 255));
Tooltip("Affect the Small keys icon on interface\nGray by default."); Tooltip("Affect the Small keys icon on interface\nGray by default.");
ImGui::Separator();
ImGui::EndTable();
}
ImGui::TableNextColumn();
// COLUMN 2 - MAGIC BAR
EnhancementColor("Magic bar borders", "gCCMagicBorderPrim", magic_border_colors, ImVec4(255, 255, 255, 255));
Tooltip("Affect the border of the magic bar when being used\nWhite flash in original game.");
ImGui::Separator();
EnhancementColor("Magic bar main color", "gCCMagicPrim", magic_remaining_colors, ImVec4(0, 200, 0, 255));
Tooltip("Affect the magic bar color\nGreen in original game.");
ImGui::Separator();
EnhancementColor("Magic bar being used", "gCCMagicUsePrim", magic_use_colors, ImVec4(250, 250, 0, 255));
Tooltip("Affect the magic bar when being used\nYellow in original game.");
ImGui::Separator();
ImGui::TableNextColumn();
// COLUMN 3 - BUTTON
EnhancementColor("A Buttons", "gCCABtnPrim", a_btn_colors, ImVec4(90, 90, 255, 255));
Tooltip("A Buttons colors (Green in original GameCube)\nAffect A buttons colors on interface, in shops, messages boxes, ocarina notes and inventory cursors.");
ImGui::Separator();
EnhancementColor("B Buttons", "gCCBBtnPrim", b_btn_colors, ImVec4(0, 150, 0, 255));
Tooltip("B Button colors (Red in original GameCube)\nAffect B button colors on interface");
ImGui::Separator();
EnhancementColor("C Buttons", "gCCCBtnPrim", c_btn_colors, ImVec4(255, 160, 0, 255));
Tooltip("C Buttons colors (Yellowish / Oranges in originals)\nAffect C buttons colors on interface, in inventory and ocarina notes");
ImGui::Separator();
EnhancementColor("Start Buttons", "gCCStartBtnPrim", start_btn_colors, ImVec4(120, 120, 120, 255));
Tooltip("Start Button colors (gray in GameCube)\nAffect Start button colors in inventory");
ImGui::Separator();
ImGui::EndTable();
ImGui::EndTabItem();
}
}
if (ImGui::BeginTabItem("File Choose")) {
EnhancementColor("File Choose color", "gCCFileChoosePrim", fileselect_colors, ImVec4(100, 150, 255, 255));
Tooltip("Affect the File Select.");
ImGui::Separator();
ImGui::EndTabItem(); ImGui::EndTabItem();
} }
ImGui::EndTabBar(); ImGui::EndTabBar();