switchlamp: add support for compare type matching

Author: jsm174

Editor/Inspectors/CompareTypeInspector.cs

@@ -0,0 +1,108 @@
+// Visual Pinball Engine
+// Copyright (C) 2022 freezy and VPE Team
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// 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 System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Reflection;
+using Unity.VisualScripting;
+using UnityEditor;
+using UnityEngine;
+
+namespace VisualPinball.Unity.VisualScripting.Editor
+{
+    [Inspector(typeof(CompareType))]
+    public class CompareTypeInspector : Inspector
+    {
+        private List<CompareType> CompareTypes = Enum.GetValues(typeof(CompareType)).Cast<CompareType>().ToList();
+        private string[] CompareTypeDescriptions = Enum.GetValues(typeof(CompareType)).Cast<CompareType>().Select(x => GetEnumDescription(x)).ToArray();
+        
+        public CompareTypeInspector(Metadata metadata) : base(metadata) {
+        }
+
+        public override void Initialize()
+        {
+            metadata.instantiate = true;
+
+            base.Initialize();
+        }
+
+        protected override float GetHeight(float width, GUIContent label)
+        {
+            return HeightWithLabel(metadata, width, EditorGUIUtility.singleLineHeight, label);
+        }
+
+        protected override void OnGUI(Rect position, GUIContent label)
+        {
+            position = BeginLabeledBlock(metadata, position, label);
+
+            var fieldPosition = new Rect
+                (
+                position.x,
+                position.y,
+                position.width,
+                EditorGUIUtility.singleLineHeight
+                );
+
+            var index = CompareTypes.FindIndex(c => c == (CompareType)metadata.value);
+            var newIndex = EditorGUI.Popup(fieldPosition, index, CompareTypeDescriptions);
+
+            if (EndBlock(metadata))
+			{
+                metadata.RecordUndo();
+                metadata.value = CompareTypes[newIndex];
+            }
+        }
+
+        public override float GetAdaptiveWidth()
+        {
+            return Mathf.Max(18, EditorStyles.popup.CalcSize(new GUIContent(GetEnumDescription((CompareType)metadata.value))).x + Styles.popup.fixedWidth);
+        }
+
+        private static string GetEnumDescription(Enum value)
+        {
+            FieldInfo field = value.GetType().GetField(value.ToString());
+
+            DescriptionAttribute attribute
+                    = Attribute.GetCustomAttribute(field, typeof(DescriptionAttribute))
+                        as DescriptionAttribute;
+
+            return (attribute == null ? value.ToString() : attribute.Description).Replace('/', '\u2215');
+        }
+    }
+
+    public static class Styles
+    {
+        static Styles()
+        {
+            popup = new GUIStyle("TextFieldDropDown");
+            popup.fixedWidth = 10;
+            popup.clipping = TextClipping.Clip;
+            popup.normal.textColor = ColorPalette.transparent;
+            popup.active.textColor = ColorPalette.transparent;
+            popup.hover.textColor = ColorPalette.transparent;
+            popup.focused.textColor = ColorPalette.transparent;
+            popup.onNormal.textColor = ColorPalette.transparent;
+            popup.onActive.textColor = ColorPalette.transparent;
+            popup.onHover.textColor = ColorPalette.transparent;
+            popup.onFocused.textColor = ColorPalette.transparent;
+        }
+
+        public static readonly GUIStyle textField;
+        public static readonly GUIStyle popup;
+    }
+}

Editor/Inspectors/CompareTypeInspector.cs.meta

@@ -37,6 +37,9 @@ public class SwitchLampUnit : GleUnit, IMultiInputUnit
 		[Serialize, Inspectable, UnitHeaderInspectable("Non Match")]
 		public LampDataType NonMatchDataType { get; set; }
 
+		[Serialize, Inspectable, UnitHeaderInspectable("Value Compare")]
+		public CompareType ValueCompareType { get; set; }
+
 		[DoNotSerialize]
 		[Inspectable, UnitHeaderInspectable("Lamp IDs")]
 		public int inputCount
@@ -134,8 +137,37 @@ private ControlOutput Process(Flow flow)
 
 				var lampIdValue = _lampIdValueCache[json.GetHashCode()];
 
-				var dataType = lampIdValue.value == sourceValue ? MatchDataType : NonMatchDataType;
-				var value = lampIdValue.value == sourceValue ? Match : NonMatch;
+				var match = false;
+
+				switch(ValueCompareType)
+				{
+					case CompareType.NotEqual:
+						match = lampIdValue.value != sourceValue;
+						break;
+
+					case CompareType.GreaterThan:
+						match = lampIdValue.value > sourceValue;
+						break;
+
+					case CompareType.GreaterThanEqual:
+						match = lampIdValue.value >= sourceValue;
+						break;
+
+					case CompareType.LessThan:
+						match = lampIdValue.value < sourceValue;
+						break;
+
+					case CompareType.LessThanEqual:
+						match = lampIdValue.value < sourceValue;
+						break;
+
+					default:
+						match = lampIdValue.value == sourceValue;
+						break;
+				}
+
+				var dataType = match ? MatchDataType : NonMatchDataType;
+				var value = match ? Match : NonMatch;
 
 				switch (dataType) {
 					case LampDataType.OnOff:

Runtime/Nodes/Lamps/SwitchLampUnit.cs

@@ -0,0 +1,41 @@
+// Visual Pinball Engine
+// Copyright (C) 2022 freezy and VPE Team
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// 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.ComponentModel;
+
+namespace VisualPinball.Unity.VisualScripting
+{
+	public enum CompareType
+	{
+        [Description("=")]
+        Equal,
+
+        [Description("\u2260")]
+        NotEqual,
+
+        [Description("<")]
+        LessThan,
+
+        [Description("\u2264")]
+        LessThanEqual,
+
+        [Description(">")]
+        GreaterThan,
+
+        [Description("\u2265")]
+        GreaterThanEqual
+    }
+}