From 6f5af711faa71e69a3c13120b4fbd8da2a334709 Mon Sep 17 00:00:00 2001 From: Xottab-DUTY Date: Sat, 12 Feb 2022 23:19:05 +0300 Subject: [PATCH] Renamed gamepad stick sensitivity console commands and variables --- src/xrEngine/FDemoRecord.cpp | 2 +- src/xrEngine/IInputReceiver.h | 6 +++--- src/xrEngine/xr_input.cpp | 8 ++++---- src/xrEngine/xr_ioc_cmd.cpp | 8 ++++---- src/xrGame/ActorInput.cpp | 4 ++-- src/xrGame/CarInput.cpp | 4 ++-- src/xrGame/WeaponStatMgunIR.cpp | 4 ++-- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/xrEngine/FDemoRecord.cpp b/src/xrEngine/FDemoRecord.cpp index 3f888bca254..26779dff6fd 100644 --- a/src/xrEngine/FDemoRecord.cpp +++ b/src/xrEngine/FDemoRecord.cpp @@ -735,7 +735,7 @@ void CDemoRecord::IR_OnControllerHold(int key, float x, float y) case kLOOK_AROUND: { m_angle_speed = speed; - const float scale = .05f; // psControllerSens; + const float scale = .05f; // psControllerStickSens; OnAxisMove(x, y, scale, psControllerInvertY.test(1)); break; } diff --git a/src/xrEngine/IInputReceiver.h b/src/xrEngine/IInputReceiver.h index 61841175d06..9e0e15a0792 100644 --- a/src/xrEngine/IInputReceiver.h +++ b/src/xrEngine/IInputReceiver.h @@ -49,9 +49,9 @@ ENGINE_API extern float psMouseSens; ENGINE_API extern float psMouseSensScale; ENGINE_API extern Flags32 psMouseInvert; -ENGINE_API extern float psControllerSens; -ENGINE_API extern float psControllerSensScale; -ENGINE_API extern float psControllerDeadZoneSens; +ENGINE_API extern float psControllerStickSens; +ENGINE_API extern float psControllerStickSensScale; +ENGINE_API extern float psControllerStickDeadZone; ENGINE_API extern Flags32 psControllerInvertY; #endif diff --git a/src/xrEngine/xr_input.cpp b/src/xrEngine/xr_input.cpp index 6dc0aa0db3e..7e3896f7979 100644 --- a/src/xrEngine/xr_input.cpp +++ b/src/xrEngine/xr_input.cpp @@ -14,9 +14,9 @@ ENGINE_API float psMouseSens = 1.f; ENGINE_API float psMouseSensScale = 1.f; ENGINE_API Flags32 psMouseInvert = {false}; -ENGINE_API float psControllerSens = 1.f; -ENGINE_API float psControllerSensScale = 1.f; -ENGINE_API float psControllerDeadZoneSens = 0.f; +ENGINE_API float psControllerStickSens = 1.f; +ENGINE_API float psControllerStickSensScale = 1.f; +ENGINE_API float psControllerStickDeadZone = 0.f; ENGINE_API Flags32 psControllerInvertY = { false }; static bool AltF4Pressed = false; @@ -265,7 +265,7 @@ void CInput::ControllerUpdate() if (!IsControllerAvailable()) return; - const int controllerDeadZone = int(psControllerDeadZoneSens * (SDL_JOYSTICK_AXIS_MAX / 100.f)); // raw + const int controllerDeadZone = int(psControllerStickDeadZone * (SDL_JOYSTICK_AXIS_MAX / 100.f)); // raw const auto controllerPrev = controllerState; decltype(controllerAxisState) controllerAxisStatePrev; diff --git a/src/xrEngine/xr_ioc_cmd.cpp b/src/xrEngine/xr_ioc_cmd.cpp index 3cb04f3e183..e4f927a2830 100644 --- a/src/xrEngine/xr_ioc_cmd.cpp +++ b/src/xrEngine/xr_ioc_cmd.cpp @@ -839,10 +839,10 @@ void CCC_Register() // Gamepad CMD3(CCC_Mask, "gamepad_invert_y", &psControllerInvertY, 1); - psControllerSens = 0.02f; - CMD4(CCC_Float, "gamepad_sens", &psControllerSens, 0.001f, 0.6f); - psControllerDeadZoneSens = 15.f; - CMD4(CCC_Float, "gamepad_deadzone_sens", &psControllerDeadZoneSens, 1.f, 35.f); + psControllerStickSens = 0.02f; + CMD4(CCC_Float, "gamepad_stick_sens", &psControllerStickSens, 0.001f, 0.6f); + psControllerStickDeadZone = 15.f; + CMD4(CCC_Float, "gamepad_stick_deadzone", &psControllerStickDeadZone, 1.f, 35.f); // Camera CMD2(CCC_Float, "cam_inert", &psCamInert); diff --git a/src/xrGame/ActorInput.cpp b/src/xrGame/ActorInput.cpp index 2baa1d0aeb3..f86cd1752ab 100644 --- a/src/xrGame/ActorInput.cpp +++ b/src/xrGame/ActorInput.cpp @@ -410,7 +410,7 @@ void CActor::IR_OnControllerPress(int cmd, float x, float y) { const float LookFactor = GetLookFactor(); CCameraBase* C = cameras[cam_active]; - float scale = (cam_Active()->f_fov / g_fov) * psControllerSens * psControllerSensScale / 50.f / LookFactor; + float scale = (cam_Active()->f_fov / g_fov) * psControllerStickSens * psControllerStickSensScale / 50.f / LookFactor; OnAxisMove(x, y, scale, psControllerInvertY.test(1)); break; } @@ -506,7 +506,7 @@ void CActor::IR_OnControllerHold(int cmd, float x, float y) { const float LookFactor = GetLookFactor(); CCameraBase* C = cameras[cam_active]; - float scale = (cam_Active()->f_fov / g_fov) * psControllerSens * psControllerSensScale / 50.f / LookFactor; + float scale = (cam_Active()->f_fov / g_fov) * psControllerStickSens * psControllerStickSensScale / 50.f / LookFactor; OnAxisMove(x, y, scale, psControllerInvertY.test(1)); break; } diff --git a/src/xrGame/CarInput.cpp b/src/xrGame/CarInput.cpp index 6a8ef41ba7d..c217ab0d900 100644 --- a/src/xrGame/CarInput.cpp +++ b/src/xrGame/CarInput.cpp @@ -236,7 +236,7 @@ void CCar::OnControllerPress(int cmd, float x, float y) { case kLOOK_AROUND: { - const float scale = (active_camera->f_fov / g_fov) * psControllerSens * psControllerSensScale / 50.f; + const float scale = (active_camera->f_fov / g_fov) * psControllerStickSens * psControllerStickSensScale / 50.f; OnAxisMove(x, y, scale, psControllerInvertY.test(1)); break; } @@ -298,7 +298,7 @@ void CCar::OnControllerHold(int cmd, float x, float y) { case kLOOK_AROUND: { - const float scale = (active_camera->f_fov / g_fov) * psControllerSens * psControllerSensScale / 50.f; + const float scale = (active_camera->f_fov / g_fov) * psControllerStickSens * psControllerStickSensScale / 50.f; OnAxisMove(x, y, scale, psControllerInvertY.test(1)); break; } diff --git a/src/xrGame/WeaponStatMgunIR.cpp b/src/xrGame/WeaponStatMgunIR.cpp index 8577cc8a694..96fcc08045f 100644 --- a/src/xrGame/WeaponStatMgunIR.cpp +++ b/src/xrGame/WeaponStatMgunIR.cpp @@ -66,7 +66,7 @@ void CWeaponStatMgun::OnControllerPress(int cmd, float x, float y) { case kLOOK_AROUND: { - const float scale = psControllerSens * psControllerSensScale / 50.f; + const float scale = psControllerStickSens * psControllerStickSensScale / 50.f; OnAxisMove(x, y, scale, psControllerInvertY.test(1)); break; } @@ -101,7 +101,7 @@ void CWeaponStatMgun::OnControllerHold(int cmd, float x, float y) switch (cmd) { case kLOOK_AROUND: - const float scale = psControllerSens * psControllerSensScale / 50.f; + const float scale = psControllerStickSens * psControllerStickSensScale / 50.f; OnAxisMove(x, y, scale, psControllerInvertY.test(1)); break; }; // switch (cmd)