From 97ac4933594cc886d135d0e22ddbe76763bb9d4a Mon Sep 17 00:00:00 2001
From: Jacob Palecki <JacobPalecki@gmail.com>
Date: Tue, 4 Aug 2020 20:32:24 -0700
Subject: Add velocity gain option

---
 grapher/Form1.cs | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'grapher/Form1.cs')

diff --git a/grapher/Form1.cs b/grapher/Form1.cs
index 237a25d..03168f3 100644
--- a/grapher/Form1.cs
+++ b/grapher/Form1.cs
@@ -114,6 +114,11 @@ namespace grapher
                 },
                 writeButton);
 
+            var capOptions = new CapOptions(
+                sensitivityToolStripMenuItem,
+                velocityGainToolStripMenuItem,
+                cap);
+
             AccelGUI = new AccelGUI(
                 this,
                 new AccelCharts(
@@ -127,7 +132,7 @@ namespace grapher
                 sensitivity,
                 rotation,
                 weight,
-                cap,
+                capOptions,
                 offset,
                 acceleration,
                 limitOrExponent,
@@ -218,12 +223,13 @@ namespace grapher
                 AccelGUI.Sensitivity.Fields.Y,
                 AccelGUI.Weight.Fields.X,
                 AccelGUI.Weight.Fields.Y,
-                AccelGUI.Cap.Fields.X,
-                AccelGUI.Cap.Fields.Y,
+                AccelGUI.Cap.SensitivityCapX,
+                AccelGUI.Cap.SensitivityCapY,
                 AccelGUI.Offset.Field.Data,
                 AccelGUI.Acceleration.Field.Data,
                 AccelGUI.LimitOrExponent.Field.Data,
-                AccelGUI.Midpoint.Field.Data);
+                AccelGUI.Midpoint.Field.Data,
+                AccelGUI.Cap.VelocityGainCap);
             AccelGUI.UpdateGraph();
         }
 
-- 
cgit v1.2.3


From 65a74b97c0c9ac8ca10312c0749e33df9e64b3d9 Mon Sep 17 00:00:00 2001
From: Jacob Palecki <JacobPalecki@gmail.com>
Date: Tue, 11 Aug 2020 23:06:39 -0700
Subject: Disallow differing x and y weights with gain cap

---
 grapher/Form1.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'grapher/Form1.cs')

diff --git a/grapher/Form1.cs b/grapher/Form1.cs
index 03168f3..518ffc3 100644
--- a/grapher/Form1.cs
+++ b/grapher/Form1.cs
@@ -33,6 +33,7 @@ namespace grapher
         public double exponent;
         public double midpoint;
         public double power_scale;
+        public double gain_cap;
         public vec2d weight;
     }
 
@@ -75,6 +76,7 @@ namespace grapher
             args.acc_fn_args.acc_args.power_scale = 1;
             args.acc_fn_args.acc_args.weight.x = 1;
             args.acc_fn_args.acc_args.weight.y = 1;
+            args.acc_fn_args.acc_args.gain_cap = 0;
             args.acc_fn_args.accel_mode = (int)accel_mode.natural;
             args.acc_fn_args.time_min = 0.4;
             args.acc_fn_args.cap.x = 0;
@@ -117,7 +119,8 @@ namespace grapher
             var capOptions = new CapOptions(
                 sensitivityToolStripMenuItem,
                 velocityGainToolStripMenuItem,
-                cap);
+                cap,
+                weight);
 
             AccelGUI = new AccelGUI(
                 this,
-- 
cgit v1.2.3