Skip to content

Fix Options Menu sliders being frame-dependent at lower framerates #677

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
blueskythlikesclouds merged 9 commits into from
Mar 24, 2025
Merged

Fix Options Menu sliders being frame-dependent at lower framerates #677

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
dbe8ef1
Fix slider fastIncrement conditions
Onaterdem Mar 2, 2025
890b557
Change options menu sliders' fastIncrement logic to use a persistent …
Onaterdem Mar 2, 2025
6d7ede8
Merge branch 'slider-fix' of https://github.com/Onaterdem/UnleashedRe…
Onaterdem Mar 2, 2025
3c35fd5
Merge branch 'hedge-dev:main' into slider-fix
Onaterdem Mar 19, 2025
d1e98f8
Clamp deltaTime to a max value of 1/15f
Onaterdem Mar 19, 2025
371b404
Merge branch 'hedge-dev:main' into slider-fix
Onaterdem Mar 23, 2025
690b918
Compile fix
Onaterdem Mar 23, 2025
ac64613
Merge branch 'slider-fix' of https://github.com/Onaterdem/UnleashedRe…
Onaterdem Mar 23, 2025
fcda5b3
Spacing fix
Onaterdem Mar 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 22 additions & 18 deletions UnleashedRecomp/ui/options_menu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ static double g_lockedOnTime;
static double g_lastTappedTime;
static double g_lastIncrementTime;
static double g_lastIncrementSoundTime;
static double g_fastIncrementHoldTime;

static constexpr size_t GRID_SIZE = 9;

Expand Down Expand Up @@ -1049,31 +1050,33 @@ static void DrawConfigOption(int32_t rowIndex, float yOffset, ConfigDef<T>* conf
}
else if constexpr (std::is_same_v<T, float> || std::is_same_v<T, int32_t>)
{
float deltaTime = ImGui::GetIO().DeltaTime;
float deltaTime = std::fmin(ImGui::GetIO().DeltaTime, 1.0f / 15.0f);

bool fastIncrement = (time - g_lastTappedTime) > 0.5;
bool fastIncrement = isSlider && (leftIsHeld || rightIsHeld) && (time - g_lastTappedTime) > 0.5;
bool isPlayIncrementSound = true;

constexpr double INCREMENT_TIME = 1.0 / 120.0;
constexpr double INCREMENT_SOUND_TIME = 1.0 / 7.5;

if (isSlider)
if (fastIncrement)
g_fastIncrementHoldTime += deltaTime;
else
g_fastIncrementHoldTime = 0;

if (fastIncrement)
{
if (fastIncrement)
{
isPlayIncrementSound = (time - g_lastIncrementSoundTime) > INCREMENT_SOUND_TIME;
isPlayIncrementSound = (time - g_lastIncrementSoundTime) > INCREMENT_SOUND_TIME;

if ((time - g_lastIncrementTime) < INCREMENT_TIME)
fastIncrement = false;
else
g_lastIncrementTime = time;
}
if (g_fastIncrementHoldTime < INCREMENT_TIME)
fastIncrement = false;
else
g_lastIncrementTime = time;
}

if (fastIncrement)
{
decrement = leftIsHeld;
increment = rightIsHeld;
}
if (fastIncrement)
{
decrement = leftIsHeld;
increment = rightIsHeld;
}

do
Expand All @@ -1093,9 +1096,10 @@ static void DrawConfigOption(int32_t rowIndex, float yOffset, ConfigDef<T>* conf
config->Value += 0.01f;
}

deltaTime -= INCREMENT_TIME;
if (fastIncrement)
g_fastIncrementHoldTime -= INCREMENT_TIME;
}
while (fastIncrement && deltaTime > 0.0f);
while (fastIncrement && g_fastIncrementHoldTime >= INCREMENT_TIME);

bool isConfigValueInBounds = config->Value >= valueMin && config->Value <= valueMax;

Expand Down