From b9dbad406b3a49e2f4bc2375663974029191597a Mon Sep 17 00:00:00 2001 From: MirageDev <80174688+M1rageDev@users.noreply.github.com> Date: Mon, 18 Dec 2023 23:25:30 +0100 Subject: [PATCH 1/3] Update JSINumericInput.cs make increment a VariableOrNumber --- RasterPropMonitor/Auxiliary modules/JSINumericInput.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/RasterPropMonitor/Auxiliary modules/JSINumericInput.cs b/RasterPropMonitor/Auxiliary modules/JSINumericInput.cs index d85207bc..6e25304c 100644 --- a/RasterPropMonitor/Auxiliary modules/JSINumericInput.cs +++ b/RasterPropMonitor/Auxiliary modules/JSINumericInput.cs @@ -258,10 +258,10 @@ internal NumericInput(ConfigNode node, InternalProp internalProp) throw new Exception("USERINPUTSET missing increment or incrementCurve, or it has both"); } - if (node.HasValue("increment") && !float.TryParse(node.GetValue("increment"), out increment)) - { - throw new Exception("USERINPUTSET bad increment"); - } + RasterPropMonitorComputer rpmComp = RasterPropMonitorComputer.FindFromProp(internalProp); + VariableOrNumber increment_ = rpmComp.InstantiateVariableOrNumber(node.GetValue("increment")); + increment = increment_.AsFloat(); + else if (node.HasNode("incrementCurve")) { ConfigNode incNode = node.GetNode("incrementCurve"); From bb1fda14f07727551c3edddb90f0064d99886803 Mon Sep 17 00:00:00 2001 From: MirageDev <80174688+M1rageDev@users.noreply.github.com> Date: Mon, 18 Dec 2023 23:31:04 +0100 Subject: [PATCH 2/3] Update JSINumericInput.cs --- RasterPropMonitor/Auxiliary modules/JSINumericInput.cs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/RasterPropMonitor/Auxiliary modules/JSINumericInput.cs b/RasterPropMonitor/Auxiliary modules/JSINumericInput.cs index 6e25304c..e506e533 100644 --- a/RasterPropMonitor/Auxiliary modules/JSINumericInput.cs +++ b/RasterPropMonitor/Auxiliary modules/JSINumericInput.cs @@ -234,7 +234,7 @@ private class NumericInput private float delta = 0.0f; private double pressStart = 0.0; private double lastUpdate = 0.0; - private readonly float increment = 0.0f; + private readonly VariableOrNumber increment = 0.0f; private readonly FloatCurve incrementCurve = null; private bool pressed = false; private readonly bool pressAndHold = false; @@ -259,8 +259,7 @@ internal NumericInput(ConfigNode node, InternalProp internalProp) } RasterPropMonitorComputer rpmComp = RasterPropMonitorComputer.FindFromProp(internalProp); - VariableOrNumber increment_ = rpmComp.InstantiateVariableOrNumber(node.GetValue("increment")); - increment = increment_.AsFloat(); + increment = rpmComp.InstantiateVariableOrNumber(node.GetValue("increment")); else if (node.HasNode("incrementCurve")) { @@ -401,7 +400,7 @@ internal float Update(double currentTime) private void Click() { - delta += increment; + delta += increment.AsFloat(); pressed = true; } From 20da3f9ca4ba8cd3427453dcc303a9db57038153 Mon Sep 17 00:00:00 2001 From: MirageDev <80174688+M1rageDev@users.noreply.github.com> Date: Tue, 19 Dec 2023 14:59:02 +0100 Subject: [PATCH 3/3] Update JSINumericInput.cs fix moar --- RasterPropMonitor/Auxiliary modules/JSINumericInput.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/RasterPropMonitor/Auxiliary modules/JSINumericInput.cs b/RasterPropMonitor/Auxiliary modules/JSINumericInput.cs index e506e533..dc65378a 100644 --- a/RasterPropMonitor/Auxiliary modules/JSINumericInput.cs +++ b/RasterPropMonitor/Auxiliary modules/JSINumericInput.cs @@ -1,4 +1,4 @@ -/***************************************************************************** +/***************************************************************************** * RasterPropMonitor * ================= * Plugin for Kerbal Space Program @@ -234,7 +234,7 @@ private class NumericInput private float delta = 0.0f; private double pressStart = 0.0; private double lastUpdate = 0.0; - private readonly VariableOrNumber increment = 0.0f; + private readonly VariableOrNumber increment = null; private readonly FloatCurve incrementCurve = null; private bool pressed = false; private readonly bool pressAndHold = false; @@ -261,7 +261,7 @@ internal NumericInput(ConfigNode node, InternalProp internalProp) RasterPropMonitorComputer rpmComp = RasterPropMonitorComputer.FindFromProp(internalProp); increment = rpmComp.InstantiateVariableOrNumber(node.GetValue("increment")); - else if (node.HasNode("incrementCurve")) + if (node.HasNode("incrementCurve")) { ConfigNode incNode = node.GetNode("incrementCurve"); string[] keys = incNode.GetValues("key");