From e8417a29fb2153ea035a757f36bfa300cf8b480d Mon Sep 17 00:00:00 2001
From: a1xd <68629610+a1xd@users.noreply.github.com>
Date: Thu, 30 Jul 2020 17:07:35 -0400
Subject: add tweaks for st-refactor

---
 common/accel-power.hpp | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 common/accel-power.hpp

(limited to 'common/accel-power.hpp')

diff --git a/common/accel-power.hpp b/common/accel-power.hpp
new file mode 100644
index 0000000..c8b12cd
--- /dev/null
+++ b/common/accel-power.hpp
@@ -0,0 +1,33 @@
+#pragma once
+
+#include <math.h>
+
+#include "accel-base.hpp"
+
+namespace rawaccel {
+
+	/// <summary> Struct to hold power (non-additive) acceleration implementation. </summary>
+	struct accel_power : accel_base {
+		double exponent;
+		double offset;
+
+		accel_power(accel_args args) {
+			verify(args);
+
+			speed_coeff = args.power_scale;
+			exponent = args.exponent;
+			offset = args.offset;
+		}
+
+		inline double accelerate(double speed) const {
+			// f(x) = (mx)^k
+			return (offset > 0 && speed < 1) ? 1 : pow(speed * speed_coeff, exponent);
+		}
+
+		void verify(accel_args args) const {
+			if (args.power_scale < 0) error("scale can not be negative");
+			if (args.exponent <= 0) error("exponent must be greater than 0");
+		}
+	};
+
+}
-- 
cgit v1.2.3


From b59cf98c2f326abeb6b993d8ecc5759d23096253 Mon Sep 17 00:00:00 2001
From: a1xd <68629610+a1xd@users.noreply.github.com>
Date: Thu, 30 Jul 2020 22:04:44 -0400
Subject: Make weight a member of accel_base

This exposes weight to derived accel types, which now supply a method to transform acceleration into scale.
---
 common/accel-power.hpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'common/accel-power.hpp')

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");
 		}
 	};
-- 
cgit v1.2.3


From b3ed8fd4e4fcad0b749126dee62588260d74b106 Mon Sep 17 00:00:00 2001
From: a1xd <68629610+a1xd@users.noreply.github.com>
Date: Fri, 31 Jul 2020 01:37:41 -0400
Subject: add more tweaks for st-refactor

---
 common/accel-power.hpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'common/accel-power.hpp')

diff --git a/common/accel-power.hpp b/common/accel-power.hpp
index d96cb96..7f4c220 100644
--- a/common/accel-power.hpp
+++ b/common/accel-power.hpp
@@ -11,7 +11,7 @@ namespace rawaccel {
 		double exponent;
 		double offset;
 
-		accel_power(accel_args args) {
+		accel_power(const accel_args& args) {
 			verify(args);
 
 			weight = args.weight;
@@ -32,7 +32,7 @@ namespace rawaccel {
 			};
 		}
 
-		void verify(accel_args args) const {
+		void verify(const accel_args& args) const {
 			if (args.power_scale <= 0) error("scale must be positive");
 			if (args.exponent <= 0) error("exponent must be greater than 0");
 		}
-- 
cgit v1.2.3