thirdpartymirrors/UnleashedRecomp
1
0
Fork 0
mirror of https://github.com/hedge-dev/UnleashedRecomp.git synced 2026-04-28 05:11:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add option select animation.

Browse source
This commit is contained in:
Skyth 2024-11-19 15:48:27 +03:00
parent e86fc02675
commit f4bae353a4
1 changed files with 22 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
UnleashedRecomp/ui/options_menu.cpp
View file

@ -257,6 +257,7 @@ static constexpr const char* CATEGORIES[] =
static int32_t g_categoryIndex; static int32_t g_categoryIndex;
static int32_t g_firstVisibleRowIndex; static int32_t g_firstVisibleRowIndex;
static int32_t g_prevSelectedRowIndex;
static int32_t g_selectedRowIndex; static int32_t g_selectedRowIndex;
static double g_rowSelectionTime; static double g_rowSelectionTime;
static bool g_leftWasHeld; static bool g_leftWasHeld;
@ -271,6 +272,7 @@ static void ResetSelection()
{ {
g_firstVisibleRowIndex = 0; g_firstVisibleRowIndex = 0;
g_selectedRowIndex = 0; g_selectedRowIndex = 0;
g_prevSelectedRowIndex = 0;
g_rowSelectionTime = ImGui::GetTime(); g_rowSelectionTime = ImGui::GetTime();
g_leftWasHeld = false; g_leftWasHeld = false;
g_upWasHeld = false; g_upWasHeld = false;
@ -499,7 +501,12 @@ static void DrawConfigOption(int32_t rowIndex, float yOffset, ConfigDef<T>* conf
if (g_selectedItem == config) if (g_selectedItem == config)
{ {
drawList->AddRectFilledMultiColor(min, max, COLOR0, COLOR0, COLOR1, COLOR1); float prevItemOffset = (g_prevSelectedRowIndex - g_selectedRowIndex) * (optionHeight + optionPadding);
double animRatio = std::clamp((ImGui::GetTime() - g_rowSelectionTime) * 60.0 / 8.0, 0.0, 1.0);
prevItemOffset *= pow(1.0 - animRatio, 3.0);
drawList->AddRectFilledMultiColor({ min.x, min.y + prevItemOffset }, { max.x, max.y + prevItemOffset }, COLOR0, COLOR0, COLOR1, COLOR1);
DrawTextWithMarquee(g_seuratFont, size, textPos, min, max, IM_COL32_WHITE, configName.c_str(), g_rowSelectionTime, 0.9, 250.0); DrawTextWithMarquee(g_seuratFont, size, textPos, min, max, IM_COL32_WHITE, configName.c_str(), g_rowSelectionTime, 0.9, 250.0);
} }
else else
@ -755,6 +762,8 @@ static void DrawConfigOptions()
bool scrollUp = !g_upWasHeld && upIsHeld; bool scrollUp = !g_upWasHeld && upIsHeld;
bool scrollDown = !g_downWasHeld && downIsHeld; bool scrollDown = !g_downWasHeld && downIsHeld;
int32_t prevSelectedRowIndex = g_selectedRowIndex;
if (scrollUp) if (scrollUp)
{ {
--g_selectedRowIndex; --g_selectedRowIndex;
@ -771,6 +780,7 @@ static void DrawConfigOptions()
if (scrollUp || scrollDown) if (scrollUp || scrollDown)
{ {
g_rowSelectionTime = ImGui::GetTime(); g_rowSelectionTime = ImGui::GetTime();
g_prevSelectedRowIndex = prevSelectedRowIndex;
PlaySound("sys_worldmap_cursor"); PlaySound("sys_worldmap_cursor");
} }
@ -782,11 +792,22 @@ static void DrawConfigOptions()
auto clipRectMax = drawList->GetClipRectMax(); auto clipRectMax = drawList->GetClipRectMax();
int32_t visibleRowCount = int32_t(floor((clipRectMax.y - clipRectMin.y) / optionHeightWithPadding)); int32_t visibleRowCount = int32_t(floor((clipRectMax.y - clipRectMin.y) / optionHeightWithPadding));
bool disableMoveAnimation = false;
if (g_firstVisibleRowIndex > g_selectedRowIndex) if (g_firstVisibleRowIndex > g_selectedRowIndex)
{
g_firstVisibleRowIndex = g_selectedRowIndex; g_firstVisibleRowIndex = g_selectedRowIndex;
disableMoveAnimation = true;
}
if (g_firstVisibleRowIndex + visibleRowCount - 1 < g_selectedRowIndex) if (g_firstVisibleRowIndex + visibleRowCount - 1 < g_selectedRowIndex)
{
g_firstVisibleRowIndex = std::max(0, g_selectedRowIndex - visibleRowCount + 1); g_firstVisibleRowIndex = std::max(0, g_selectedRowIndex - visibleRowCount + 1);
disableMoveAnimation = true;
}
if (disableMoveAnimation)
g_prevSelectedRowIndex = g_selectedRowIndex;
// Pop clip rect from DrawCategories // Pop clip rect from DrawCategories
drawList->PopClipRect(); drawList->PopClipRect();