shweet/snivy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3 from MarkSuckerberg/play-feedback

Browse Source 
Game Bar Highlight
This commit is contained in:
Shweet
2025-12-30 16:48:40 -08:00
committed by GitHub
parent 85663e3c9c d028224fd0
commit b76604bacf
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/window/play.cpp
View File

@@ -85,6 +85,18 @@ namespace game::window
auto barMin = ImVec2(position.x + (size.x * 0.5f) - (spacing * 0.5f), position.y + (spacing * 2.0f)); auto barMin = ImVec2(position.x + (size.x * 0.5f) - (spacing * 0.5f), position.y + (spacing * 2.0f));
auto barMax = ImVec2(barMin.x + (spacing * 2.0f), barMin.y + size.y - (spacing * 4.0f)); auto barMax = ImVec2(barMin.x + (spacing * 2.0f), barMin.y + size.y - (spacing * 4.0f));
bool mouseHovering = ImGui::IsMouseHoveringRect(barMin, barMax);
auto endTimerProgress = (float)endTimer / endTimerMax;
if (mouseHovering)
{
auto color = RECT_COLOR;
//Ease out and back in again
color.w = isActive ? 1.0f : (4 * pow(endTimerProgress, 2) - 4 * endTimerProgress + 1);
drawList->AddRect(ImVec2(barMin.x - 1, barMin.y - 1), ImVec2(barMax.x + 1, barMax.y + 1),
ImGui::GetColorU32(color));
}
drawList->AddRectFilled(barMin, barMax, ImGui::GetColorU32(BG_COLOR)); drawList->AddRectFilled(barMin, barMax, ImGui::GetColorU32(BG_COLOR));
auto barWidth = barMax.x - barMin.x; auto barWidth = barMax.x - barMin.x;
@@ -132,8 +144,6 @@ namespace game::window
} }
}; };
auto endTimerProgress = (float)endTimer / endTimerMax;
range_draw(challenge.range, isActive ? 1.0f : 0.0f); range_draw(challenge.range, isActive ? 1.0f : 0.0f);
auto lineMin = ImVec2(barMin.x - LINE_WIDTH_BONUS, barMin.y + (barHeight * tryValue)); auto lineMin = ImVec2(barMin.x - LINE_WIDTH_BONUS, barMin.y + (barHeight * tryValue));
@@ -171,8 +181,7 @@ namespace game::window
} }
} }
if (ImGui::IsKeyPressed(ImGuiKey_Space) || if (ImGui::IsKeyPressed(ImGuiKey_Space) || (mouseHovering && ImGui::IsMouseClicked(ImGuiMouseButton_Left)))
(ImGui::IsMouseHoveringRect(barMin, barMax) && ImGui::IsMouseClicked(ImGuiMouseButton_Left)))
{ {
Grade grade{MISS}; Grade grade{MISS};
auto subRanges = sub_ranges_get(challenge.range); auto subRanges = sub_ranges_get(challenge.range);