merge + small fixes

3 files changed, 20 insertions, 19 deletions

diff --git a/grapher/Models/Options/AccelOptionSet.cs b/grapher/Models/Options/AccelOptionSet.cs
index 53c39af..11a7f10 100644
--- a/grapher/Models/Options/AccelOptionSet.cs
+++ b/grapher/Models/Options/AccelOptionSet.cs
@@ -98,14 +98,14 @@ namespace grapher.Models.Options
             Options.Top = TopAnchor;
         }
 
-        public void SetArgs(ref AccelArgs args, ref /*readonly*/ AccelArgs last)
+        public void SetArgs(ref AccelArgs args)
         {
-            Options.SetArgs(ref args, ref last);
+            Options.SetArgs(ref args);
         }
 
-        public AccelArgs GenerateArgs(ref /*readonly*/ AccelArgs last)
+        public AccelArgs GenerateArgs()
         {
-            return Options.GenerateArgs(ref last);
+            return Options.GenerateArgs();
         }
 
         public void SetActiveValues(int mode, AccelArgs args)
diff --git a/grapher/Models/Options/AccelTypeOptions.cs b/grapher/Models/Options/AccelTypeOptions.cs
index e8d0e46..f9ecac1 100644
--- a/grapher/Models/Options/AccelTypeOptions.cs
+++ b/grapher/Models/Options/AccelTypeOptions.cs
@@ -225,24 +225,25 @@ namespace grapher
             Width = Acceleration.Field.Width;
         }
 
-        public void SetArgs(ref AccelArgs args, ref /*readonly*/ AccelArgs last)
+        public void SetArgs(ref AccelArgs args)
         {
-            args.acceleration = Acceleration.Visible ? Acceleration.Field.Data : last.acceleration;
-            args.scale = Scale.Visible ? Scale.Field.Data : last.scale;
-            args.gainCap = Cap.Visible ? Cap.VelocityGainCap : 0.0;
-            args.scaleCap = Cap.Visible ? Cap.SensitivityCap : 0.0;
-            args.limit = Limit.Visible ? Limit.Field.Data : last.limit;
-            args.exponent = Exponent.Visible ? Exponent.Field.Data : last.exponent;
-            args.offset = Offset.Visible ? Offset.Offset : 0.0;
+            AccelArgs defaults = (AccelArgs)DriverInterop.DefaultArgs;
+            args.acceleration = Acceleration.Visible ? Acceleration.Field.Data : defaults.acceleration;
+            args.scale = Scale.Visible ? Scale.Field.Data : defaults.scale;
+            args.gainCap = Cap.Visible ? Cap.VelocityGainCap : defaults.gainCap;
+            args.scaleCap = Cap.Visible ? Cap.SensitivityCap : defaults.scaleCap;
+            args.limit = Limit.Visible ? Limit.Field.Data : defaults.limit;
+            args.exponent = Exponent.Visible ? Exponent.Field.Data : defaults.exponent;
+            args.offset = Offset.Visible ? Offset.Offset : defaults.offset;
             args.legacyOffset = Offset.IsLegacy;
-            args.midpoint = Midpoint.Visible ? Midpoint.Field.Data : last.midpoint;
-            args.weight = Weight.Visible ? Weight.Field.Data : last.weight;
+            args.midpoint = Midpoint.Visible ? Midpoint.Field.Data : defaults.midpoint;
+            args.weight = Weight.Visible ? Weight.Field.Data : defaults.weight;
         }
 
-        public AccelArgs GenerateArgs(ref /*readonly*/ AccelArgs last)
+        public AccelArgs GenerateArgs()
         {
             AccelArgs args = new AccelArgs();
-            SetArgs(ref args, ref last);
+            SetArgs(ref args);
             return args;
         }
 
diff --git a/grapher/Models/Options/ApplyOptions.cs b/grapher/Models/Options/ApplyOptions.cs
index 51c80ea..c2ed498 100644
--- a/grapher/Models/Options/ApplyOptions.cs
+++ b/grapher/Models/Options/ApplyOptions.cs
@@ -89,14 +89,14 @@ namespace grapher.Models.Options
             };
         }
 
-        public Vec2<AccelArgs> GetUpdatedArgs(ref /*readonly*/ Vec2<AccelArgs> last)
+        public Vec2<AccelArgs> GetArgs()
         {
-            var xArgs = OptionSetX.GenerateArgs(ref last.x);
+            var xArgs = OptionSetX.GenerateArgs();
             
             return new Vec2<AccelArgs>
             {
                 x = xArgs,
-                y = ByComponentVectorXYLock.Checked ? xArgs : OptionSetY.GenerateArgs(ref last.y)
+                y = ByComponentVectorXYLock.Checked ? xArgs : OptionSetY.GenerateArgs()
             };
 
         }