Skip to content
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

Add scope and scanner mouse sensitivity modifiers #281

Closed
wants to merge 4 commits into from
Closed

Add scope and scanner mouse sensitivity modifiers #281

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9739786
Initial commit
GooberRF Sep 30, 2024
eb25bb0
Update game_patch/input/mouse.cpp
GooberRF Oct 3, 2024
609b7e0
add clamping method, consolidate logic
GooberRF Oct 4, 2024
39a0463
remove unneeded clamping and clean up code
GooberRF Oct 5, 2024
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
20 changes: 13 additions & 7 deletions game_patch/input/mouse.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,30 +115,36 @@ ConsoleCommand2 ms_cmd{
float scope_sensitivity_factor = 1.0f;
float scanner_sensitivity_factor = 1.0f;

constexpr float clamp_sensitivity_modifier(float modifier)
{
constexpr const float min = 0.01f; // prevent division by zero in scope sens
constexpr const float max = 4.0f;
return std::clamp(modifier, min, max);
}

void patch_scope_and_scanner_sensitivity()
{
AsmWriter{0x004309B1}.fmul<float>(AsmRegMem(&scope_sensitivity_factor));
AsmWriter{0x004309DE}.fmul<float>(AsmRegMem(&scanner_sensitivity_factor));
AsmWriter{0x004309B1}.fmul<float>(AsmRegMem{&scope_sensitivity_factor});
AsmWriter{0x004309DE}.fmul<float>(AsmRegMem{&scanner_sensitivity_factor});
}

void update_scope_sensitivity()
{
// prevent division by zero if somehow the modifier gets set to 0
float modifier = std::clamp(static_cast<float>(g_game_config.scope_sensitivity_modifier), 0.01f, 4.0f);
float modifier = clamp_sensitivity_modifier(g_game_config.scope_sensitivity_modifier);
scope_sensitivity_factor = rf::scope_sensitivity_constant * (1.0f / modifier);
}

void update_scanner_sensitivity()
{
float modifier = std::clamp(static_cast<float>(g_game_config.scanner_sensitivity_modifier), 0.01f, 4.0f);
float modifier = clamp_sensitivity_modifier(g_game_config.scanner_sensitivity_modifier);
scanner_sensitivity_factor = rf::scanner_sensitivity_constant * modifier;
}

ConsoleCommand2 scope_sens_cmd{
"scope_sensitivity_modifier",
[](std::optional<float> value_opt) {
if (value_opt) {
float value = std::clamp(value_opt.value(), 0.01f, 4.0f);
float value = clamp_sensitivity_modifier(value_opt.value());
GooberRF marked this conversation as resolved.
Show resolved Hide resolved
g_game_config.scope_sensitivity_modifier = value;
g_game_config.save();
update_scope_sensitivity();
Expand All @@ -158,7 +164,7 @@ ConsoleCommand2 scanner_sens_cmd{
"scanner_sensitivity_modifier",
[](std::optional<float> value_opt) {
if (value_opt) {
float value = std::clamp(value_opt.value(), 0.01f, 4.0f);
float value = clamp_sensitivity_modifier(value_opt.value());
g_game_config.scanner_sensitivity_modifier = value;
g_game_config.save();
update_scanner_sensitivity();
Expand Down