Skip to content

Commit

Permalink
Tuning: Finalized markers for conflicting addonparts.
Browse files Browse the repository at this point in the history 
Gray X = conflict with installed addonpart.
Red [] = conflict with mouse-hovered addonpart (regardless of being installed or not)
  • Loading branch information
@ohlidalp
ohlidalp committed Apr 23, 2024
1 parent 5c411e8 commit 6a6ba9d
Show file tree
Hide file tree
Showing 2 changed files with 47 additions and 10 deletions.
56 changes: 46 additions & 10 deletions source/main/gui/panels/GUI_TopMenubar.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1608,15 +1608,19 @@ void TopMenubar::Draw(float dt)
std::string addonparts_title = fmt::format(_LC("TopMenubar", "Addon parts ({})"), tuning_addonparts.size());
if (ImGui::CollapsingHeader(addonparts_title.c_str()))
{
for (CacheEntryPtr& addonpart_entry: tuning_addonparts)
for (size_t i = 0; i < tuning_addonparts.size(); i++)
{
CacheEntryPtr& addonpart_entry = tuning_addonparts[i];

ImGui::PushID(addonpart_entry->fname.c_str());
bool conflict = tuning_hovered_addonpart
const bool conflict_w_hovered = tuning_hovered_addonpart
&& (addonpart_entry != tuning_hovered_addonpart)
&& AddonPartUtility::CheckForAddonpartConflict(tuning_hovered_addonpart, addonpart_entry, tuning_conflicts);
bool used = TuneupUtil::isAddonPartUsed(tuneup_def, addonpart_entry->fname);
ImVec2 checkbox_cursor = ImGui::GetCursorScreenPos();
if (ImGui::Checkbox(addonpart_entry->dname.c_str(), &used) && !conflict)
const ImVec2 checkbox_cursor = ImGui::GetCursorScreenPos();
if (ImGui::Checkbox(addonpart_entry->dname.c_str(), &used)
&& !conflict_w_hovered
&& !tuning_addonparts_conflict_w_used[i])
{
ModifyProjectRequest* req = new ModifyProjectRequest();
req->mpr_type = (used)
Expand All @@ -1626,12 +1630,25 @@ void TopMenubar::Draw(float dt)
req->mpr_target_actor = tuning_actor;
App::GetGameContext()->PushMessage(Message(MSG_EDI_MODIFY_PROJECT_REQUESTED, req));
}
// Draw conflict marker
if (conflict)
// Draw conflict markers
if (tuning_addonparts_conflict_w_used[i])
{
// Gray-ish X inside the checkbox
const float square_sz = ImGui::GetFrameHeight();
const ImVec2 min = checkbox_cursor + ImGui::GetStyle().FramePadding*1.4f;
const ImVec2 max = checkbox_cursor + (ImVec2(square_sz, square_sz) - ImGui::GetStyle().FramePadding*1.5f);
const ImColor X_COLOR(0.5f, 0.48f, 0.45f);
ImGui::GetWindowDrawList()->AddLine(min, max, X_COLOR, 4.f);
ImGui::GetWindowDrawList()->AddLine(ImVec2(min.x, max.y), ImVec2(max.x, min.y), X_COLOR, 4.f);
}
if (conflict_w_hovered)
{
ImVec2 min = checkbox_cursor + ImGui::GetStyle().FramePadding;
ImVec2 max = min + ImVec2(ImGui::GetTextLineHeight(), ImGui::GetTextLineHeight());
ImGui::GetWindowDrawList()->AddRectFilled(min, max, ImColor(0.7f, 0.1f, 0.f));
// Red unrounded square around the checkbox
const float square_sz = ImGui::GetFrameHeight();
const ImVec2 min = checkbox_cursor;
const ImVec2 max = checkbox_cursor + ImVec2(square_sz + 0.5f, square_sz);
const ImColor SQ_COLOR(0.7f, 0.1f, 0.f);
ImGui::GetWindowDrawList()->AddRect(min, max, SQ_COLOR, 0.f, ImDrawCornerFlags_None, 3.f);
}
// Record when checkbox is hovered - for drawing conflict markers
if (ImGui::IsItemHovered())
Expand Down Expand Up @@ -2361,7 +2378,7 @@ void TopMenubar::RefreshTuningMenu()
tuning_saves.resetResults();
App::GetCacheSystem()->Query(tuning_saves);

// Refresh `tuning_conflicts` database ~ test addonparts each with each once.
// Refresh `tuning_conflicts` database ~ test eligible addonparts each with each once.
tuning_conflicts.clear();
for (size_t i1 = 0; i1 < tuning_addonparts.size(); i1++)
{
Expand All @@ -2371,6 +2388,25 @@ void TopMenubar::RefreshTuningMenu()
}
}

// Refresh `tuning_addonparts_conflicting` listing ~ test used addonparts against unused.
tuning_addonparts_conflict_w_used.clear();
tuning_addonparts_conflict_w_used.resize(tuning_addonparts.size(), false);
if (current_actor->getWorkingTuneupDef())
{
for (const std::string& use_addonpart_fname: tuning_actor->getWorkingTuneupDef()->use_addonparts)
{
CacheEntryPtr use_addonpart_entry = App::GetCacheSystem()->FindEntryByFilename(LT_AddonPart, /*partial:*/false, use_addonpart_fname);
for (size_t i = 0; i < tuning_addonparts.size(); i++)
{
if (tuning_addonparts[i] != use_addonpart_entry)
{
tuning_addonparts_conflict_w_used[i] = tuning_addonparts_conflict_w_used[i]
|| AddonPartUtility::CheckForAddonpartConflict(tuning_addonparts[i], use_addonpart_entry, tuning_conflicts);
}
}
}
}

tuning_rwidget_cursorx_min = 0.f;
}
else if (!App::sim_tuning_enabled->getBool() || !current_actor)
Expand Down
1 change: 1 addition & 0 deletions source/main/gui/panels/GUI_TopMenubar.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ class TopMenubar
// Tuning menu
ActorPtr tuning_actor; //!< Detecting actor change to update cached values.
std::vector<CacheEntryPtr> tuning_addonparts; //!< Addonparts eligible for current actor, both matched by GUID and force-installed by user via [browse all] button.
std::vector<bool> tuning_addonparts_conflict_w_used; //!< 1:1 with `tuning_addonparts`; True means the eligible (not used) addonpart conflicts with an used addonpart.
AddonPartConflictVec tuning_conflicts; //!< Conflicts between eligible addonparts tweaking the same element.
CacheQuery tuning_saves; //!< Tuneups saved by user, with category ID `RoR::CID_AddonpartUser`
Str<200> tuning_savebox_buf; //!< Buffer for tuneup name to be saved
Expand Down

0 comments on commit 6a6ba9d

Please sign in to comment.