diff --git a/src/core/analog_controller.cpp b/src/core/analog_controller.cpp index 1f8393891..16f8edfce 100644 --- a/src/core/analog_controller.cpp +++ b/src/core/analog_controller.cpp @@ -819,17 +819,17 @@ static const SettingInfo s_settings[] = { {SettingInfo::Type::Float, "AnalogDeadzone", TRANSLATE_NOOP("AnalogController", "Analog Deadzone"), TRANSLATE_NOOP("AnalogController", "Sets the analog stick deadzone, i.e. the fraction of the stick movement which will be ignored."), - "0.00f", "0.00f", "1.00f", "0.01f", "%.0f%%", nullptr, 100.0f}, + "0", "0", "1", "0.01", "%.0f%%", nullptr, 100.0f}, {SettingInfo::Type::Float, "AnalogSensitivity", TRANSLATE_NOOP("AnalogController", "Analog Sensitivity"), TRANSLATE_NOOP( "AnalogController", "Sets the analog stick axis scaling factor. A value between 130% and 140% is recommended when using recent " "controllers, e.g. DualShock 4, Xbox One Controller."), - "1.33f", "0.01f", "2.00f", "0.01f", "%.0f%%", nullptr, 100.0f}, + "1.33", "0.01", "2", "0.01", "%.0f%%", nullptr, 100.0f}, {SettingInfo::Type::Float, "ButtonDeadzone", TRANSLATE_NOOP("AnalogController", "Button/Trigger Deadzone"), TRANSLATE_NOOP("AnalogController", "Sets the deadzone for activating buttons/triggers, " "i.e. the fraction of the trigger which will be ignored."), - "0.25", "0.01", "1.00", "0.01", "%.0f%%", nullptr, 100.0f}, + "0.25", "0.01", "1", "0.01", "%.0f%%", nullptr, 100.0f}, {SettingInfo::Type::Integer, "LargeMotorVibrationBias", TRANSLATE_NOOP("AnalogController", "Large Motor Vibration Bias"), TRANSLATE_NOOP("AnalogController", diff --git a/src/core/analog_joystick.cpp b/src/core/analog_joystick.cpp index ac87d5540..c9429ebd6 100644 --- a/src/core/analog_joystick.cpp +++ b/src/core/analog_joystick.cpp @@ -392,13 +392,13 @@ static const SettingInfo s_settings[] = { {SettingInfo::Type::Float, "AnalogDeadzone", TRANSLATE_NOOP("AnalogJoystick", "Analog Deadzone"), TRANSLATE_NOOP("AnalogJoystick", "Sets the analog stick deadzone, i.e. the fraction of the stick movement which will be ignored."), - "1.00f", "0.00f", "1.00f", "0.01f", "%.0f%%", nullptr, 100.0f}, + "0", "0", "1", "0.01", "%.0f%%", nullptr, 100.0f}, {SettingInfo::Type::Float, "AnalogSensitivity", TRANSLATE_NOOP("AnalogJoystick", "Analog Sensitivity"), TRANSLATE_NOOP( "AnalogJoystick", "Sets the analog stick axis scaling factor. A value between 130% and 140% is recommended when using recent " "controllers, e.g. DualShock 4, Xbox One Controller."), - "1.33f", "0.01f", "2.00f", "0.01f", "%.0f%%", nullptr, 100.0f}, + "1.33", "0.01", "2", "0.01", "%.0f%%", nullptr, 100.0f}, {SettingInfo::Type::IntegerList, "InvertLeftStick", TRANSLATE_NOOP("AnalogJoystick", "Invert Left Stick"), TRANSLATE_NOOP("AnalogJoystick", "Inverts the direction of the left analog stick."), "0", "0", "3", nullptr, nullptr, s_invert_settings, 0.0f}, diff --git a/src/core/controller.h b/src/core/controller.h index 74b62c660..64c88df36 100644 --- a/src/core/controller.h +++ b/src/core/controller.h @@ -18,7 +18,6 @@ class SettingsInterface; class StateWrapper; -class HostInterface; class Controller { diff --git a/src/core/ddgo_controller.cpp b/src/core/ddgo_controller.cpp index dc9e6ea24..1862e156d 100644 --- a/src/core/ddgo_controller.cpp +++ b/src/core/ddgo_controller.cpp @@ -339,13 +339,13 @@ static const SettingInfo s_settings[] = { {SettingInfo::Type::Float, "AnalogDeadzone", TRANSLATE_NOOP("DDGoController", "Analog Deadzone"), TRANSLATE_NOOP("DDGoController", "Sets the analog stick deadzone, i.e. the fraction of the stick movement which will be ignored."), - "0.00f", "0.00f", "1.00f", "0.01f", "%.0f%%", nullptr, 100.0f}, + "0", "0", "1", "0.01", "%.0f%%", nullptr, 100.0f}, {SettingInfo::Type::Float, "AnalogSensitivity", TRANSLATE_NOOP("DDGoController", "Analog Sensitivity"), TRANSLATE_NOOP( "DDGoController", "Sets the analog stick axis scaling factor. A value between 130% and 140% is recommended when using recent " "controllers, e.g. DualShock 4, Xbox One Controller."), - "1.33f", "0.01f", "2.00f", "0.01f", "%.0f%%", nullptr, 100.0f}, + "1.33", "0.01", "2", "0.01", "%.0f%%", nullptr, 100.0f}, {SettingInfo::Type::Integer, "PowerTransitionFrames", TRANSLATE_NOOP("DDGoController", "Power Transition Frames"), TRANSLATE_NOOP("DDGoController", "Sets the number of frames that the controller will report the " "transitioning/inbetween state when changing power level."), diff --git a/src/core/guncon.cpp b/src/core/guncon.cpp index f947fed72..90aafc760 100644 --- a/src/core/guncon.cpp +++ b/src/core/guncon.cpp @@ -293,7 +293,7 @@ static const SettingInfo s_settings[] = { TRANSLATE_NOOP("GunCon", "Path to an image to use as a crosshair/cursor."), DEFAULT_CROSSHAIR_PATH, nullptr, nullptr, nullptr, nullptr, nullptr, 0.0f}, {SettingInfo::Type::Float, "CrosshairScale", TRANSLATE_NOOP("GunCon", "Crosshair Image Scale"), - TRANSLATE_NOOP("GunCon", "Scale of crosshair image on screen."), "1.0", "0.0001", "100.0", "0.10", "%.0f%%", nullptr, + TRANSLATE_NOOP("GunCon", "Scale of crosshair image on screen."), "1", "0.0001", "100", "0.1", "%.0f%%", nullptr, 100.0f}, {SettingInfo::Type::String, "CrosshairColor", TRANSLATE_NOOP("GunCon", "Cursor Color"), TRANSLATE_NOOP("GunCon", "Applies a color to the chosen crosshair images, can be used for multiple players. Specify " diff --git a/src/core/jogcon.cpp b/src/core/jogcon.cpp index a4c90b70f..797a9106e 100644 --- a/src/core/jogcon.cpp +++ b/src/core/jogcon.cpp @@ -662,20 +662,20 @@ static const SettingInfo s_settings[] = { {SettingInfo::Type::Float, "AnalogDeadzone", TRANSLATE_NOOP("JogCon", "Analog Deadzone"), TRANSLATE_NOOP("JogCon", "Sets the analog stick deadzone, i.e. the fraction of the stick movement which will be ignored."), - "0.00f", "0.00f", "1.00f", "0.01f", "%.0f%%", nullptr, 100.0f}, + "0", "0", "1", "0.01", "%.0f%%", nullptr, 100.0f}, {SettingInfo::Type::Float, "AnalogSensitivity", TRANSLATE_NOOP("JogCon", "Analog Sensitivity"), TRANSLATE_NOOP("JogCon", "Sets the analog stick axis scaling factor. A value between 130% and 140% is recommended " "when using recent controllers, e.g. DualShock 4, Xbox One Controller."), - "1.33f", "0.01f", "2.00f", "0.01f", "%.0f%%", nullptr, 100.0f}, + "1.33", "0.01", "2", "0.01", "%.0f%%", nullptr, 100.0f}, {SettingInfo::Type::Float, "ButtonDeadzone", TRANSLATE_NOOP("JogCon", "Button/Trigger Deadzone"), TRANSLATE_NOOP( "JogCon", "Sets the deadzone for activating buttons/triggers, i.e. the fraction of the trigger which will be ignored."), - "0.25", "0.01", "1.00", "0.01", "%.0f%%", nullptr, 100.0f}, + "0.25", "0.01", "1", "0.01", "%.0f%%", nullptr, 100.0f}, {SettingInfo::Type::Float, "SteeringHoldDeadzone", TRANSLATE_NOOP("JogCon", "Steering Hold Deadzone"), TRANSLATE_NOOP( "JogCon", "Sets the deadzone for holding the wheel at the set position, i.e. when it will not trigger an effect."), - "0.03", "0.01", "1.00", "0.01", "%.0f%%", nullptr, 100.0f}, + "0.03", "0.01", "1", "0.01", "%.0f%%", nullptr, 100.0f}, }; const Controller::ControllerInfo JogCon::INFO = { diff --git a/src/core/justifier.cpp b/src/core/justifier.cpp index 583633249..d3dfdc3a0 100644 --- a/src/core/justifier.cpp +++ b/src/core/justifier.cpp @@ -366,16 +366,16 @@ static const SettingInfo s_settings[] = { TRANSLATE_NOOP("Justifier", "Path to an image to use as a crosshair/cursor."), DEFAULT_CROSSHAIR_PATH, nullptr, nullptr, nullptr, nullptr, nullptr, 0.0f}, {SettingInfo::Type::Float, "CrosshairScale", TRANSLATE_NOOP("Justifier", "Crosshair Image Scale"), - TRANSLATE_NOOP("Justifier", "Scale of crosshair image on screen."), "1.0", "0.0001", "100.0", "0.10", "%.0f%%", - nullptr, 100.0f}, + TRANSLATE_NOOP("Justifier", "Scale of crosshair image on screen."), "1", "0.0001", "100", "0.1", "%.0f%%", nullptr, + 100.0f}, {SettingInfo::Type::String, "CrosshairColor", TRANSLATE_NOOP("Justifier", "Cursor Color"), TRANSLATE_NOOP("Justifier", "Applies a color to the chosen crosshair images, can be used for multiple players. Specify " "in HTML/CSS format (e.g. #aabbcc)"), "#ffffff", nullptr, nullptr, nullptr, nullptr, nullptr, 0.0f}, {SettingInfo::Type::Float, "XScale", TRANSLATE_NOOP("Justifier", "X Scale"), - TRANSLATE_NOOP("Justifier", "Scales X coordinates relative to the center of the screen."), "1.0", "0.01", "2.0", - "0.01", "%.0f%%", nullptr, 100.0f}, + TRANSLATE_NOOP("Justifier", "Scales X coordinates relative to the center of the screen."), "1", "0.01", "2", "0.01", + "%.0f%%", nullptr, 100.0f}, {SettingInfo::Type::Integer, "FirstLineOffset", TRANSLATE_NOOP("Justifier", "Line Start Offset"), TRANSLATE_NOOP("Justifier", "Offset applied to lightgun vertical position that the Justifier will first trigger on."), diff --git a/src/core/negcon.cpp b/src/core/negcon.cpp index 1f01553eb..633419d2b 100644 --- a/src/core/negcon.cpp +++ b/src/core/negcon.cpp @@ -293,53 +293,37 @@ static const Controller::ControllerBindingInfo s_binding_info[] = { static const SettingInfo s_settings[] = { {SettingInfo::Type::Float, "SteeringDeadzone", TRANSLATE_NOOP("NeGcon", "Steering Axis Deadzone"), - TRANSLATE_NOOP("NeGcon", "Sets deadzone for steering axis."), "0.00f", "0.00f", "0.99f", "0.01f", "%.0f%%", nullptr, - 100.0f}, + TRANSLATE_NOOP("NeGcon", "Sets deadzone for steering axis."), "0", "0", "0.99", "0.01", "%.0f%%", nullptr, 100.0f}, {SettingInfo::Type::Float, "SteeringSaturation", TRANSLATE_NOOP("NeGcon", "Steering Axis Saturation"), - TRANSLATE_NOOP("NeGcon", "Sets saturation for steering axis."), "1.00f", "0.01f", "1.00f", "0.01f", "%.0f%%", - nullptr, 100.0f}, + TRANSLATE_NOOP("NeGcon", "Sets saturation for steering axis."), "1", "0.01", "1", "0.01", "%.0f%%", nullptr, 100.0f}, {SettingInfo::Type::Float, "SteeringLinearity", TRANSLATE_NOOP("NeGcon", "Steering Axis Linearity"), - TRANSLATE_NOOP("NeGcon", "Sets linearity for steering axis."), "0.00f", "-2.00f", "2.00f", "0.05f", "%.2f", nullptr, - 1.0f}, + TRANSLATE_NOOP("NeGcon", "Sets linearity for steering axis."), "0", "-2", "2", "0.05", "%.2f", nullptr, 1.0f}, {SettingInfo::Type::Float, "SteeringScaling", TRANSLATE_NOOP("NeGcon", "Steering Scaling"), - TRANSLATE_NOOP("NeGcon", "Sets scaling for steering axis."), "1.00f", "0.01f", "10.00f", "0.01f", "%.0f%%", nullptr, - 100.0f}, + TRANSLATE_NOOP("NeGcon", "Sets scaling for steering axis."), "1", "0.01", "10", "0.01", "%.0f%%", nullptr, 100.0f}, {SettingInfo::Type::Float, "IDeadzone", TRANSLATE_NOOP("NeGcon", "I Button Deadzone"), - TRANSLATE_NOOP("NeGcon", "Sets deadzone for button I."), "0.00f", "0.00f", "0.99f", "0.01f", "%.0f%%", nullptr, - 100.0f}, + TRANSLATE_NOOP("NeGcon", "Sets deadzone for button I."), "0", "0", "0.99", "0.01", "%.0f%%", nullptr, 100.0f}, {SettingInfo::Type::Float, "ISaturation", TRANSLATE_NOOP("NeGcon", "I Button Saturation"), - TRANSLATE_NOOP("NeGcon", "Sets saturation for button I."), "1.00f", "0.01f", "1.00f", "0.01f", "%.0f%%", nullptr, - 100.0f}, + TRANSLATE_NOOP("NeGcon", "Sets saturation for button I."), "1", "0.01", "1", "0.01", "%.0f%%", nullptr, 100.0f}, {SettingInfo::Type::Float, "ILinearity", TRANSLATE_NOOP("NeGcon", "I Button Linearity"), - TRANSLATE_NOOP("NeGcon", "Sets linearity for button I."), "0.00f", "-2.00f", "2.00f", "0.01f", "%.2f", nullptr, - 1.0f}, + TRANSLATE_NOOP("NeGcon", "Sets linearity for button I."), "0", "-2", "2", "0.01", "%.2f", nullptr, 1.0f}, {SettingInfo::Type::Float, "IScaling", TRANSLATE_NOOP("NeGcon", "I Scaling"), - TRANSLATE_NOOP("NeGcon", "Sets scaling for button I."), "1.00f", "0.01f", "10.00f", "0.01f", "%.0f%%", nullptr, - 100.0f}, + TRANSLATE_NOOP("NeGcon", "Sets scaling for button I."), "1", "0.01", "10", "0.01", "%.0f%%", nullptr, 100.0f}, {SettingInfo::Type::Float, "IIDeadzone", TRANSLATE_NOOP("NeGcon", "II Button Deadzone"), - TRANSLATE_NOOP("NeGcon", "Sets deadzone for button II."), "0.00f", "0.00f", "0.99f", "0.01f", "%.0f%%", nullptr, - 100.0f}, + TRANSLATE_NOOP("NeGcon", "Sets deadzone for button II."), "0", "0", "0.99", "0.01", "%.0f%%", nullptr, 100.0f}, {SettingInfo::Type::Float, "IISaturation", TRANSLATE_NOOP("NeGcon", "II Button Saturation"), - TRANSLATE_NOOP("NeGcon", "Sets saturation for button II."), "1.00f", "0.01f", "1.00f", "0.01f", "%.0f%%", nullptr, - 100.0f}, + TRANSLATE_NOOP("NeGcon", "Sets saturation for button II."), "1", "0.01", "1", "0.01", "%.0f%%", nullptr, 100.0f}, {SettingInfo::Type::Float, "IILinearity", TRANSLATE_NOOP("NeGcon", "II Button Linearity"), - TRANSLATE_NOOP("NeGcon", "Sets linearity for button II."), "0.00f", "-2.00f", "2.00f", "0.01f", "%.2f", nullptr, - 1.0f}, + TRANSLATE_NOOP("NeGcon", "Sets linearity for button II."), "0", "-2", "2", "0.01", "%.2f", nullptr, 1.0f}, {SettingInfo::Type::Float, "IIScaling", TRANSLATE_NOOP("NeGcon", "II Scaling"), - TRANSLATE_NOOP("NeGcon", "Sets scaling for button II."), "1.00f", "0.01f", "10.00f", "0.01f", "%.0f%%", nullptr, - 100.0f}, + TRANSLATE_NOOP("NeGcon", "Sets scaling for button II."), "1", "0.01", "10", "0.01", "%.0f%%", nullptr, 100.0f}, {SettingInfo::Type::Float, "LDeadzone", TRANSLATE_NOOP("NeGcon", "Left Trigger Deadzone"), - TRANSLATE_NOOP("NeGcon", "Sets deadzone for left trigger."), "0.00f", "0.00f", "0.99f", "0.01f", "%.0f%%", nullptr, - 100.0f}, + TRANSLATE_NOOP("NeGcon", "Sets deadzone for left trigger."), "0", "0", "0.99", "0.01", "%.0f%%", nullptr, 100.0f}, {SettingInfo::Type::Float, "LSaturation", TRANSLATE_NOOP("NeGcon", "Left Trigger Saturation"), - TRANSLATE_NOOP("NeGcon", "Sets saturation for left trigger."), "1.00f", "0.01f", "1.00f", "0.01f", "%.0f%%", nullptr, - 100.0f}, + TRANSLATE_NOOP("NeGcon", "Sets saturation for left trigger."), "1", "0.01", "1", "0.01", "%.0f%%", nullptr, 100.0f}, {SettingInfo::Type::Float, "LLinearity", TRANSLATE_NOOP("NeGcon", "Left Trigger Linearity"), - TRANSLATE_NOOP("NeGcon", "Sets linearity for left trigger."), "0.00f", "-2.00f", "2.00f", "0.01f", "%.2f", nullptr, - 1.0f}, + TRANSLATE_NOOP("NeGcon", "Sets linearity for left trigger."), "0", "-2", "2", "0.01", "%.2f", nullptr, 1.0f}, {SettingInfo::Type::Float, "LScaling", TRANSLATE_NOOP("NeGcon", "Left Trigger Scaling"), - TRANSLATE_NOOP("NeGcon", "Sets scaling for left trigger."), "1.00f", "0.01f", "10.00f", "0.01f", "%.0f%%", nullptr, - 100.0f}, + TRANSLATE_NOOP("NeGcon", "Sets scaling for left trigger."), "1", "0.01", "10", "0.01", "%.0f%%", nullptr, 100.0f}, }; const Controller::ControllerInfo NeGcon::INFO = { diff --git a/src/core/negcon_rumble.cpp b/src/core/negcon_rumble.cpp index 13861b5cb..9706a6b2b 100644 --- a/src/core/negcon_rumble.cpp +++ b/src/core/negcon_rumble.cpp @@ -753,11 +753,11 @@ static const Controller::ControllerBindingInfo s_binding_info[] = { static const SettingInfo s_settings[] = { {SettingInfo::Type::Float, "SteeringDeadzone", TRANSLATE_NOOP("NeGconRumble", "Steering Axis Deadzone"), - TRANSLATE_NOOP("NeGconRumble", "Sets deadzone size for steering axis."), "0.00f", "0.00f", "0.99f", "0.01f", - "%.0f%%", nullptr, 100.0f}, + TRANSLATE_NOOP("NeGconRumble", "Sets deadzone size for steering axis."), "0", "0", "0.99", "0.01", "%.0f%%", nullptr, + 100.0f}, {SettingInfo::Type::Float, "SteeringSensitivity", TRANSLATE_NOOP("NeGconRumble", "Steering Axis Sensitivity"), - TRANSLATE_NOOP("NeGconRumble", "Sets the steering axis scaling factor."), "1.00f", "0.01f", "2.00f", "0.01f", - "%.0f%%", nullptr, 100.0f}, + TRANSLATE_NOOP("NeGconRumble", "Sets the steering axis scaling factor."), "1", "0.01", "2", "0.01", "%.0f%%", + nullptr, 100.0f}, {SettingInfo::Type::Integer, "LargeMotorVibrationBias", TRANSLATE_NOOP("NeGconRumble", "Large Motor Vibration Bias"), TRANSLATE_NOOP("NeGconRumble", "Sets the bias value for the large vibration motor. If vibration in some games is too weak or not " diff --git a/src/core/playstation_mouse.cpp b/src/core/playstation_mouse.cpp index 4e71e4e8d..b0c1c70df 100644 --- a/src/core/playstation_mouse.cpp +++ b/src/core/playstation_mouse.cpp @@ -208,11 +208,11 @@ static const Controller::ControllerBindingInfo s_binding_info[] = { }; static const SettingInfo s_settings[] = { {SettingInfo::Type::Float, "SensitivityX", TRANSLATE_NOOP("PlayStationMouse", "Horizontal Sensitivity"), - TRANSLATE_NOOP("PlayStationMouse", "Adjusts the correspondance between physical and virtual mouse movement."), "1.0", - "0.01", "2.0", "0.01", "%.0f", nullptr, 100.0f}, + TRANSLATE_NOOP("PlayStationMouse", "Adjusts the correspondance between physical and virtual mouse movement."), "1", + "0.01", "2", "0.01", "%.0f", nullptr, 100.0f}, {SettingInfo::Type::Float, "SensitivityY", TRANSLATE_NOOP("PlayStationMouse", "Vertical Sensitivity"), - TRANSLATE_NOOP("PlayStationMouse", "Adjusts the correspondance between physical and virtual mouse movement."), "1.0", - "0.01", "2.0", "0.01", "%.0f", nullptr, 100.0f}, + TRANSLATE_NOOP("PlayStationMouse", "Adjusts the correspondance between physical and virtual mouse movement."), "1", + "0.01", "2", "0.01", "%.0f", nullptr, 100.0f}, }; const Controller::ControllerInfo PlayStationMouse::INFO = {ControllerType::PlayStationMouse,