fix: Add internal ID to lamp event so we can match the proper channel for RGB lamps.

Author: freezy

VisualPinball.Unity/VisualPinball.Unity/Game/Engine/IGamelogicEngine.cs

@@ -228,10 +228,15 @@ public CoilEventArgs(string id, bool isEnabled)
 	public readonly struct LampEventArgs
 	{
 		/// <summary>
-		/// Id of the lamp, as defined by <see cref="IGamelogicEngine.RequestedLamps"/>.
+		/// ID of the lamp, as defined by <see cref="IGamelogicEngine.RequestedLamps"/>.
 		/// </summary>
 		public readonly string Id;
 
+		/// <summary>
+		/// Internal ID of the lamp. Some lamps have multiple internal IDs per ID, like RGBs.
+		/// </summary>
+		public readonly int InternalId;
+
 		/// <summary>
 		/// The intensity of the light. The range is dependent on the GLE,
 		/// i.e. PinMAME sends 0-255 or sometimes 0-8 for GI. MPF sends 0-1.
@@ -252,6 +257,16 @@ public readonly struct LampEventArgs
 		public LampEventArgs(string id, float value, LampSource source = LampSource.Lamp)
 		{
 			Id = id;
+			InternalId = int.TryParse(id, out var internalId) ? internalId : 0;
+			Value = value;
+			Source = source;
+			IsCoil = false;
+		}
+
+		public LampEventArgs(string id, int internalId, float value, LampSource source = LampSource.Lamp)
+		{
+			Id = id;
+			InternalId = internalId;
 			Value = value;
 			Source = source;
 			IsCoil = false;
@@ -260,6 +275,7 @@ public LampEventArgs(string id, float value, LampSource source = LampSource.Lamp
 		public LampEventArgs(string id, float value, bool isCoil, LampSource source = LampSource.Lamp)
 		{
 			Id = id;
+			InternalId = int.TryParse(id, out var internalId) ? internalId : 0;
 			Value = value;
 			Source = source;
 			IsCoil = isCoil;

VisualPinball.Unity/VisualPinball.Unity/Game/LampPlayer.cs

@@ -92,18 +92,18 @@ public void OnStart()
 		private void HandleLampsEvent(object sender, LampsEventArgs lampsEvent)
 		{
 			foreach (var lampEvent in lampsEvent.LampsChanged) {
-				Apply(lampEvent.Id, lampEvent.Source, lampEvent.IsCoil, (state, lamp, mapping) => ApplyValue(lampEvent.Id, lampEvent.Value, state, lamp, mapping));
+				Apply(lampEvent.Id, lampEvent.Source, lampEvent.IsCoil, (state, lamp, mapping) => ApplyValue(lampEvent.Id, lampEvent.InternalId, lampEvent.Value, state, lamp, mapping));
 			}
 		}
 
 		private void HandleLampEvent(object sender, LampEventArgs lampEvent)
 		{
-			Apply(lampEvent.Id, lampEvent.Source, lampEvent.IsCoil, (state, lamp, mapping) => ApplyValue(lampEvent.Id, lampEvent.Value, state, lamp, mapping));
+			Apply(lampEvent.Id, lampEvent.Source, lampEvent.IsCoil, (state, lamp, mapping) => ApplyValue(lampEvent.Id, lampEvent.InternalId, lampEvent.Value, state, lamp, mapping));
 		}
 
 		public void HandleLampEvent(string id, float value)
 		{
-			Apply(id, LampSource.Lamp, false, (state, lamp, mapping) => ApplyValue(id, value, state, lamp, mapping));
+			Apply(id, LampSource.Lamp, false, (state, lamp, mapping) => ApplyValue(id, int.TryParse(id, out var internalId) ? internalId : 0, value, state, lamp, mapping));
 		}
 
 		public void HandleLampEvent(string id, LampStatus status)
@@ -163,7 +163,7 @@ private void ApplyColor(string id, Color color, LampState state, IApiLamp? lamp)
 			lamp?.OnLamp(state.Color.ToUnityColor());
 		}
 
-		private void ApplyValue(string id, float value, LampState state, IApiLamp? lamp, LampMapping? mapping)
+		private void ApplyValue(string id, int internalId, float value, LampState state, IApiLamp? lamp, LampMapping? mapping)
 		{
 			if (mapping == null) {
 				// if not mapped, there is no lamp, so just save the state.
@@ -188,9 +188,11 @@ private void ApplyValue(string id, float value, LampState state, IApiLamp? lamp,
 					break;
 
 				case LampType.RgbMulti:
-					state.SetChannel(mapping.Channel, value / 255f); // todo test
-					LampStates[id] = state;
-					lamp?.OnLamp(state.Color.ToUnityColor());
+					if (mapping.InternalId == internalId) {
+						state.SetChannel(mapping.Channel, value / 255f);
+						LampStates[id] = state;
+						lamp?.OnLamp(state.Color.ToUnityColor());
+					}
 					break;
 
 				case LampType.SingleFading: