Merge pull request #105 from OpenCommissioning/hotfix_unity_6_4

Hotfix unity 6 4

Author: Preliy

Editor/Scripts/Hierarchy/ProjectInspectorWindow.cs

@@ -253,7 +253,11 @@ private void ApplySearchFilter(string filter)
 
         private void ResetOverride()
         {
+#if UNITY_6000_3_OR_NEWER
+            var devices = FindObjectsByType<MonoBehaviour>(FindObjectsSortMode.InstanceID).OfType<IDevice>().ToList();
+#else
             var devices = FindObjectsOfType<MonoBehaviour>().OfType<IDevice>().ToList();
+#endif
             foreach (var item in devices.Where(item => item.Override.Value))
             {
                 item.Override.Value = false;

Editor/Scripts/Inspector/Cylinder.cs

@@ -23,7 +23,7 @@ public override VisualElement CreateInspectorGUI()
             groupControl.Add(hStack);
 
             var groupStatus = new PropertyGroup("Status");
-            groupStatus.Add(new ProgressBar("Progress"){bindingPath = "_progress._value", ShowLimits = true});
+            groupStatus.Add(new OCProgressBar("Progress"){bindingPath = "_progress._value", ShowLimits = true});
             groupStatus.Add(new FloatField("Value"){isReadOnly = true, bindingPath = "_value._value"}.AlignedField());
 
             var groupSettings = new PropertyGroup("Settings");

Editor/Scripts/SceneInteractionTool.cs

@@ -19,10 +19,15 @@ public class SceneInteractionTool : EditorTool
         private readonly List<Interaction> _hitInteractions = new ();
         private int _hitsCount;
         private Interaction _activeInteraction;
-        private int[] _outlineRenderers = Array.Empty<int>();
         private const string ICON = "d_EventTrigger Icon";
         private readonly GUIStyle _roundedBoxStyle = new ();
 
+#if UNITY_6000_4_OR_NEWER
+        private EntityId[] _outlineRenderers = Array.Empty<EntityId>();
+#else
+       private int[] _outlineRenderers = Array.Empty<int>();
+#endif
+        
         [Shortcut("Scene Interaction Tool", typeof(SceneView), KeyCode.I)]
         private static void SceneViewInteractionShortcut()
         {
@@ -199,11 +204,21 @@ private void RayCast(Event currentEvent)
             _activeInteraction = _hitInteractions.First();
             PointerEnterEvent(_activeInteraction);
 
+            
+#if UNITY_6000_4_OR_NEWER
+            _outlineRenderers = new EntityId[_activeInteraction.Renderers.Count];
+            for (var i = 0; i < _activeInteraction.Renderers.Count; i++)
+            {
+                _outlineRenderers[i] = _activeInteraction.Renderers[i].GetEntityId();
+            }
+#else
             _outlineRenderers = new int[_activeInteraction.Renderers.Count];
             for (var i = 0; i < _activeInteraction.Renderers.Count; i++)
             {
                 _outlineRenderers[i] = _activeInteraction.Renderers[i].GetInstanceID();
             }
+#endif
+            
         }
 
         private void ResetHit()

Editor/Scripts/Snapping/SnappingTool.cs

@@ -34,7 +34,11 @@ private static void SnappingToolShortcut()
 
         public override void OnActivated()
         {
+#if UNITY_6000_3_OR_NEWER
+            _sceneSnappingPoints = FindObjectsByType<SnappingPoint>(FindObjectsSortMode.InstanceID).ToList();
+#else
             _sceneSnappingPoints = FindObjectsOfType<SnappingPoint>().ToList();
+#endif
         }
 
         public override void OnWillBeDeactivated()

Editor/Scripts/VisualElements/LampField.cs

@@ -5,6 +5,11 @@
 
 namespace OC.Editor
 {
+#if UNITY_6000_3_OR_NEWER
+    [UxmlElement("OCEditorLampField")]
+    public partial class LampField : BaseField<bool> 
+    {
+#else
     public class LampField : BaseField<bool>
     {
         public new class UxmlFactory : UxmlFactory<LampField, UxmlTraits> { }
@@ -25,7 +30,7 @@ public override void Init(VisualElement ve, IUxmlAttributes bag, CreationContext
                 baseFieldLamp.LampShape = _lampShape.GetValueFromBag(bag, cc); 
             }
         }
-        
+#endif
         public override bool value
         {
             get => base.value;
@@ -36,6 +41,9 @@ public override bool value
             }
         }
 
+#if UNITY_6000_3_OR_NEWER
+        [UxmlAttribute("Lamp-Shape")]
+#endif
         public InspectorLampShape LampShape
         {
             get => _lampShape;

…or/Scripts/VisualElements/ProgressBar.cs …/Scripts/VisualElements/OCProgressBar.csEditor/Scripts/VisualElements/ProgressBar.cs renamed to Editor/Scripts/VisualElements/OCProgressBar.cs Editor/Scripts/VisualElements/ProgressBar.cs renamed to Editor/Scripts/VisualElements/OCProgressBar.cs

@@ -4,6 +4,11 @@
 
 namespace OC.Editor
 {
+#if UNITY_6000_3_OR_NEWER
+    [UxmlElement("OCEditorProgressBarWithLimits")]
+    public partial class OCProgressBar : UnityEngine.UIElements.ProgressBar
+    {
+#else  
     public class ProgressBar : UnityEngine.UIElements.ProgressBar
     {
         public new class UxmlFactory : UxmlFactory<ProgressBar, UxmlTraits> { }
@@ -28,7 +33,11 @@ public override void Init(VisualElement ve, IUxmlAttributes bag, CreationContext
                 progressBar.ColorBackground = _colorBackground.GetValueFromBag(bag, cc);
             }
         }
-
+#endif
+        
+#if UNITY_6000_3_OR_NEWER
+        [UxmlAttribute("Color-Bar")]
+#endif
         public Color ColorBar
         {
             get => _colorBar;
@@ -39,6 +48,9 @@ public Color ColorBar
             }
         }
 
+#if UNITY_6000_3_OR_NEWER
+        [UxmlAttribute("Color-Background")]
+#endif
         public Color ColorBackground
         {
             get => _colorBackground;
@@ -48,7 +60,10 @@ public Color ColorBackground
                 _colorBackground = value;
             }
         }
-
+        
+#if UNITY_6000_3_OR_NEWER
+        [UxmlAttribute("Show-Limits")]
+#endif
         public bool ShowLimits
         {
             get => _showLimits;
@@ -101,9 +116,9 @@ public bool Max
         private const string LIMIT_USS_CLASS_NAME = "progress-bar__limit";
         private const string LIMIT_ACTIVE_USS_CLASS_NAME = "progress-bar__limit-active";
 
-        public ProgressBar() : this(""){}
+        public OCProgressBar() : this(""){}
 
-        public ProgressBar(string title)
+        public OCProgressBar(string title)
         {
             this.title = title;
             styleSheets.Add(Resources.Load<StyleSheet>(USS));

…ripts/VisualElements/ProgressBar.cs.meta …pts/VisualElements/OCProgressBar.cs.metaEditor/Scripts/VisualElements/ProgressBar.cs.meta renamed to Editor/Scripts/VisualElements/OCProgressBar.cs.meta Editor/Scripts/VisualElements/ProgressBar.cs.meta renamed to Editor/Scripts/VisualElements/OCProgressBar.cs.meta

@@ -6,6 +6,11 @@
 
 namespace OC.Editor
 {
+#if UNITY_6000_3_OR_NEWER
+    [UxmlElement("OCEditorPropertyGroup")]
+    public partial class PropertyGroup : VisualElement
+    {
+#else
     public class PropertyGroup : VisualElement
     {
         public new class UxmlFactory : UxmlFactory<PropertyGroup, UxmlTraits> { }
@@ -26,7 +31,11 @@ public override void Init(VisualElement ve, IUxmlAttributes bag, CreationContext
                 group.Label = _label.GetValueFromBag(bag, cc); 
             }
         }
+#endif
 
+#if UNITY_6000_3_OR_NEWER
+        [UxmlAttribute("Label")]
+#endif
         public string Label
         {
             get => _labelElement.text;

Editor/Scripts/VisualElements/PropertyGroup.cs

@@ -4,6 +4,11 @@
 
 namespace OC.Editor
 {
+#if UNITY_6000_4_OR_NEWER
+    [UxmlElement]
+    public partial class PushButton : BaseField<bool>
+    {
+#else
     public class PushButton : BaseField<bool>
     {
         public new class UxmlFactory : UxmlFactory<PushButton, UxmlTraits> { }
@@ -14,6 +19,7 @@ public UxmlTraits()
                 focusable.defaultValue = false;
             }
         }
+#endif
 
         private const string USS = "StyleSheet/oc-inspector";
         private const string USS_CLASS_NAME = "button";

Editor/Scripts/VisualElements/PushButton.cs

@@ -3,6 +3,12 @@
 
 namespace OC.Editor
 {
+#if UNITY_6000_4_OR_NEWER
+    [UxmlElement]
+    public partial class ToggleButton : Toggle
+    {
+#else
+    
     public class ToggleButton : Toggle
     {
         public new class UxmlFactory : UxmlFactory<ToggleButton, UxmlTraits> { }
@@ -13,6 +19,7 @@ public UxmlTraits()
                 focusable.defaultValue = false;
             }
         }
+#endif
 
         private const string USS = "StyleSheet/oc-inspector";
         private const string USS_CLASS_NAME = "button";