Refactor lamp nodes.

Author: freezy

Editor/Descriptors/GetLampUnitDescriptor.cs

@@ -16,6 +16,7 @@
 
 // ReSharper disable UnusedType.Global
 
+using System;
 using Unity.VisualScripting;
 using VisualPinball.Unity.Editor;
 using IconSize = VisualPinball.Unity.Editor.IconSize;
@@ -45,10 +46,27 @@ protected override void DefinedPort(IUnitPort port, UnitPortDescription desc)
 					desc.summary = "The ID of the lamp for which the intensity is returned.";
 					break;
 				case nameof(GetLampUnit.Value):
-					desc.summary = "The intensity of the lamp (0-1).";
-					break;
-				case nameof(GetLampUnit.IsEnabled):
-					desc.summary = "Whether the intensity is larger than 0.";
+					var getLampUnit = port.unit as GetLampUnit;
+					switch (getLampUnit!.DataType) {
+						case LampDataType.OnOff:
+							desc.label = "Lit";
+							desc.summary = "On or off.";
+							break;
+						case LampDataType.Status:
+							desc.label = "Status";
+							desc.summary = "On, off or blinking.";
+							break;
+						case LampDataType.Intensity:
+							desc.label = "Intensity";
+							desc.summary = "The intensity of the lamp (value depends on the maximal intensity of the mapping).";
+							break;
+						case LampDataType.Color:
+							desc.label = "Color";
+							desc.summary = "The color of the lamp.";
+							break;
+						default:
+							throw new ArgumentOutOfRangeException();
+					}
 					break;
 			}
 		}

Editor/Descriptors/SetLampColorUnitDescriptor.cs

@@ -16,6 +16,7 @@
 
 // ReSharper disable UnusedType.Global
 
+using System;
 using Unity.VisualScripting;
 using VisualPinball.Unity.Editor;
 using IconSize = VisualPinball.Unity.Editor.IconSize;
@@ -41,7 +42,28 @@ protected override void DefinedPort(IUnitPort port, UnitPortDescription desc)
 			base.DefinedPort(port, desc);
 
 			if (port.key == nameof(SetLampUnit.Value)) {
-				desc.summary = "The intensity of the lamp (0-1).";
+				var setLampUnit = port.unit as SetLampUnit;
+				switch (setLampUnit!.DataType) {
+					case LampDataType.OnOff:
+						desc.label = "Lit?";
+						desc.summary = "On or off.";
+						break;
+					case LampDataType.Status:
+						desc.label = "Status";
+						desc.summary = "On, off or blinking.";
+						break;
+					case LampDataType.Intensity:
+						desc.label = "Intensity";
+						desc.summary = "The intensity of the lamp (0-1).";
+						break;
+					case LampDataType.Color:
+						desc.label = "Color";
+						desc.summary = "The color of the lamp.";
+						break;
+
+					default:
+						throw new ArgumentOutOfRangeException();
+				}
 			}
 			else if (int.TryParse(port.key, out int id)) {
 				id += 1;

Editor/Descriptors/SetLampColorUnitDescriptor.cs.meta

@@ -64,7 +64,6 @@ public class VisualScriptingGamelogicEngine : MonoBehaviour, IGamelogicEngine, I
 		public event EventHandler<DisplayFrameData> OnDisplayFrame;
 		public event EventHandler<LampEventArgs> OnLampChanged;
 		public event EventHandler<LampsEventArgs> OnLampsChanged;
-		public event EventHandler<LampColorEventArgs> OnLampColorChanged;
 		public event EventHandler<CoilEventArgs> OnCoilChanged;
 		public event EventHandler<SwitchEventArgs2> OnSwitchChanged;
 		public event EventHandler<EventArgs> OnStarted;
@@ -176,11 +175,6 @@ public void SetLamp(string id, float value, bool isCoil = false, LampSource sour
 			OnLampChanged?.Invoke(this, new LampEventArgs(id, value, isCoil, source));
 		}
 
-		public void SetLamp(string id, Color color)
-		{
-			OnLampColorChanged?.Invoke(this, new LampColorEventArgs(id, color));
-		}
-
 		public LampState GetLamp(string id)
 		{
 			return _player.LampStatuses.ContainsKey(id) ? _player.LampStatuses[id] : LampState.Default;

Editor/Descriptors/SetLampUnitDescriptor.cs

@@ -14,6 +14,7 @@
 // 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;
 using Unity.VisualScripting;
 using UnityEngine;
 
@@ -24,34 +25,45 @@ namespace VisualPinball.Unity.VisualScripting
 	[UnitCategory("Visual Pinball")]
 	public class GetLampUnit : GleUnit
 	{
+		[Serialize, Inspectable, UnitHeaderInspectable]
+		public LampDataType DataType { get; set; }
+
 		[DoNotSerialize]
 		[PortLabel("Lamp ID")]
 		public ValueInput Id { get; private set; }
 
 		[DoNotSerialize]
-		[PortLabel("Value")]
 		public ValueOutput Value { get; private set; }
 
-		[DoNotSerialize]
-		[PortLabel("Is Enabled")]
-		public ValueOutput IsEnabled { get; private set; }
-
 		protected override void Definition()
 		{
 			Id = ValueInput(nameof(Id), string.Empty);
 
-			Value = ValueOutput(nameof(Value), GetValue);
-			IsEnabled = ValueOutput(nameof(IsEnabled), GetEnabled);
+			switch (DataType) {
+				case LampDataType.OnOff:
+					Value = ValueOutput(nameof(Value), GetEnabled);
+					break;
+				case LampDataType.Status:
+					Value = ValueOutput(nameof(Value), GetEnabled);
+					break;
+				case LampDataType.Intensity:
+					Value = ValueOutput(nameof(Value), GetIntensity);
+					break;
+				case LampDataType.Color:
+					Value = ValueOutput(nameof(Value), GetColor);
+					break;
+				default:
+					throw new ArgumentOutOfRangeException();
+			}
 		}
 
-		private float GetValue(Flow flow)
+		private float GetIntensity(Flow flow)
 		{
 			if (!AssertGle(flow)) {
 				Debug.LogError("Cannot find GLE.");
 				return 0;
 			}
-
-			return Gle.GetLamp(flow.GetValue<string>(Id));
+			return Gle.GetLamp(flow.GetValue<string>(Id)).Intensity;
 		}
 
 		private bool GetEnabled(Flow flow)
@@ -61,7 +73,17 @@ private bool GetEnabled(Flow flow)
 				return false;
 			}
 
-			return Gle.GetLamp(flow.GetValue<string>(Id)) > 0;
+			return Gle.GetLamp(flow.GetValue<string>(Id)).IsOn;
+		}
+
+		private Color GetColor(Flow flow)
+		{
+			if (!AssertGle(flow)) {
+				Debug.LogError("Cannot find GLE.");
+				return Color.black;
+			}
+
+			return Gle.GetLamp(flow.GetValue<string>(Id)).Color.ToUnityColor();
 		}
 	}
 }

Editor/Widgets/SetLampColorUnitWidget.cs

@@ -18,6 +18,6 @@ namespace VisualPinball.Unity.VisualScripting
 {
 	public enum LampDataType
 	{
-		Status, Intensity, Color,
+		OnOff, Status, Intensity, Color,
 	}
 }