summaryrefslogtreecommitdiff
path: root/grapher/Models/AccelGUI.cs
diff options
context:
space:
mode:
authora1xd <[email protected]>2020-09-04 00:17:55 -0400
committerGitHub <[email protected]>2020-09-04 00:17:55 -0400
commit159abe32fa9e903e1ac0a2c758d64c4b8e152c3d (patch)
tree2230e353985551a21a25b09bfacb89467b52d165 /grapher/Models/AccelGUI.cs
parentMerge pull request #18 from a1xd/write-delay (diff)
parentAdd offset options to GUI, make gain options default (diff)
downloadrawaccel-159abe32fa9e903e1ac0a2c758d64c4b8e152c3d.tar.xz
rawaccel-159abe32fa9e903e1ac0a2c758d64c4b8e152c3d.zip
Merge pull request #19 from JacobPalecki/gainOffset
Add gain offset & make gain options default
Diffstat (limited to 'grapher/Models/AccelGUI.cs')
-rw-r--r--grapher/Models/AccelGUI.cs10
1 files changed, 6 insertions, 4 deletions
diff --git a/grapher/Models/AccelGUI.cs b/grapher/Models/AccelGUI.cs
index 7a32b4e..a7d5d49 100644
--- a/grapher/Models/AccelGUI.cs
+++ b/grapher/Models/AccelGUI.cs
@@ -1,5 +1,6 @@
using grapher.Models.Calculations;
using grapher.Models.Mouse;
+using grapher.Models.Options;
using grapher.Models.Serialized;
using System;
using System.CodeDom;
@@ -28,7 +29,7 @@ namespace grapher
Option rotation,
OptionXY weight,
CapOptions cap,
- Option offset,
+ OffsetOptions offset,
Option acceleration,
Option limtOrExp,
Option midpoint,
@@ -82,7 +83,7 @@ namespace grapher
public CapOptions Cap { get; }
- public Option Offset { get; }
+ public OffsetOptions Offset { get; }
public Option Acceleration { get; }
@@ -119,7 +120,8 @@ namespace grapher
{
x = new AccelArgs
{
- offset = Offset.Field.Data,
+ offset = Offset.Offset,
+ legacy_offset = Offset.LegacyOffset,
weight = Weight.Fields.X,
gainCap = Cap.VelocityGainCap,
scaleCap = Cap.SensitivityCapX,
@@ -162,7 +164,7 @@ namespace grapher
Sensitivity.SetActiveValues(settings.sensitivity.x, settings.sensitivity.y);
Rotation.SetActiveValue(settings.rotation);
AccelerationOptions.SetActiveValue((int)settings.modes.x);
- Offset.SetActiveValue(settings.args.x.offset);
+ Offset.SetActiveValue(settings.args.x.offset, settings.args.y.offset);
Weight.SetActiveValues(settings.args.x.weight, settings.args.x.weight);
Acceleration.SetActiveValue(settings.args.x.accel); // rate, powerscale
LimitOrExponent.SetActiveValue(settings.args.x.limit); //exp, powerexp