mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-02-17 07:40:20 -05:00
Code Issues Projects Releases Wiki Activity

Remove unnecessary and redundant checks and references. (#4111)

Browse Source 
Stop passing checksByArea to functions in the same namespace.
Only get value of `HideFilteredAreas` once per frame.
Gate area and check evaluations behind checks being visible and search filter size greater than 0.
Proper function capitalization.
This commit is contained in:
Malkierian 2024-05-06 17:27:35 -07:00 committed by GitHub
parent b3d51441eb
commit 8d3902a256
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
View File

@ -133,8 +133,8 @@ RandomizerCheckArea previousArea = RCAREA_INVALID;
RandomizerCheckArea currentArea = RCAREA_INVALID; RandomizerCheckArea currentArea = RCAREA_INVALID;
OSContPad* trackerButtonsPressed; OSContPad* trackerButtonsPressed;
bool passesTextFilter(ImGuiTextFilter& checkSearch, const RandomizerCheckObject rcObject); bool ShouldShowCheck(RandomizerCheckObject rcObject);
bool shouldHideArea(ImGuiTextFilter& checkSearch, std::map<RandomizerCheckArea, std::vector<RandomizerCheckObject>> checksByArea, const RandomizerCheckArea rcArea); bool ShouldHideArea(RandomizerCheckArea rcArea);
void BeginFloatWindows(std::string UniqueName, bool& open, ImGuiWindowFlags flags = 0); void BeginFloatWindows(std::string UniqueName, bool& open, ImGuiWindowFlags flags = 0);
bool CompareChecks(RandomizerCheckObject, RandomizerCheckObject); bool CompareChecks(RandomizerCheckObject, RandomizerCheckObject);
bool CheckByArea(RandomizerCheckArea); bool CheckByArea(RandomizerCheckArea);
@ -202,6 +202,7 @@ Color_RGBA8 Color_Saved_Extra = { 0, 185, 0, 255 }; // Green
std::vector<uint32_t> buttons = { BTN_A, BTN_B, BTN_CUP, BTN_CDOWN, BTN_CLEFT, BTN_CRIGHT, BTN_L, std::vector<uint32_t> buttons = { BTN_A, BTN_B, BTN_CUP, BTN_CDOWN, BTN_CLEFT, BTN_CRIGHT, BTN_L,
BTN_Z, BTN_R, BTN_START, BTN_DUP, BTN_DDOWN, BTN_DLEFT, BTN_DRIGHT }; BTN_Z, BTN_R, BTN_START, BTN_DUP, BTN_DDOWN, BTN_DLEFT, BTN_DRIGHT };
static ImGuiTextFilter checkSearch;
void DefaultCheckData(RandomizerCheck rc) { void DefaultCheckData(RandomizerCheck rc) {
gSaveContext.checkTrackerData[rc].status = RCSHOW_UNCHECKED; gSaveContext.checkTrackerData[rc].status = RCSHOW_UNCHECKED;
@ -930,9 +931,9 @@ void CheckTrackerWindow::DrawElement() {
optCollapseAll = true; optCollapseAll = true;
} }
ImGui::SameLine(); ImGui::SameLine();
static ImGuiTextFilter checkSearch;
if (ImGui::Button("Clear")) { if (ImGui::Button("Clear")) {
checkSearch.Clear(); checkSearch.Clear();
doAreaScroll = true;
} }
UIWidgets::Tooltip("Clear the search field"); UIWidgets::Tooltip("Clear the search field");
checkSearch.Draw(); checkSearch.Draw();
@ -970,6 +971,8 @@ void CheckTrackerWindow::DrawElement() {
Color_RGBA8 extraColor; Color_RGBA8 extraColor;
std::string stemp; std::string stemp;
bool shouldHideFilteredAreas = CVarGetInteger(CVAR_TRACKER_CHECK("HideFilteredAreas"), 1);
for (auto& [rcArea, objs] : checksByArea) { for (auto& [rcArea, objs] : checksByArea) {
RandomizerCheckArea thisArea = currentArea; RandomizerCheckArea thisArea = currentArea;
@ -983,7 +986,7 @@ void CheckTrackerWindow::DrawElement() {
previousShowHidden = showHidden; previousShowHidden = showHidden;
doAreaScroll = true; doAreaScroll = true;
} }
if (shouldHideArea(checkSearch, checksByArea, rcArea) || if ((shouldHideFilteredAreas && ShouldHideArea(rcArea)) ||
(!showHidden && ((hideComplete && thisAreaFullyChecked) || (hideIncomplete && !thisAreaFullyChecked))) (!showHidden && ((hideComplete && thisAreaFullyChecked) || (hideIncomplete && !thisAreaFullyChecked)))
) { ) {
doDraw = false; doDraw = false;
@ -1046,7 +1049,8 @@ void CheckTrackerWindow::DrawElement() {
} }
for (auto rcObject : objs) { for (auto rcObject : objs) {
if (IsVisibleInCheckTracker(rcObject) && passesTextFilter(checkSearch, rcObject) && doDraw && if (ShouldShowCheck(rcObject) &&
doDraw &&
isThisAreaSpoiled) { isThisAreaSpoiled) {
DrawLocation(rcObject); DrawLocation(rcObject);
} }
@ -1067,14 +1071,12 @@ void CheckTrackerWindow::DrawElement() {
} }
} }
bool shouldHideArea(ImGuiTextFilter& checkSearch, std::map<RandomizerCheckArea, std::vector<RandomizerCheckObject>> checksByArea, RandomizerCheckArea rcArea) { bool ShouldHideArea(RandomizerCheckArea rcArea) {
bool shouldHideFilteredAreas = CVarGetInteger(CVAR_TRACKER_CHECK("HideFilteredAreas"), 1); if (checkSearch.Filters.Size == 0 || checkSearch.PassFilter(RandomizerCheckObjects::GetRCAreaName(rcArea).c_str())) {
if (!shouldHideFilteredAreas) {
return false; return false;
} }
for (auto check : checksByArea[rcArea]) { for (auto check : checksByArea[rcArea]) {
if (IsVisibleInCheckTracker(check) && passesTextFilter(checkSearch, check)) { if (ShouldShowCheck(check)) {
return false; return false;
} }
} }
@ -1082,10 +1084,12 @@ bool shouldHideArea(ImGuiTextFilter& checkSearch, std::map<RandomizerCheckArea,
return true; return true;
} }
bool passesTextFilter(ImGuiTextFilter& checkSearch, RandomizerCheckObject check) { bool ShouldShowCheck(RandomizerCheckObject check) {
return ( return (
IsVisibleInCheckTracker(check) &&
(checkSearch.Filters.Size == 0 ||
checkSearch.PassFilter(RandomizerCheckObjects::GetRCAreaName(check.rcArea).c_str()) || checkSearch.PassFilter(RandomizerCheckObjects::GetRCAreaName(check.rcArea).c_str()) ||
checkSearch.PassFilter(check.rcShortName.c_str()) checkSearch.PassFilter(check.rcShortName.c_str()))
); );
} }