Make weight a member of accel_base

This exposes weight to derived accel types, which now supply a method to transform acceleration into scale.

1 files changed, 9 insertions, 1 deletions

diff --git a/common/accel-power.hpp b/common/accel-power.hpp
index c8b12cd..d96cb96 100644
--- a/common/accel-power.hpp
+++ b/common/accel-power.hpp
@@ -14,6 +14,7 @@ namespace rawaccel {
 		accel_power(accel_args args) {
 			verify(args);
 
+			weight = args.weight;
 			speed_coeff = args.power_scale;
 			exponent = args.exponent;
 			offset = args.offset;
@@ -24,8 +25,15 @@ namespace rawaccel {
 			return (offset > 0 && speed < 1) ? 1 : pow(speed * speed_coeff, exponent);
 		}
 
+		inline vec2d scale(double accel_val) const {
+			return { 
+				weight.x * accel_val,
+				weight.y * accel_val
+			};
+		}
+
 		void verify(accel_args args) const {
-			if (args.power_scale < 0) error("scale can not be negative");
+			if (args.power_scale <= 0) error("scale must be positive");
 			if (args.exponent <= 0) error("exponent must be greater than 0");
 		}
 	};