rename directional multipliers

changes profile layout

3 files changed, 13 insertions, 13 deletions

diff --git a/common/rawaccel-base.hpp b/common/rawaccel-base.hpp
index cee1a3e..aefee6d 100644
--- a/common/rawaccel-base.hpp
+++ b/common/rawaccel-base.hpp
@@ -71,20 +71,20 @@ namespace rawaccel {
         vec2d domain_weights = { 1, 1 };
         vec2d range_weights = { 1, 1 };
 
-        double sensitivity = 1;
-        double yx_sens_ratio = 1;
-
         accel_args accel_x;
         accel_args accel_y;
 
-        double speed_min = 0;
-        double speed_max = 0;
-
-        vec2d dir_multipliers = { 1, 1 };
+        double sensitivity = 1;
+        double yx_sens_ratio = 1;
+        double lr_sens_ratio = 1;
+        double ud_sens_ratio = 1;
 
         double degrees_rotation = 0;
 
         double degrees_snap = 0;
+
+        double speed_min = 0;
+        double speed_max = 0;
     };
 
 
diff --git a/common/rawaccel-validate.hpp b/common/rawaccel-validate.hpp
index 23deb5f..f1c2980 100644
--- a/common/rawaccel-validate.hpp
+++ b/common/rawaccel-validate.hpp
@@ -157,8 +157,8 @@ namespace rawaccel {
 			error("domain weights"" must be positive");
 		}
 
-		if (args.dir_multipliers.x <= 0 || args.dir_multipliers.y <= 0) {
-			error("negative directional multipliers must be positive");
+		if (args.lr_sens_ratio <= 0 || args.ud_sens_ratio <= 0) {
+			error("sens ratio must be positive");
 		}
 
 		if (args.lp_norm <= 0) {
diff --git a/common/rawaccel.hpp b/common/rawaccel.hpp
index be4e1a5..e2f31b1 100644
--- a/common/rawaccel.hpp
+++ b/common/rawaccel.hpp
@@ -139,11 +139,11 @@ namespace rawaccel {
             in.y *= dpi_adjusted_sens * args.yx_sens_ratio;
 
             if (apply_dir_mul_x && in.x < 0) {
-                in.x *= args.dir_multipliers.x;
+                in.x *= args.lr_sens_ratio;
             }
 
             if (apply_dir_mul_y && in.y < 0) {
-                in.y *= args.dir_multipliers.y;
+                in.y *= args.ud_sens_ratio;
             }
         }
 
@@ -156,8 +156,8 @@ namespace rawaccel {
             apply_snap = args.degrees_snap != 0;
             apply_directional_weight = args.range_weights.x != args.range_weights.y;
             compute_ref_angle = apply_snap || apply_directional_weight;
-            apply_dir_mul_x = args.dir_multipliers.x != 1;
-            apply_dir_mul_y = args.dir_multipliers.y != 1;
+            apply_dir_mul_x = args.lr_sens_ratio != 1;
+            apply_dir_mul_y = args.ud_sens_ratio != 1;
 
             if (!args.whole) {
                 distance_mode = distance_mode::separate;