misc: update to SetLampUnit/SwitchLampUnit to use IMultiInputUnit

Author: jsm174

Editor/Descriptors/SetLampUnitDescriptor.cs

@@ -40,13 +40,14 @@ protected override void DefinedPort(IUnitPort port, UnitPortDescription desc)
 		{
 			base.DefinedPort(port, desc);
 
-			switch (port.key) {
-				case nameof(SetLampUnit.Id):
-					desc.summary = "The ID of the lamp for which the intensity is returned.";
-					break;
-				case nameof(SetLampUnit.Value):
-					desc.summary = "The intensity of the lamp (0-1).";
-					break;
+			if (port.key == nameof(SetLampUnit.Value)) {
+				desc.summary = "The intensity of the lamp (0-1).";
+			}
+			else if (int.TryParse(port.key, out int id)) {
+				id += 1;
+
+				desc.label = $"Lamp ID {id}";
+				desc.summary = $"Lamp ID {id} of the lamp to set the intensity";
 			}
 		}
 	}

Editor/Widgets/SetLampUnitWidget.cs

@@ -26,19 +26,28 @@ namespace VisualPinball.Unity.VisualScripting.Editor
 	[Widget(typeof(SetLampUnit))]
 	public sealed class SetLampUnitWidget : GleUnitWidget<SetLampUnit>
 	{
-		private VariableNameInspector _lampIdInspector;
-		private readonly Func<Metadata, VariableNameInspector> _setLampInspectorConstructor;
+		private readonly List<Func<Metadata, VariableNameInspector>> _lampIdInspectorConstructorList;
 
 		public SetLampUnitWidget(FlowCanvas canvas, SetLampUnit unit) : base(canvas, unit)
 		{
-			_setLampInspectorConstructor = meta => new VariableNameInspector(meta, GetNameSuggestions);
+			_lampIdInspectorConstructorList = new List<Func<Metadata, VariableNameInspector>>();
 		}
 
 		public override Inspector GetPortInspector(IUnitPort port, Metadata meta)
 		{
-			if (port == unit.Id) {
-				InspectorProvider.instance.Renew(ref _lampIdInspector, meta, _setLampInspectorConstructor);
-				return _lampIdInspector;
+			if (_lampIdInspectorConstructorList.Count() < unit.inputCount) {
+				for (var index = 0; index < unit.inputCount - _lampIdInspectorConstructorList.Count(); index++) {
+					_lampIdInspectorConstructorList.Add(meta => new VariableNameInspector(meta, GetNameSuggestions));
+				}
+			}
+
+			for (var index = 0; index < unit.inputCount; index++) {
+				if (unit.multiInputs[index] == port) {
+					VariableNameInspector lampIdInspector = new VariableNameInspector(meta, GetNameSuggestions);
+					InspectorProvider.instance.Renew(ref lampIdInspector, meta, _lampIdInspectorConstructorList[index]);
+
+					return lampIdInspector;
+				}
 			}
 
 			return base.GetPortInspector(port, meta);

Editor/Widgets/SwitchLampUnitWidget.cs

@@ -42,7 +42,7 @@ public override Inspector GetPortInspector(IUnitPort port, Metadata meta)
 			}
 
 			for (var index = 0; index < unit.inputCount; index++) {
-				if (unit.Items[index] == port) {
+				if (unit.multiInputs[index] == port) {
 					LampIdValueInspector lampIdInspector = new LampIdValueInspector(meta, GetNameSuggestions);
 					InspectorProvider.instance.Renew(ref lampIdInspector, meta, _lampIdInspectorConstructorList[index]);
 

Runtime/Nodes/Lamps/SetLampUnit.cs

@@ -14,6 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using Unity.VisualScripting;
 using UnityEngine;
 
@@ -23,7 +25,7 @@ namespace VisualPinball.Unity.VisualScripting
 	[UnitTitle("Set Lamp (ID, Intensity)")]
 	[UnitSurtitle("Gamelogic Engine")]
 	[UnitCategory("Visual Pinball")]
-	public class SetLampUnit : GleUnit
+	public class SetLampUnit : GleUnit, IMultiInputUnit
 	{
 		[DoNotSerialize]
 		[PortLabelHidden]
@@ -33,9 +35,19 @@ public class SetLampUnit : GleUnit
 		[PortLabelHidden]
 		public ControlOutput OutputTrigger;
 
+		[SerializeAs(nameof(inputCount))]
+		private int _inputCount = 1;
+
 		[DoNotSerialize]
-		[PortLabel("Lamp ID")]
-		public ValueInput Id { get; private set; }
+		[Inspectable, UnitHeaderInspectable("Lamp IDs")]
+		public int inputCount
+		{
+			get => _inputCount;
+			set => _inputCount = Mathf.Clamp(value, 1, 10);
+		}
+
+		[DoNotSerialize]
+		public ReadOnlyCollection<ValueInput> multiInputs { get; private set; }
 
 		[DoNotSerialize]
 		[PortLabel("Value")]
@@ -46,26 +58,36 @@ protected override void Definition()
 			InputTrigger = ControlInput(nameof(InputTrigger), Process);
 			OutputTrigger = ControlOutput(nameof(OutputTrigger));
 
-			Id = ValueInput<string>(nameof(Id), string.Empty);
-			Value = ValueInput<float>(nameof(Value), 0f);
+			var _multiInputs = new List<ValueInput>();
 
-			Requirement(Id, InputTrigger);
-			Succession(InputTrigger, OutputTrigger);
+			multiInputs = _multiInputs.AsReadOnly();
+
+			for (var i = 0; i < inputCount; i++)
+			{
+				var input = ValueInput(i.ToString(), string.Empty);
+				_multiInputs.Add(input);
 
+				Requirement(input, InputTrigger);
+			}
+
+			Value = ValueInput(nameof(Value), 0f);
+
+			Succession(InputTrigger, OutputTrigger);
 		}
 
 		private ControlOutput Process(Flow flow)
 		{
-
 			if (!AssertGle(flow)) {
 				Debug.LogError("Cannot find GLE.");
 				return OutputTrigger;
 			}
 
-			var id = flow.GetValue<string>(Id);
-			var value = flow.GetValue<float>(Value);
+			var value = flow.GetValue<float>(Value) * 255f;
 
-			Gle.SetLamp(id, value * 255f);
+			foreach (var input in multiInputs) {
+				var lampId = flow.GetValue<string>(input);
+				Gle.SetLamp(lampId, value);
+			}
 
 			return OutputTrigger;
 		}

Runtime/Nodes/Lamps/SwitchLampUnit.cs

@@ -15,6 +15,7 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using Unity.VisualScripting;
 using UnityEngine;
 
@@ -24,7 +25,7 @@ namespace VisualPinball.Unity.VisualScripting
 	[UnitTitle("Switch Lamp (ID, match value)")]
 	[UnitSurtitle("Gamelogic Engine")]
 	[UnitCategory("Visual Pinball")]
-	public class SwitchLampUnit : GleUnit
+	public class SwitchLampUnit : GleUnit, IMultiInputUnit
 	{
 		[SerializeAs(nameof(inputCount))]
 		private int _inputCount = 1;
@@ -50,7 +51,7 @@ public int inputCount
 		public ValueInput SourceValue { get; private set; }
 
 		[DoNotSerialize]
-		public List<ValueInput> Items { get; private set; }
+		public ReadOnlyCollection<ValueInput> multiInputs { get; private set; }
 
 		private Dictionary<int, LampIdValue> _lampIdValueCache = new Dictionary<int, LampIdValue>();
 
@@ -61,13 +62,15 @@ protected override void Definition()
 
 			SourceValue = ValueInput<int>(nameof(SourceValue));
 
-			Items = new List<ValueInput>();
+			var _multiInputs = new List<ValueInput>();
+
+			multiInputs = _multiInputs.AsReadOnly();
 
 			for (var i = 0; i < inputCount; i++) {
-				var item = ValueInput(i.ToString(), LampIdValue.Empty.ToJson());
-				Items.Add(item);
+				var input = ValueInput(i.ToString(), LampIdValue.Empty.ToJson());
+				_multiInputs.Add(input);
 
-				Requirement(item, InputTrigger);
+				Requirement(input, InputTrigger);
 			}
 
 			_lampIdValueCache.Clear();
@@ -84,8 +87,8 @@ private ControlOutput Process(Flow flow)
 
 			var value = flow.GetValue<int>(SourceValue);
 
-			foreach (var item in Items) {
-				var json = flow.GetValue<string>(item);
+			foreach (var input in multiInputs) {
+				var json = flow.GetValue<string>(input);
 
 				if (!_lampIdValueCache.ContainsKey(json.GetHashCode())) {
 					_lampIdValueCache[json.GetHashCode()] = LampIdValue.FromJson(json);