diff --git a/common/accel-power.hpp b/common/accel-power.hpp index 8e3f417..afc7738 100644 --- a/common/accel-power.hpp +++ b/common/accel-power.hpp @@ -30,7 +30,7 @@ namespace rawaccel { */ offset = {}; constant = 0; - scale = scale_from_sens_point(args.cap.x, args.cap.y, n, constant); + scale = scale_from_output_point(args.cap.x, args.cap.y, n, constant); return; } @@ -64,9 +64,9 @@ namespace rawaccel { return pow(gain / (power + 1), 1 / power) / input; } - static double scale_from_sens_point(double input, double sens, double power, double C) + static double scale_from_output_point(double input, double output, double power, double C) { - return pow(sens - C / input, 1 / power) / input; + return pow(output - C / input, 1 / power) / input; } }; diff --git a/common/rawaccel-base.hpp b/common/rawaccel-base.hpp index dd29e89..2789847 100644 --- a/common/rawaccel-base.hpp +++ b/common/rawaccel-base.hpp @@ -85,9 +85,9 @@ namespace rawaccel { speed_args speed_processor_args; double output_dpi = NORMALIZED_DPI; - double yx_sens_ratio = 1; - double lr_sens_ratio = 1; - double ud_sens_ratio = 1; + double yx_output_dpi_ratio = 1; + double lr_output_dpi_ratio = 1; + double ud_output_dpi_ratio = 1; double degrees_rotation = 0; diff --git a/common/rawaccel-validate.hpp b/common/rawaccel-validate.hpp index dc4a797..2f4d1e6 100644 --- a/common/rawaccel-validate.hpp +++ b/common/rawaccel-validate.hpp @@ -154,11 +154,11 @@ namespace rawaccel { } if (args.output_dpi == 0) { - error("sens multiplier is 0"); + error("output DPI is 0"); } - if (args.yx_sens_ratio == 0) { - error("Y/X sens ratio is 0"); + if (args.yx_output_dpi_ratio == 0) { + error("Y/X output DPI ratio is 0"); } if (args.domain_weights.x <= 0 || @@ -166,8 +166,8 @@ namespace rawaccel { error("domain weights"" must be positive"); } - if (args.lr_sens_ratio <= 0 || args.ud_sens_ratio <= 0) { - error("sens ratio must be positive"); + if (args.lr_output_dpi_ratio <= 0 || args.ud_output_dpi_ratio <= 0) { + error("output DPI ratio must be positive"); } if (args.speed_processor_args.lp_norm <= 0) { diff --git a/common/rawaccel.hpp b/common/rawaccel.hpp index 3bfe71a..604dc81 100644 --- a/common/rawaccel.hpp +++ b/common/rawaccel.hpp @@ -49,8 +49,8 @@ namespace rawaccel { apply_directional_weight = args.speed_processor_args.whole && args.range_weights.x != args.range_weights.y; compute_ref_angle = apply_snap || apply_directional_weight; - apply_dir_mul_x = args.lr_sens_ratio != 1; - apply_dir_mul_y = args.ud_sens_ratio != 1; + apply_dir_mul_x = args.lr_output_dpi_ratio != 1; + apply_dir_mul_y = args.ud_output_dpi_ratio != 1; } modifier_flags() = default; @@ -411,14 +411,14 @@ namespace rawaccel { double dpi_adjustment = output_dpi_adjustment_factor * dpi_factor; in.x *= dpi_adjustment; - in.y *= dpi_adjustment * args.yx_sens_ratio; + in.y *= dpi_adjustment * args.yx_output_dpi_ratio; if (flags.apply_dir_mul_x && in.x < 0) { - in.x *= args.lr_sens_ratio; + in.x *= args.lr_output_dpi_ratio; } if (flags.apply_dir_mul_y && in.y < 0) { - in.y *= args.ud_sens_ratio; + in.y *= args.ud_output_dpi_ratio; } } diff --git a/grapher/Models/AccelGUI.cs b/grapher/Models/AccelGUI.cs index ed12dbd..0ac77a8 100644 --- a/grapher/Models/AccelGUI.cs +++ b/grapher/Models/AccelGUI.cs @@ -123,7 +123,7 @@ namespace grapher settings.outputDPI = Helper.CalculatOutputDPI(ApplyOptions.Sensitivity.Field.Data); // TODO - separate sensitivity fields, add new label for ratio - settings.yxSensRatio = ApplyOptions.YToXRatio.Value; + settings.yxOutputDPIRatio = ApplyOptions.YToXRatio.Value; settings.inputSpeedArgs.combineMagnitudes = ApplyOptions.IsWhole; ApplyOptions.SetArgsFromActiveValues(ref settings.argsX, ref settings.argsY); diff --git a/grapher/Models/Calculations/AccelCalculator.cs b/grapher/Models/Calculations/AccelCalculator.cs index 00b3782..d7cd8f4 100644 --- a/grapher/Models/Calculations/AccelCalculator.cs +++ b/grapher/Models/Calculations/AccelCalculator.cs @@ -479,7 +479,7 @@ namespace grapher.Models.Calculations } public static bool ShouldStripSens(Profile settings) => - settings.yxSensRatio != 1; + settings.yxOutputDPIRatio != 1; public static bool ShouldStripRot(Profile settings) => settings.rotation > 0; @@ -487,7 +487,7 @@ namespace grapher.Models.Calculations public static (double, double) GetSens(Profile settings) { var sensFactor = Helper.GetSensitivityFactor(settings); - return (sensFactor, sensFactor * settings.yxSensRatio); + return (sensFactor, sensFactor * settings.yxOutputDPIRatio); } public static (double, double) GetRotVector(Profile settings) => diff --git a/grapher/Models/Calculations/Data/AccelDataXYComponential.cs b/grapher/Models/Calculations/Data/AccelDataXYComponential.cs index 47be1ad..3b88807 100644 --- a/grapher/Models/Calculations/Data/AccelDataXYComponential.cs +++ b/grapher/Models/Calculations/Data/AccelDataXYComponential.cs @@ -59,7 +59,7 @@ namespace grapher.Models.Calculations.Data { Clear(); var sensFactor = Helper.GetSensitivityFactor(settings); - var sensY = sensFactor * settings.yxSensRatio; + var sensY = sensFactor * settings.yxOutputDPIRatio; Calculator.Calculate(X, accel, sensFactor, Calculator.SimulatedInputX); Calculator.Calculate(Y, accel, sensY, Calculator.SimulatedInputY); } diff --git a/grapher/Models/Charts/ChartState/ChartStateManager.cs b/grapher/Models/Charts/ChartState/ChartStateManager.cs index 0b4694c..3f0b706 100644 --- a/grapher/Models/Charts/ChartState/ChartStateManager.cs +++ b/grapher/Models/Charts/ChartState/ChartStateManager.cs @@ -56,7 +56,7 @@ namespace grapher.Models.Charts.ChartState if (settings.inputSpeedArgs.combineMagnitudes) { - if (settings.yxSensRatio != 1 || + if (settings.yxOutputDPIRatio != 1 || settings.domainXY.x != settings.domainXY.y || settings.rangeXY.x != settings.rangeXY.y) { diff --git a/grapher/Models/Mouse/MouseWatcher.cs b/grapher/Models/Mouse/MouseWatcher.cs index ed2a0e4..2342672 100644 --- a/grapher/Models/Mouse/MouseWatcher.cs +++ b/grapher/Models/Mouse/MouseWatcher.cs @@ -785,8 +785,8 @@ namespace grapher.Models.Mouse Vec2 dirMults = new Vec2 { - x = SettingsManager.ActiveProfile.lrSensRatio, - y = SettingsManager.ActiveProfile.udSensRatio + x = SettingsManager.ActiveProfile.lrOutputDPIRatio, + y = SettingsManager.ActiveProfile.udOutputDPIRatio }; if (dirMults.x > 0 && x < 0) diff --git a/grapher/Models/Options/ApplyOptions.cs b/grapher/Models/Options/ApplyOptions.cs index f45773d..8288772 100644 --- a/grapher/Models/Options/ApplyOptions.cs +++ b/grapher/Models/Options/ApplyOptions.cs @@ -103,7 +103,7 @@ namespace grapher.Models.Options public void SetActiveValues(Profile settings) { Sensitivity.SetActiveValue(Helper.GetSensitivityFactor(settings)); - YToXRatio.SetActiveValue(settings.yxSensRatio); + YToXRatio.SetActiveValue(settings.yxOutputDPIRatio); Rotation.SetActiveValue(settings.rotation); WholeVectorCheckBox.Checked = settings.inputSpeedArgs.combineMagnitudes; diff --git a/grapher/Models/Serialized/SettingsManager.cs b/grapher/Models/Serialized/SettingsManager.cs index 341f171..cebe025 100644 --- a/grapher/Models/Serialized/SettingsManager.cs +++ b/grapher/Models/Serialized/SettingsManager.cs @@ -201,8 +201,8 @@ namespace grapher.Models.Serialized settings.snap = UserProfile.snap; settings.maximumSpeed = UserProfile.maximumSpeed; settings.minimumSpeed = UserProfile.minimumSpeed; - settings.lrSensRatio = UserProfile.lrSensRatio; - settings.udSensRatio = UserProfile.udSensRatio; + settings.lrOutputDPIRatio = UserProfile.lrOutputDPIRatio; + settings.udOutputDPIRatio = UserProfile.udOutputDPIRatio; } public GUISettings MakeGUISettingsFromFields() diff --git a/wrapper/wrapper.cpp b/wrapper/wrapper.cpp index 3fae663..4f297ff 100644 --- a/wrapper/wrapper.cpp +++ b/wrapper/wrapper.cpp @@ -138,12 +138,12 @@ public ref struct Profile [JsonProperty("Output DPI")] double outputDPI; - [JsonProperty("Y/X sensitivity ratio (vertical sens multiplier)")] - double yxSensRatio; - [JsonProperty("L/R sensitivity ratio (left sens multiplier)")] - double lrSensRatio; - [JsonProperty("U/D sensitivity ratio (up sens multiplier)")] - double udSensRatio; + [JsonProperty("Y/X output DPI ratio (vertical sens multiplier)")] + double yxOutputDPIRatio; + [JsonProperty("L/R output DPI ratio (left sens multiplier)")] + double lrOutputDPIRatio; + [JsonProperty("U/D output DPI ratio (up sens multiplier)")] + double udOutputDPIRatio; [JsonProperty("Degrees of rotation")] double rotation; @@ -179,7 +179,7 @@ public value struct DeviceConfig { [JsonProperty("Use constant time interval based on polling rate", Required = Required::Default)] bool pollTimeLock; - [JsonProperty("DPI (normalizes sens to 1000dpi and converts input speed unit: counts/ms -> in/s)")] + [JsonProperty("DPI (normalizes input speed unit: counts/ms -> in/s)")] int dpi; [JsonProperty("Polling rate Hz (keep at 0 for automatic adjustment)")]