summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Palecki <[email protected]>2021-01-11 01:17:14 -0800
committerJacob Palecki <[email protected]>2021-01-11 01:17:14 -0800
commit65e10856e41dd6c75303808d7de0c322bac38df6 (patch)
treecb6d96e48efa15022b7acd90ca1ea8bb1a68a420
parentSome fixes (diff)
downloadrawaccel-65e10856e41dd6c75303808d7de0c322bac38df6.tar.xz
rawaccel-65e10856e41dd6c75303808d7de0c322bac38df6.zip
Driver works
-rw-r--r--grapher/Models/Charts/ChartState/XYOneGraphState.cs4
-rw-r--r--wrapper/wrapper.cpp6
2 files changed, 7 insertions, 3 deletions
diff --git a/grapher/Models/Charts/ChartState/XYOneGraphState.cs b/grapher/Models/Charts/ChartState/XYOneGraphState.cs
index 2b3cd9c..4a755b6 100644
--- a/grapher/Models/Charts/ChartState/XYOneGraphState.cs
+++ b/grapher/Models/Charts/ChartState/XYOneGraphState.cs
@@ -45,6 +45,10 @@ namespace grapher.Models.Charts.ChartState
public override void Calculate(ManagedAccel accel, DriverSettings settings)
{
Calculator.CalculateCombinedDiffSens(Data, accel, settings, Calculator.SimulatedInputCombined);
+ Data.X.Clear();
+ Data.Y.Clear();
+ Calculator.Calculate(Data.X, accel, settings.sensitivity.x, Calculator.SimulatedInputX);
+ Calculator.Calculate(Data.Y, accel, settings.sensitivity.y, Calculator.SimulatedInputY);
}
}
}
diff --git a/wrapper/wrapper.cpp b/wrapper/wrapper.cpp
index 6ee8150..fdde5a4 100644
--- a/wrapper/wrapper.cpp
+++ b/wrapper/wrapper.cpp
@@ -83,15 +83,15 @@ public ref struct DriverSettings
[JsonProperty("Negative directional multipliers", Required = Required::Default)]
Vec2<double> directionalMultipliers;
- [JsonProperty(Required = Required::Default)]
- double minimumTime;
-
[JsonProperty("Stretches domain for horizontal vs vertical inputs")]
DomainArgs domainArgs;
[JsonProperty("Stretches accel range for horizontal vs vertical inputs")]
Vec2<double> rangeXY;
+ [JsonProperty(Required = Required::Default)]
+ double minimumTime;
+
bool ShouldSerializeminimumTime()
{
return minimumTime > 0 && minimumTime != DEFAULT_TIME_MIN;