From 54a6f02eec23758b7f73fbf0affdedb6c4e046b7 Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Sun, 4 Apr 2021 23:18:23 -0700 Subject: Fix two more errors, add LUT layout --- grapher/Layouts/LUTLayout.cs | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 grapher/Layouts/LUTLayout.cs (limited to 'grapher/Layouts/LUTLayout.cs') diff --git a/grapher/Layouts/LUTLayout.cs b/grapher/Layouts/LUTLayout.cs new file mode 100644 index 0000000..97bfd60 --- /dev/null +++ b/grapher/Layouts/LUTLayout.cs @@ -0,0 +1,27 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace grapher.Layouts +{ + public class LUTLayout : LayoutBase + { + public LUTLayout() + : base() + { + Name = "LookUpTable"; + Index = (int)AccelMode.lut; + + AccelLayout = new OptionLayout(false, Acceleration); + ScaleLayout = new OptionLayout(false, string.Empty); + CapLayout = new OptionLayout(false, Cap); + WeightLayout = new OptionLayout(false, Weight); + OffsetLayout = new OptionLayout(false, Offset); + LimitLayout = new OptionLayout(false, string.Empty); + ExponentLayout = new OptionLayout(false, Exponent); + MidpointLayout = new OptionLayout(false, string.Empty); + } + } +} -- cgit v1.2.3 From cf1fdf2e6cdba8c6ae8493eb744f223b6324594c Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Mon, 5 Apr 2021 20:43:08 -0700 Subject: LUT text layout --- grapher/Layouts/LUTLayout.cs | 3 +++ 1 file changed, 3 insertions(+) (limited to 'grapher/Layouts/LUTLayout.cs') diff --git a/grapher/Layouts/LUTLayout.cs b/grapher/Layouts/LUTLayout.cs index 97bfd60..7449168 100644 --- a/grapher/Layouts/LUTLayout.cs +++ b/grapher/Layouts/LUTLayout.cs @@ -8,6 +8,8 @@ namespace grapher.Layouts { public class LUTLayout : LayoutBase { + public const string LUTLayoutText = "This mode is for advanced users only. It requires a lut.json file to define the velocity curve. See the guide for specifics."; + public LUTLayout() : base() { @@ -22,6 +24,7 @@ namespace grapher.Layouts LimitLayout = new OptionLayout(false, string.Empty); ExponentLayout = new OptionLayout(false, Exponent); MidpointLayout = new OptionLayout(false, string.Empty); + LUTTextLayout = new OptionLayout(true, LUTLayoutText); } } } -- cgit v1.2.3 From 7c1f14845bc948e9ea25908e96099203d9433a69 Mon Sep 17 00:00:00 2001 From: a1xd <68629610+a1xd@users.noreply.github.com> Date: Tue, 6 Apr 2021 01:21:42 -0400 Subject: update wrapper + writer to handle lut grapher is building but applying options still broken for the most part --- grapher/Layouts/LUTLayout.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'grapher/Layouts/LUTLayout.cs') diff --git a/grapher/Layouts/LUTLayout.cs b/grapher/Layouts/LUTLayout.cs index 7449168..4b4b687 100644 --- a/grapher/Layouts/LUTLayout.cs +++ b/grapher/Layouts/LUTLayout.cs @@ -14,7 +14,7 @@ namespace grapher.Layouts : base() { Name = "LookUpTable"; - Index = (int)AccelMode.lut; + Index = (int)AccelMode.noaccel + 1; AccelLayout = new OptionLayout(false, Acceleration); ScaleLayout = new OptionLayout(false, string.Empty); -- cgit v1.2.3 From 019665015ab30893209ab49fea352405b144f0f8 Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Mon, 5 Apr 2021 23:36:26 -0700 Subject: Add gain switch --- grapher/Layouts/LUTLayout.cs | 1 + 1 file changed, 1 insertion(+) (limited to 'grapher/Layouts/LUTLayout.cs') diff --git a/grapher/Layouts/LUTLayout.cs b/grapher/Layouts/LUTLayout.cs index 4b4b687..fd0b75a 100644 --- a/grapher/Layouts/LUTLayout.cs +++ b/grapher/Layouts/LUTLayout.cs @@ -16,6 +16,7 @@ namespace grapher.Layouts Name = "LookUpTable"; Index = (int)AccelMode.noaccel + 1; + GainSwitchOptionLayout = new OptionLayout(false, string.Empty); AccelLayout = new OptionLayout(false, Acceleration); ScaleLayout = new OptionLayout(false, string.Empty); CapLayout = new OptionLayout(false, Cap); -- cgit v1.2.3 From a6926be0e911b7b7637861866f41c3bca31a87a3 Mon Sep 17 00:00:00 2001 From: a1xd <68629610+a1xd@users.noreply.github.com> Date: Tue, 13 Apr 2021 23:59:21 -0400 Subject: move arbitrary input into settings separate arbitrary mode from spaced modes, arbitrary now deserializes from default settings file --- grapher/Layouts/LUTLayout.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'grapher/Layouts/LUTLayout.cs') diff --git a/grapher/Layouts/LUTLayout.cs b/grapher/Layouts/LUTLayout.cs index fd0b75a..5505114 100644 --- a/grapher/Layouts/LUTLayout.cs +++ b/grapher/Layouts/LUTLayout.cs @@ -14,7 +14,7 @@ namespace grapher.Layouts : base() { Name = "LookUpTable"; - Index = (int)AccelMode.noaccel + 1; + Mode = AccelMode.lut; GainSwitchOptionLayout = new OptionLayout(false, string.Empty); AccelLayout = new OptionLayout(false, Acceleration); -- cgit v1.2.3 From 0af5b1d23be9ecfb0134c957197cfd8f838b7998 Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Sun, 25 Apr 2021 21:57:25 -0700 Subject: Fixed layout issues for LUT --- grapher/Layouts/LUTLayout.cs | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'grapher/Layouts/LUTLayout.cs') diff --git a/grapher/Layouts/LUTLayout.cs b/grapher/Layouts/LUTLayout.cs index 5505114..1ca5915 100644 --- a/grapher/Layouts/LUTLayout.cs +++ b/grapher/Layouts/LUTLayout.cs @@ -10,6 +10,11 @@ namespace grapher.Layouts { public const string LUTLayoutText = "This mode is for advanced users only. It requires a lut.json file to define the velocity curve. See the guide for specifics."; + /// + /// String small enough to fit in active value label + /// + public const string LUTActiveName = "LUT"; + public LUTLayout() : base() { @@ -27,5 +32,7 @@ namespace grapher.Layouts MidpointLayout = new OptionLayout(false, string.Empty); LUTTextLayout = new OptionLayout(true, LUTLayoutText); } + + public override string ActiveName => LUTActiveName; } } -- cgit v1.2.3 From 0cf5ce3762926fa556418572e9661d79cbbaa240 Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Sun, 25 Apr 2021 23:05:44 -0700 Subject: Start of LUT points editing --- grapher/Layouts/LUTLayout.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'grapher/Layouts/LUTLayout.cs') diff --git a/grapher/Layouts/LUTLayout.cs b/grapher/Layouts/LUTLayout.cs index 1ca5915..37c336e 100644 --- a/grapher/Layouts/LUTLayout.cs +++ b/grapher/Layouts/LUTLayout.cs @@ -8,7 +8,7 @@ namespace grapher.Layouts { public class LUTLayout : LayoutBase { - public const string LUTLayoutText = "This mode is for advanced users only. It requires a lut.json file to define the velocity curve. See the guide for specifics."; + public const string LUTLayoutText = "This mode is for advanced users only. We recommend setting points in the settings file with a script."; /// /// String small enough to fit in active value label @@ -30,7 +30,8 @@ namespace grapher.Layouts LimitLayout = new OptionLayout(false, string.Empty); ExponentLayout = new OptionLayout(false, Exponent); MidpointLayout = new OptionLayout(false, string.Empty); - LUTTextLayout = new OptionLayout(true, LUTLayoutText); + LutTextLayout = new OptionLayout(true, LUTLayoutText); + LutPanelLayout = new OptionLayout(true, string.Empty); } public override string ActiveName => LUTActiveName; -- cgit v1.2.3 From abbe20f63aded56c4714766ca1b93183eafa062a Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Wed, 30 Jun 2021 00:01:26 -0700 Subject: Add class for LUT apply type --- grapher/Layouts/LUTLayout.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'grapher/Layouts/LUTLayout.cs') diff --git a/grapher/Layouts/LUTLayout.cs b/grapher/Layouts/LUTLayout.cs index 37c336e..e570f6a 100644 --- a/grapher/Layouts/LUTLayout.cs +++ b/grapher/Layouts/LUTLayout.cs @@ -8,7 +8,7 @@ namespace grapher.Layouts { public class LUTLayout : LayoutBase { - public const string LUTLayoutText = "This mode is for advanced users only. We recommend setting points in the settings file with a script."; + public const string LUTLayoutText = "This mode is for advanced users only. Format: x1,y1;x2,y2;...xn,yn;"; /// /// String small enough to fit in active value label @@ -32,6 +32,7 @@ namespace grapher.Layouts MidpointLayout = new OptionLayout(false, string.Empty); LutTextLayout = new OptionLayout(true, LUTLayoutText); LutPanelLayout = new OptionLayout(true, string.Empty); + LutApplyOptionsLayout = new OptionLayout(true, string.Empty); } public override string ActiveName => LUTActiveName; -- cgit v1.2.3 From 308eed9ce9ed48984323e6512546a2ffeb195b14 Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Thu, 1 Jul 2021 22:32:55 -0700 Subject: LUT Panel formatting --- grapher/Layouts/LUTLayout.cs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'grapher/Layouts/LUTLayout.cs') diff --git a/grapher/Layouts/LUTLayout.cs b/grapher/Layouts/LUTLayout.cs index e570f6a..1e0037f 100644 --- a/grapher/Layouts/LUTLayout.cs +++ b/grapher/Layouts/LUTLayout.cs @@ -8,8 +8,6 @@ namespace grapher.Layouts { public class LUTLayout : LayoutBase { - public const string LUTLayoutText = "This mode is for advanced users only. Format: x1,y1;x2,y2;...xn,yn;"; - /// /// String small enough to fit in active value label /// @@ -30,7 +28,7 @@ namespace grapher.Layouts LimitLayout = new OptionLayout(false, string.Empty); ExponentLayout = new OptionLayout(false, Exponent); MidpointLayout = new OptionLayout(false, string.Empty); - LutTextLayout = new OptionLayout(true, LUTLayoutText); + LutTextLayout = new OptionLayout(true, string.Empty); LutPanelLayout = new OptionLayout(true, string.Empty); LutApplyOptionsLayout = new OptionLayout(true, string.Empty); } -- cgit v1.2.3