diff --git a/rpcs3/Emu/Io/PadHandler.cpp b/rpcs3/Emu/Io/PadHandler.cpp index bc61efc895..4fc8fa6376 100644 --- a/rpcs3/Emu/Io/PadHandler.cpp +++ b/rpcs3/Emu/Io/PadHandler.cpp @@ -170,7 +170,7 @@ u16 PadHandlerBase::ConvertAxis(f32 value) // The DS3, (and i think xbox controllers) give a 'square-ish' type response, so that the corners will give (almost)max x/y instead of the ~30x30 from a perfect circle // using a simple scale/sensitivity increase would *work* although it eats a chunk of our usable range in exchange -// this might be the best for now, in practice it seems to push the corners to max of 20x20, with a squircle_factor of 8000 +// this might be the best for now, in practice it seems to push the corners to max of 20x20, with a squircle_factor of ~4000 // This function assumes inX and inY is already in 0-255 void PadHandlerBase::ConvertToSquirclePoint(u16& inX, u16& inY, u32 squircle_factor) { diff --git a/rpcs3/Emu/Io/pad_config.h b/rpcs3/Emu/Io/pad_config.h index 5f8ea18a74..fa695c4941 100644 --- a/rpcs3/Emu/Io/pad_config.h +++ b/rpcs3/Emu/Io/pad_config.h @@ -88,8 +88,8 @@ struct cfg_pad final : cfg::node cfg::uint<0, 1000000> rstick_anti_deadzone{ this, "Right Stick Anti-Deadzone", 0 }; cfg::uint<0, 1000000> ltriggerthreshold{ this, "Left Trigger Threshold", 0 }; cfg::uint<0, 1000000> rtriggerthreshold{ this, "Right Trigger Threshold", 0 }; - cfg::uint<0, 1000000> lpadsquircling{ this, "Left Pad Squircling Factor", 8000 }; - cfg::uint<0, 1000000> rpadsquircling{ this, "Right Pad Squircling Factor", 8000 }; + cfg::uint<0, 1000000> lpadsquircling{ this, "Left Pad Squircling Factor", 4000 }; + cfg::uint<0, 1000000> rpadsquircling{ this, "Right Pad Squircling Factor", 4000 }; cfg::uint<0, 255> colorR{ this, "Color Value R", 0 }; cfg::uint<0, 255> colorG{ this, "Color Value G", 0 }; diff --git a/rpcs3/Input/ds4_pad_handler.cpp b/rpcs3/Input/ds4_pad_handler.cpp index 0eebc1183a..77c59fc48f 100644 --- a/rpcs3/Input/ds4_pad_handler.cpp +++ b/rpcs3/Input/ds4_pad_handler.cpp @@ -189,8 +189,6 @@ void ds4_pad_handler::init_config(cfg_pad* cfg) cfg->rstickdeadzone.def = 40; // between 0 and 255 cfg->ltriggerthreshold.def = 0; // between 0 and 255 cfg->rtriggerthreshold.def = 0; // between 0 and 255 - cfg->lpadsquircling.def = 8000; - cfg->rpadsquircling.def = 8000; // Set default color value cfg->colorR.def = 0; diff --git a/rpcs3/Input/dualsense_pad_handler.cpp b/rpcs3/Input/dualsense_pad_handler.cpp index 70ddecdb79..5585c0ef12 100644 --- a/rpcs3/Input/dualsense_pad_handler.cpp +++ b/rpcs3/Input/dualsense_pad_handler.cpp @@ -262,8 +262,6 @@ void dualsense_pad_handler::init_config(cfg_pad* cfg) cfg->rstickdeadzone.def = 40; // between 0 and 255 cfg->ltriggerthreshold.def = 0; // between 0 and 255 cfg->rtriggerthreshold.def = 0; // between 0 and 255 - cfg->lpadsquircling.def = 8000; - cfg->rpadsquircling.def = 8000; // Set default color value cfg->colorR.def = 0; diff --git a/rpcs3/Input/evdev_joystick_handler.cpp b/rpcs3/Input/evdev_joystick_handler.cpp index a9011af5cc..6ddb0ff989 100644 --- a/rpcs3/Input/evdev_joystick_handler.cpp +++ b/rpcs3/Input/evdev_joystick_handler.cpp @@ -120,8 +120,6 @@ void evdev_joystick_handler::init_config(cfg_pad* cfg) cfg->rstickdeadzone.def = 30; // between 0 and 255 cfg->ltriggerthreshold.def = 0; // between 0 and 255 cfg->rtriggerthreshold.def = 0; // between 0 and 255 - cfg->lpadsquircling.def = 8000; - cfg->rpadsquircling.def = 8000; // apply defaults cfg->from_default(); diff --git a/rpcs3/Input/keyboard_pad_handler.cpp b/rpcs3/Input/keyboard_pad_handler.cpp index d470d4a4e5..c9da8dcb29 100644 --- a/rpcs3/Input/keyboard_pad_handler.cpp +++ b/rpcs3/Input/keyboard_pad_handler.cpp @@ -68,8 +68,6 @@ void keyboard_pad_handler::init_config(cfg_pad* cfg) cfg->rstickdeadzone.def = 0; cfg->ltriggerthreshold.def = 0; cfg->rtriggerthreshold.def = 0; - cfg->lpadsquircling.def = 8000; - cfg->rpadsquircling.def = 8000; // apply defaults cfg->from_default(); diff --git a/rpcs3/Input/mm_joystick_handler.cpp b/rpcs3/Input/mm_joystick_handler.cpp index 299788e254..cbe9b60223 100644 --- a/rpcs3/Input/mm_joystick_handler.cpp +++ b/rpcs3/Input/mm_joystick_handler.cpp @@ -62,8 +62,6 @@ void mm_joystick_handler::init_config(cfg_pad* cfg) cfg->rstickdeadzone.def = 0; // between 0 and 255 cfg->ltriggerthreshold.def = 0; // between 0 and 255 cfg->rtriggerthreshold.def = 0; // between 0 and 255 - cfg->lpadsquircling.def = 8000; - cfg->rpadsquircling.def = 8000; // apply defaults cfg->from_default(); diff --git a/rpcs3/Input/sdl_pad_handler.cpp b/rpcs3/Input/sdl_pad_handler.cpp index 76af1df859..1b6ddbc40c 100644 --- a/rpcs3/Input/sdl_pad_handler.cpp +++ b/rpcs3/Input/sdl_pad_handler.cpp @@ -158,8 +158,6 @@ void sdl_pad_handler::init_config(cfg_pad* cfg) cfg->rstickdeadzone.def = 8000; // between 0 and SDL_JOYSTICK_AXIS_MAX cfg->ltriggerthreshold.def = 0; // between 0 and SDL_JOYSTICK_AXIS_MAX cfg->rtriggerthreshold.def = 0; // between 0 and SDL_JOYSTICK_AXIS_MAX - cfg->lpadsquircling.def = 8000; - cfg->rpadsquircling.def = 8000; // Set default color value cfg->colorR.def = 0; diff --git a/rpcs3/Input/xinput_pad_handler.cpp b/rpcs3/Input/xinput_pad_handler.cpp index 101e9dba67..4feec000e3 100644 --- a/rpcs3/Input/xinput_pad_handler.cpp +++ b/rpcs3/Input/xinput_pad_handler.cpp @@ -128,8 +128,6 @@ void xinput_pad_handler::init_config(cfg_pad* cfg) cfg->rstickdeadzone.def = XINPUT_GAMEPAD_RIGHT_THUMB_DEADZONE; // between 0 and 32767 cfg->ltriggerthreshold.def = XINPUT_GAMEPAD_TRIGGER_THRESHOLD; // between 0 and 255 cfg->rtriggerthreshold.def = XINPUT_GAMEPAD_TRIGGER_THRESHOLD; // between 0 and 255 - cfg->lpadsquircling.def = 8000; - cfg->rpadsquircling.def = 8000; // apply defaults cfg->from_default();