com.artromskiy.deltaecs.unity 0.0.53 → 0.0.56

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 0.0.56
+
+- Published with the matching DeltaECS NuGet packages.
+
+## 0.0.54
+
+- Published with the matching DeltaECS NuGet packages.
+
 ## 0.0.53
 
 - Published with the matching DeltaECS NuGet packages.

package/Editor/BoundEntityRootEditor.cs

@@ -1,66 +1,16 @@
 using System;
 using System.Collections.Generic;
+
 using Delta.ECS;
+
 using UnityEditor;
 using UnityEditor.UIElements;
+
 using UnityEngine;
 using UnityEngine.UIElements;
 
 namespace Delta.ECS.Unity.Editor
 {
-    internal static class BoundEntityRootEditorSelector
-    {
-        private static bool _creatingDefaultGameObjectEditor;
-
-        [RootEditor(supportsAddComponent: true)]
-        private static Type SelectRootEditor(UnityEngine.Object[] objects)
-        {
-            if (_creatingDefaultGameObjectEditor)
-            {
-                return null;
-            }
-
-            if (objects == null || objects.Length != 1
-                || objects[0] is not GameObject gameObject
-                || gameObject == null)
-            {
-                return null;
-            }
-
-            if (SceneWorld.TryFindLiveWorld(gameObject, out _, out _))
-            {
-                return typeof(BoundEntityRootEditor);
-            }
-
-            if (EditorApplication.isPlayingOrWillChangePlaymode)
-            {
-                return null;
-            }
-
-            SceneAuthoring authoring = SceneAuthoring.FindForScene(gameObject.scene);
-            return authoring != null && authoring.TryGetStableId(gameObject, out _)
-                ? typeof(BoundEntityRootEditor)
-                : null;
-        }
-
-        internal static UnityEditor.Editor CreateDefaultGameObjectEditor(GameObject gameObject)
-        {
-            if (gameObject == null)
-            {
-                return null;
-            }
-
-            _creatingDefaultGameObjectEditor = true;
-            try
-            {
-                return UnityEditor.Editor.CreateEditor(gameObject);
-            }
-            finally
-            {
-                _creatingDefaultGameObjectEditor = false;
-            }
-        }
-    }
 
     internal sealed class BoundEntityRootEditor : UnityEditor.Editor
     {
@@ -73,54 +23,6 @@ namespace Delta.ECS.Unity.Editor
         private SceneEntityInspectorView _view;
         private VisualElement _componentInspectorRoot;
 
-        private void OnEnable()
-        {
-            if (target is GameObject gameObject && gameObject != null)
-            {
-                _gameObjectEditor = BoundEntityRootEditorSelector.CreateDefaultGameObjectEditor(gameObject);
-            }
-
-            _view = new SceneEntityInspectorView(ResolveTarget, embedded: true);
-            EditorApplication.hierarchyChanged += RefreshComponentInspectors;
-            Undo.undoRedoPerformed += RefreshComponentInspectors;
-        }
-
-        private void OnDisable()
-        {
-            _view?.Dispose();
-            _view = null;
-            if (_gameObjectEditor != null)
-            {
-                DestroyImmediate(_gameObjectEditor);
-                _gameObjectEditor = null;
-            }
-
-            EditorApplication.hierarchyChanged -= RefreshComponentInspectors;
-            Undo.undoRedoPerformed -= RefreshComponentInspectors;
-            _componentInspectorRoot = null;
-            DisposeComponentEditors();
-        }
-
-        protected override void OnHeaderGUI()
-        {
-            // The root editor's generic object header is replaced by the native
-            // GameObjectInspector header embedded at the top of CreateInspectorGUI.
-        }
-
-        private void DisposeComponentEditors()
-        {
-            foreach (UnityEditor.Editor componentEditor in _componentEditors)
-            {
-                if (componentEditor != null)
-                {
-                    DestroyImmediate(componentEditor);
-                }
-            }
-
-            _componentEditors.Clear();
-            _componentTargets.Clear();
-        }
-
         public override bool UseDefaultMargins() => false;
 
         public override bool RequiresConstantRepaint()
@@ -186,6 +88,57 @@ namespace Delta.ECS.Unity.Editor
             return root;
         }
 
+        protected override void OnHeaderGUI()
+        {
+            // The root editor's generic object header is replaced by the native
+            // GameObjectInspector header embedded at the top of CreateInspectorGUI.
+        }
+
+        private static bool ShouldDrawComponent(Component component) => component != null
+            && (component.hideFlags & HideFlags.HideInInspector) == 0;
+
+        private void OnEnable()
+        {
+            if (target is GameObject gameObject && gameObject != null)
+            {
+                _gameObjectEditor = BoundEntityRootEditorSelector.CreateDefaultGameObjectEditor(gameObject);
+            }
+
+            _view = new SceneEntityInspectorView(ResolveTarget, embedded: true);
+            EditorApplication.hierarchyChanged += RefreshComponentInspectors;
+            Undo.undoRedoPerformed += RefreshComponentInspectors;
+        }
+
+        private void OnDisable()
+        {
+            _view?.Dispose();
+            _view = null;
+            if (_gameObjectEditor != null)
+            {
+                DestroyImmediate(_gameObjectEditor);
+                _gameObjectEditor = null;
+            }
+
+            EditorApplication.hierarchyChanged -= RefreshComponentInspectors;
+            Undo.undoRedoPerformed -= RefreshComponentInspectors;
+            _componentInspectorRoot = null;
+            DisposeComponentEditors();
+        }
+
+        private void DisposeComponentEditors()
+        {
+            foreach (UnityEditor.Editor componentEditor in _componentEditors)
+            {
+                if (componentEditor != null)
+                {
+                    DestroyImmediate(componentEditor);
+                }
+            }
+
+            _componentEditors.Clear();
+            _componentTargets.Clear();
+        }
+
         private void DrawGameObjectHeader(UnityEditor.Editor gameObjectEditor)
         {
             if (gameObjectEditor == null
@@ -274,9 +227,6 @@ namespace Delta.ECS.Unity.Editor
             }
         }
 
-        private static bool ShouldDrawComponent(Component component) => component != null
-            && (component.hideFlags & HideFlags.HideInInspector) == 0;
-
         private EntityInspectorTarget ResolveTarget()
         {
             if (target is not GameObject gameObject || gameObject == null)
@@ -302,4 +252,57 @@ namespace Delta.ECS.Unity.Editor
             return default;
         }
     }
+    internal static class BoundEntityRootEditorSelector
+    {
+        private static bool _creatingDefaultGameObjectEditor;
+
+        internal static UnityEditor.Editor CreateDefaultGameObjectEditor(GameObject gameObject)
+        {
+            if (gameObject == null)
+            {
+                return null;
+            }
+
+            _creatingDefaultGameObjectEditor = true;
+            try
+            {
+                return UnityEditor.Editor.CreateEditor(gameObject);
+            }
+            finally
+            {
+                _creatingDefaultGameObjectEditor = false;
+            }
+        }
+
+        [RootEditor(supportsAddComponent: true)]
+        private static Type SelectRootEditor(UnityEngine.Object[] objects)
+        {
+            if (_creatingDefaultGameObjectEditor)
+            {
+                return null;
+            }
+
+            if (objects == null || objects.Length != 1
+                || objects[0] is not GameObject gameObject
+                || gameObject == null)
+            {
+                return null;
+            }
+
+            if (SceneWorld.TryFindLiveWorld(gameObject, out _, out _))
+            {
+                return typeof(BoundEntityRootEditor);
+            }
+
+            if (EditorApplication.isPlayingOrWillChangePlaymode)
+            {
+                return null;
+            }
+
+            SceneAuthoring authoring = SceneAuthoring.FindForScene(gameObject.scene);
+            return authoring != null && authoring.TryGetStableId(gameObject, out _)
+                ? typeof(BoundEntityRootEditor)
+                : null;
+        }
+    }
 }

package/Editor/ComponentDropdown.cs

@@ -2,8 +2,11 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
+
 using Delta.ECS.Integration;
+
 using UnityEditor.IMGUI.Controls;
+
 using UnityEngine;
 
 namespace Delta.ECS.Unity.Editor

package/Editor/ComponentListController.cs

@@ -1,5 +1,6 @@
-using UnityEditor.UIElements;
 using UnityEditor.IMGUI.Controls;
+using UnityEditor.UIElements;
+
 using UnityEngine;
 using UnityEngine.UIElements;
 

package/Editor/ComponentPropertyBagFields.cs

@@ -1,30 +1,21 @@
 using System;
 using System.Collections.Generic;
+
 using Delta;
 using Delta.ECS;
 using Delta.ECS.Integration;
 using Delta.ECS.Unity;
+
 using Unity.Properties;
+
 using UnityEditor;
 using UnityEditor.UIElements;
+
 using UnityEngine;
 using UnityEngine.UIElements;
 
 namespace Delta.ECS.Unity.Editor
 {
-    internal readonly struct ComponentPropertyBinding
-    {
-        internal readonly string[] Path;
-        internal readonly Type ValueType;
-        internal readonly VisualElement Control;
-
-        internal ComponentPropertyBinding(string[] path, Type valueType, VisualElement control)
-        {
-            Path = path;
-            ValueType = valueType;
-            Control = control;
-        }
-    }
 
     internal static class ComponentPropertyBagFields
     {
@@ -50,86 +41,6 @@ namespace Delta.ECS.Unity.Editor
             return bindings.ToArray();
         }
 
-        private sealed class PropertyFieldVisitor : IPropertyBagVisitor, IPropertyVisitor
-        {
-            private readonly VisualElement _parent;
-            private readonly bool _canWrite;
-            private readonly string[] _path;
-            private readonly int _depth;
-            private readonly List<ComponentPropertyBinding> _bindings;
-            private readonly Action<string[], object> _onChanged;
-            private readonly Func<string, Entity, Action<object>, VisualElement> _createEntityField;
-
-            internal PropertyFieldVisitor(VisualElement parent, bool canWrite, string[] path, int depth,
-                List<ComponentPropertyBinding> bindings, Action<string[], object> onChanged,
-                Func<string, Entity, Action<object>, VisualElement> createEntityField)
-            {
-                _parent = parent;
-                _canWrite = canWrite;
-                _path = path;
-                _depth = depth;
-                _bindings = bindings;
-                _onChanged = onChanged;
-                _createEntityField = createEntityField;
-            }
-
-            public void Visit<TContainer>(IPropertyBag<TContainer> properties, ref TContainer container)
-            {
-                foreach (var property in properties.GetProperties(ref container))
-                {
-                    ((IPropertyAccept<TContainer>)property).Accept(this, ref container);
-                }
-            }
-
-            public void Visit<TContainer, TValue>(Property<TContainer, TValue> property, ref TContainer container)
-            {
-                TValue value = property.GetValue(ref container);
-                Type valueType = typeof(TValue);
-                string[] path = Append(_path, property.Name);
-                string label = GetLabel(property.Name);
-                bool canWrite = _canWrite && !property.IsReadOnly;
-
-                VisualElement control = CreateFieldControl(label, valueType, value,
-                    next => _onChanged(path, next), canWrite, _createEntityField);
-                if (control != null)
-                {
-                    _parent.Add(control);
-                    _bindings.Add(new ComponentPropertyBinding(path, valueType, control));
-                    return;
-                }
-
-                if (value != null && _depth < 24)
-                {
-                    object nestedValue = value;
-                    IPropertyBag nestedBag = PropertyBag.GetPropertyBag(nestedValue.GetType());
-                    if (nestedBag != null)
-                    {
-                        var foldout = new Foldout { text = label, value = true };
-                        foldout.AddToClassList("ecs-property-foldout");
-                        _parent.Add(foldout);
-                        int previousCount = _bindings.Count;
-                        bool canWriteNested = canWrite && valueType.IsValueType;
-                        var nestedVisitor = new PropertyFieldVisitor(foldout, canWriteNested, path,
-                            _depth + 1, _bindings, _onChanged, _createEntityField);
-                        nestedBag.Accept(nestedVisitor, ref nestedValue);
-                        if (_bindings.Count == previousCount)
-                        {
-                            var empty = new Label("No exposed properties.");
-                            empty.AddToClassList("ecs-empty-component");
-                            foldout.Add(empty);
-                        }
-
-                        return;
-                    }
-                }
-
-                string detail = value == null ? "Null" : $"Unsupported: {valueType.Name}";
-                var unsupported = new Label($"{label}  ·  {detail}");
-                unsupported.AddToClassList("ecs-unsupported-field");
-                _parent.Add(unsupported);
-            }
-        }
-
         private static VisualElement CreateFieldControl(string label, Type type, object value,
             Action<object> onChanged, bool canWrite,
             Func<string, Entity, Action<object>, VisualElement> createEntityField)
@@ -276,5 +187,98 @@ namespace Delta.ECS.Unity.Editor
                 ? $"Element {index}"
                 : ObjectNames.NicifyVariableName(name);
         }
+
+        private sealed class PropertyFieldVisitor : IPropertyBagVisitor, IPropertyVisitor
+        {
+            private readonly VisualElement _parent;
+            private readonly bool _canWrite;
+            private readonly string[] _path;
+            private readonly int _depth;
+            private readonly List<ComponentPropertyBinding> _bindings;
+            private readonly Action<string[], object> _onChanged;
+            private readonly Func<string, Entity, Action<object>, VisualElement> _createEntityField;
+
+            internal PropertyFieldVisitor(VisualElement parent, bool canWrite, string[] path, int depth,
+                List<ComponentPropertyBinding> bindings, Action<string[], object> onChanged,
+                Func<string, Entity, Action<object>, VisualElement> createEntityField)
+            {
+                _parent = parent;
+                _canWrite = canWrite;
+                _path = path;
+                _depth = depth;
+                _bindings = bindings;
+                _onChanged = onChanged;
+                _createEntityField = createEntityField;
+            }
+
+            public void Visit<TContainer>(IPropertyBag<TContainer> properties, ref TContainer container)
+            {
+                foreach (var property in properties.GetProperties(ref container))
+                {
+                    ((IPropertyAccept<TContainer>)property).Accept(this, ref container);
+                }
+            }
+
+            public void Visit<TContainer, TValue>(Property<TContainer, TValue> property, ref TContainer container)
+            {
+                TValue value = property.GetValue(ref container);
+                Type valueType = typeof(TValue);
+                string[] path = Append(_path, property.Name);
+                string label = GetLabel(property.Name);
+                bool canWrite = _canWrite && !property.IsReadOnly;
+
+                VisualElement control = CreateFieldControl(label, valueType, value,
+                    next => _onChanged(path, next), canWrite, _createEntityField);
+                if (control != null)
+                {
+                    _parent.Add(control);
+                    _bindings.Add(new ComponentPropertyBinding(path, valueType, control));
+                    return;
+                }
+
+                if (value != null && _depth < 24)
+                {
+                    object nestedValue = value;
+                    IPropertyBag nestedBag = PropertyBag.GetPropertyBag(nestedValue.GetType());
+                    if (nestedBag != null)
+                    {
+                        var foldout = new Foldout { text = label, value = true };
+                        foldout.AddToClassList("ecs-property-foldout");
+                        _parent.Add(foldout);
+                        int previousCount = _bindings.Count;
+                        bool canWriteNested = canWrite && valueType.IsValueType;
+                        var nestedVisitor = new PropertyFieldVisitor(foldout, canWriteNested, path,
+                            _depth + 1, _bindings, _onChanged, _createEntityField);
+                        nestedBag.Accept(nestedVisitor, ref nestedValue);
+                        if (_bindings.Count == previousCount)
+                        {
+                            var empty = new Label("No exposed properties.");
+                            empty.AddToClassList("ecs-empty-component");
+                            foldout.Add(empty);
+                        }
+
+                        return;
+                    }
+                }
+
+                string detail = value == null ? "Null" : $"Unsupported: {valueType.Name}";
+                var unsupported = new Label($"{label}  ·  {detail}");
+                unsupported.AddToClassList("ecs-unsupported-field");
+                _parent.Add(unsupported);
+            }
+        }
+    }
+    internal readonly struct ComponentPropertyBinding
+    {
+        internal readonly string[] Path;
+        internal readonly Type ValueType;
+        internal readonly VisualElement Control;
+
+        internal ComponentPropertyBinding(string[] path, Type valueType, VisualElement control)
+        {
+            Path = path;
+            ValueType = valueType;
+            Control = control;
+        }
     }
 }

package/Editor/EditorLifecycle.cs

@@ -1,5 +1,6 @@
 using UnityEditor;
 using UnityEditor.SceneManagement;
+
 using UnityEngine;
 using UnityEngine.SceneManagement;
 

package/Editor/EntityInspectorTarget.cs

@@ -9,6 +9,8 @@ namespace Delta.ECS.Unity.Editor
         internal readonly SceneWorld RuntimeWorld;
         internal readonly Entity RuntimeEntity;
 
+        internal bool IsRuntime => RuntimeWorld != null && RuntimeEntity.IsValid;
+
         internal EntityInspectorTarget(
             SceneAuthoring authoring,
             string stableId,
@@ -20,7 +22,5 @@ namespace Delta.ECS.Unity.Editor
             RuntimeWorld = runtimeWorld;
             RuntimeEntity = runtimeEntity;
         }
-
-        internal bool IsRuntime => RuntimeWorld != null && RuntimeEntity.IsValid;
     }
 }

package/Editor/HierarchyMenu.cs

@@ -1,7 +1,10 @@
 using System;
+
 using Unity.Hierarchy;
+
 using UnityEditor;
 using UnityEditor.SceneManagement;
+
 using UnityEngine;
 using UnityEngine.SceneManagement;
 
@@ -11,33 +14,6 @@ namespace Delta.ECS.Unity.Editor
     {
         internal static event Action<SceneAuthoring> AuthoringChanged;
 
-        [MenuItem("GameObject/Delta ECS Entity", false, 10)]
-        private static void CreateEntityFromHierarchyMenu(MenuCommand command)
-        {
-            GameObject contextObject = command.context as GameObject;
-            Scene scene = contextObject != null
-                ? contextObject.scene
-                : SceneManager.GetActiveScene();
-
-            SceneAuthoring authoring = SceneAuthoring.GetOrCreateForScene(scene);
-            CreateEntity(authoring);
-        }
-
-        [MenuItem("GameObject/Delta ECS Entity", true)]
-        private static bool ValidateCreateEntityFromHierarchyMenu() =>
-            !EditorApplication.isPlayingOrWillChangePlaymode;
-
-        [MenuItem("Tools/Delta ECS/Create Entity", false, 31)]
-        private static void CreateEntityMenu()
-        {
-            Scene scene = SceneManager.GetActiveScene();
-            SceneAuthoring authoring = SceneAuthoring.GetOrCreateForScene(scene);
-            CreateEntity(authoring);
-        }
-
-        [MenuItem("Tools/Delta ECS/Create Entity", true)]
-        private static bool ValidateCreateEntityMenu() => !EditorApplication.isPlayingOrWillChangePlaymode;
-
         internal static EntityAuthoring CreateEntity(
             SceneAuthoring authoring,
             HierarchyView view = null)
@@ -81,5 +57,32 @@ namespace Delta.ECS.Unity.Editor
             EditorUtility.SetDirty(authoring);
             EditorSceneManager.MarkSceneDirty(authoring.gameObject.scene);
         }
+
+        [MenuItem("GameObject/Delta ECS Entity", false, 10)]
+        private static void CreateEntityFromHierarchyMenu(MenuCommand command)
+        {
+            GameObject contextObject = command.context as GameObject;
+            Scene scene = contextObject != null
+                ? contextObject.scene
+                : SceneManager.GetActiveScene();
+
+            SceneAuthoring authoring = SceneAuthoring.GetOrCreateForScene(scene);
+            CreateEntity(authoring);
+        }
+
+        [MenuItem("GameObject/Delta ECS Entity", true)]
+        private static bool ValidateCreateEntityFromHierarchyMenu() =>
+            !EditorApplication.isPlayingOrWillChangePlaymode;
+
+        [MenuItem("Tools/Delta ECS/Create Entity", false, 31)]
+        private static void CreateEntityMenu()
+        {
+            Scene scene = SceneManager.GetActiveScene();
+            SceneAuthoring authoring = SceneAuthoring.GetOrCreateForScene(scene);
+            CreateEntity(authoring);
+        }
+
+        [MenuItem("Tools/Delta ECS/Create Entity", true)]
+        private static bool ValidateCreateEntityMenu() => !EditorApplication.isPlayingOrWillChangePlaymode;
     }
 }