From fd07551c3eec6101910daa3c49db2ca677fb6061 Mon Sep 17 00:00:00 2001 From: somewhatlurker <52014015+somewhatlurker@users.noreply.github.com> Date: Sat, 14 Sep 2019 14:42:19 +1000 Subject: [PATCH] frm: use fps for motion rate --- source-code/data/plugins/config.ini | 4 ++-- source-code/source/plugins/Launcher/framework.h | 2 +- .../source/plugins/TLAC/Components/FrameRateManager.cpp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/source-code/data/plugins/config.ini b/source-code/data/plugins/config.ini index 0b816d3..93925c1 100644 --- a/source-code/data/plugins/config.ini +++ b/source-code/data/plugins/config.ini @@ -55,8 +55,8 @@ FPS.Limit.Verbose=0 TAA=1 # Morphological Anti-Aliasing MLAA=1 -# FrameRateManager motion rate (multiplier percentage) -FRM.Motion.Rate=500 +# FrameRateManager motion rate (fps) +FRM.Motion.Rate=300 [Resolution] # 0 = Windowed, 1 = Borderless (Forced to desktop resolution), 2 = Fullscreen diff --git a/source-code/source/plugins/Launcher/framework.h b/source-code/source/plugins/Launcher/framework.h index 5c5a15d..c23adaa 100644 --- a/source-code/source/plugins/Launcher/framework.h +++ b/source-code/source/plugins/Launcher/framework.h @@ -174,7 +174,7 @@ ConfigOptionBase* optionsArray[] = { new BooleanOption(L"MLAA", GRAPHICS_SECTION, CONFIG_FILE, L"MLAA", L"Morphological Anti-Aliasing", true, false), new BooleanOption(L"FPS.Limit.LightMode", GRAPHICS_SECTION, CONFIG_FILE, L"Use Lightweight Limiter", L"Makes the FPS limiter use less CPU.\nMay have less consistent performance.", true, false), new NumericOption(L"FPS.Limit", GRAPHICS_SECTION, CONFIG_FILE, L"FPS Limit:", L"Allows you to set a frame rate cap. Set to -1 to unlock the frame rate.", 60, -1, INT_MAX), - new NumericOption(L"frm.motion.rate", GRAPHICS_SECTION, CONFIG_FILE, L"FRM Motion Rate:", L"Sets the motion rate (multiplier percentage) for the Frame Rate Manager component.\nLarger=smoother, but more CPU intensive.", 500, 1, INT_MAX), + new NumericOption(L"frm.motion.rate", GRAPHICS_SECTION, CONFIG_FILE, L"FRM Motion Rate:", L"Sets the motion rate (fps) for the Frame Rate Manager component.\nLarger values should be smoother, but more CPU intensive and possibly buggier.", 300, 1, INT_MAX), new OptionMetaSpacer(8), new StringOption(L"command_line", LAUNCHER_SECTION, CONFIG_FILE, L"Command Line:", L"Allows setting command line parameters for the game when using the launcher.\nDisabling the launcher will bypass this.", L"", false), diff --git a/source-code/source/plugins/TLAC/Components/FrameRateManager.cpp b/source-code/source/plugins/TLAC/Components/FrameRateManager.cpp index fef8f1b..174dede 100644 --- a/source-code/source/plugins/TLAC/Components/FrameRateManager.cpp +++ b/source-code/source/plugins/TLAC/Components/FrameRateManager.cpp @@ -13,8 +13,8 @@ namespace TLAC::Components { std::wstring_convert> converter; std::wstring configPath = converter.from_bytes((TLAC::framework::GetModuleDirectory() + "/config.ini").c_str()); - float nMotionRate = GetPrivateProfileIntW(L"graphics", L"frm.motion.rate", 500, configPath.c_str()); - motionSpeedMultiplier = nMotionRate / 100.0f; + float nMotionRate = GetPrivateProfileIntW(L"graphics", L"frm.motion.rate", 300, configPath.c_str()); + motionSpeedMultiplier = nMotionRate / 60.0f; } FrameRateManager::~FrameRateManager()