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

Fixed from @louist103 and @Emill review

Browse Source
This commit is contained in:
PurpleHato 2022-06-06 18:11:12 +02:00 committed by Nicholas Estelami
parent 6c34c03cdf
commit d87df5f670
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libultraship/libultraship/SohImGuiImpl.cpp
View File

@ -99,7 +99,7 @@ namespace SohImGui {
"gCCMinimapPrim","gCCRupeePrim","gCCKeysPrim" "gCCMinimapPrim","gCCRupeePrim","gCCKeysPrim"
}; };
std::vector<std::string> filters = { const char* filters[3] = {
"Three-Point", "Three-Point",
"Linear", "Linear",
"None" "None"
@ -438,18 +438,17 @@ namespace SohImGui {
} }
void EnhancementCombobox(const char* name, std::vector<std::string> ComboArray, uint8_t FirstTimeValue = 0) { void EnhancementCombobox(const char* name, const char* ComboArray[], size_t arraySize, uint8_t FirstTimeValue = 0) {
if (FirstTimeValue <= 0) { if (FirstTimeValue <= 0) {
FirstTimeValue = 0; FirstTimeValue = 0;
} }
uint8_t selected = CVar_GetS32(name, FirstTimeValue); uint8_t selected = CVar_GetS32(name, FirstTimeValue);
uint8_t DefaultValue = selected; uint8_t DefaultValue = selected;
std::string comboName = std::string("##") + std::string(name); std::string comboName = std::string("##") + std::string(name);
if (ImGui::BeginCombo(comboName.c_str(), ComboArray[DefaultValue].c_str())) { if (ImGui::BeginCombo(comboName.c_str(), ComboArray[DefaultValue])) {
uint8_t ComboxSize = ComboArray.size(); for (uint8_t i = 0; i < arraySize; i++) {
for (uint8_t i = 0; i < ComboxSize; i++) { if (strlen(ComboArray[i]) > 1) {
if (strlen(ComboArray[i].c_str()) > 1) { if (ImGui::Selectable(ComboArray[i], i == selected)) {
if (ImGui::Selectable(ComboArray[i].c_str(), i == selected)) {
CVar_SetS32(name, i); CVar_SetS32(name, i);
selected = i; selected = i;
needs_save = true; needs_save = true;
@ -831,7 +830,7 @@ namespace SohImGui {
EXPERIMENTAL(); EXPERIMENTAL();
ImGui::Text("Texture Filter (Needs reload)"); ImGui::Text("Texture Filter (Needs reload)");
EnhancementCombobox("gTextureFilter", filters); EnhancementCombobox("gTextureFilter", filters, 0, 3);
GfxRenderingAPI* gapi = gfx_get_current_rendering_api(); GfxRenderingAPI* gapi = gfx_get_current_rendering_api();
gapi->set_texture_filter((FilteringMode)CVar_GetS32("gTextureFilter", 0)); gapi->set_texture_filter((FilteringMode)CVar_GetS32("gTextureFilter", 0));
overlay->DrawSettings(); overlay->DrawSettings();

2
libultraship/libultraship/SohImGuiImpl.h
View File

@ -70,7 +70,7 @@ namespace SohImGui {
void EnhancementButton(const char* text, const char* cvarName); void EnhancementButton(const char* text, const char* cvarName);
void EnhancementSliderInt(const char* text, const char* id, const char* cvarName, int min, int max, const char* format); void EnhancementSliderInt(const char* text, const char* id, const char* cvarName, int min, int max, const char* format);
void EnhancementSliderFloat(const char* text, const char* id, const char* cvarName, float min, float max, const char* format, float defaultValue, bool isPercentage); void EnhancementSliderFloat(const char* text, const char* id, const char* cvarName, float min, float max, const char* format, float defaultValue, bool isPercentage);
void EnhancementCombobox(const char* name, std::vector<std::string> ComboArray, uint8_t FirstTimeValue); void EnhancementCombobox(const char* name, const char* ComboArray[], size_t arraySize, uint8_t FirstTimeValue);
void EnhancementColor(const char* text, const char* cvarName, ImVec4 ColorRGBA, ImVec4 default_colors, bool allow_rainbow = true, bool has_alpha=false, bool TitleSameLine=false); void EnhancementColor(const char* text, const char* cvarName, ImVec4 ColorRGBA, ImVec4 default_colors, bool allow_rainbow = true, bool has_alpha=false, bool TitleSameLine=false);
void DrawMainMenuAndCalculateGameSize(void); void DrawMainMenuAndCalculateGameSize(void);