From 85aefb4ba131521595e48fe1a25f4db9a69e71e6 Mon Sep 17 00:00:00 2001
From: a1xd <68629610+a1xd@users.noreply.github.com>
Date: Sun, 27 Sep 2020 23:04:29 -0400
Subject: add arg checks in wrapper

minor changes to settings shape, requires driver reinstall
add error handling to writer

grapher changes:

add prettier serialization + comments
add elements for scale and separated limit/exp
reset irrelevant (invisible) arg input before checks/write
---
 common/accel-base.hpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

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

diff --git a/common/accel-base.hpp b/common/accel-base.hpp
index d536923..5106268 100644
--- a/common/accel-base.hpp
+++ b/common/accel-base.hpp
@@ -5,15 +5,13 @@ namespace rawaccel {
     /// <summary> Struct to hold arguments for an acceleration function. </summary>
     struct accel_args {
         double offset = 0;
-        double legacy_offset = 0;
+        bool legacy_offset = false;
         double accel = 0;
+        double scale = 1;
         double limit = 2;
         double exponent = 2;
-        double midpoint = 0;
-        double power_scale = 1;
-        double power_exp = 0.05;
+        double midpoint = 10;
         double weight = 1;
-        double rate = 0;
         double scale_cap = 0;
         double gain_cap = 0;
     };
@@ -33,14 +31,16 @@ namespace rawaccel {
     struct additive_accel : accel_val_base<Func> {
 
         additive_accel(const accel_args& args) : accel_val_base(args) {
-            legacy_offset = args.offset <= 0 && args.legacy_offset > 0;
-            offset = legacy_offset ? args.legacy_offset : args.offset;
+            legacy_offset = args.legacy_offset;
+            offset = args.offset;
             weight = args.weight;
         }
 
         inline double operator()(double speed) const {
             double offset_speed = speed - offset;
-            return offset_speed > 0 ? ( legacy_offset ? 1 + fn.legacy_offset(offset_speed) * weight : 1 + fn(offset_speed) * weight) : 1;
+            if (offset_speed <= 0) return 1;
+            if (legacy_offset) return 1 + fn.legacy_offset(offset_speed) * weight;
+            return 1 + fn(offset_speed) * weight;
         }
     };
 
-- 
cgit v1.2.3