com.artromskiy.deltaecs.unity 0.0.63 → 0.0.65

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 0.0.65
+
+- Published with the matching DeltaECS NuGet packages.
+
+## 0.0.64
+
+- Published with the matching DeltaECS NuGet packages.
+
 ## 0.0.63
 
 - Published with the matching DeltaECS NuGet packages.

package/Editor/ComponentDropdown.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 
-
 using UnityEditor.IMGUI.Controls;
 
 using UnityEngine;

package/Editor/HierarchyNodeHandler.cs

@@ -19,7 +19,6 @@ namespace Delta.ECS.Unity.Editor
     internal sealed class HierarchyNodeHandler : HierarchyNodeTypeHandler
     {
         private const double RuntimeHierarchyRefreshInterval = 0.5d;
-        private static readonly ComponentId[] NoRequiredComponents = Array.Empty<ComponentId>();
         private static readonly SchemaId HiddenEntitySchema = new(ViewComponentSchemaIds.HideFromEntityHierarchy);
         private static double _nextRuntimeHierarchyRefresh;
         private static bool _wasPlaying;
@@ -32,6 +31,8 @@ namespace Delta.ECS.Unity.Editor
         private readonly HashSet<HierarchyView> _boundViews = new();
         private readonly Dictionary<HierarchyView, BlockedDrag> _blockedDrags = new();
         private readonly Dictionary<SceneAuthoring, Action<SceneDataChange>> _sceneDataSubscriptions = new();
+        private readonly HashSet<SceneAuthoring> _loadedAuthorings = new();
+        private readonly List<SceneAuthoring> _removedAuthorings = new();
 
         static HierarchyNodeHandler()
         {
@@ -98,6 +99,8 @@ namespace Delta.ECS.Unity.Editor
                 }
             }
             _sceneDataSubscriptions.Clear();
+            _loadedAuthorings.Clear();
+            _removedAuthorings.Clear();
             _entityNodes.Clear();
             _activeEntityKeys.Clear();
             _removedEntityKeys.Clear();
@@ -594,11 +597,11 @@ namespace Delta.ECS.Unity.Editor
             HierarchyNode sceneNode,
             SceneWorld runtimeWorld)
         {
-            Query query = runtimeWorld.World.WhereNone(runtimeWorld.HiddenEntityHierarchyComponentId)
-                .WhereAll(NoRequiredComponents);
+            Query query = runtimeWorld.World.WhereNone(runtimeWorld.HiddenEntityHierarchyComponentId);
             bool changed = false;
-            runtimeWorld.World.ForEachEntity(in query, entity =>
+            runtimeWorld.World.ForEachEntity(in query, entityRef =>
             {
+                Entity entity = entityRef;
                 if (runtimeWorld.TryGetStableId(entity, out _) || runtimeWorld.TryGetView(entity, out _))
                 {
                     return;
@@ -606,29 +609,13 @@ namespace Delta.ECS.Unity.Editor
 
                 var key = new EntityKey(runtimeWorld, entity);
                 _activeEntityKeys.Add(key);
-                string name = $"ECS Entity {entity.Index}:{entity.Generation}";
-                var reference = new NodeReference(authoring, null, runtimeWorld, entity);
-                if (_entityNodes.TryGetValue(key, out EntityNode entityNode))
+                if (_entityNodes.ContainsKey(key))
                 {
-                    if (entityNode.Reference.RuntimeWorld != reference.RuntimeWorld
-                        || entityNode.Reference.RuntimeEntity != reference.RuntimeEntity)
-                    {
-                        entityNode.Reference = reference;
-                        changed = true;
-                    }
-
-                    if (!string.Equals(entityNode.Name, name, StringComparison.Ordinal))
-                    {
-                        CommandList.SetName(entityNode.Node, name);
-                        entityNode.Name = name;
-                        changed = true;
-                    }
-
-                    _entityNodes[key] = entityNode;
-                    _nodes[entityNode.Node] = reference;
                     return;
                 }
 
+                string name = $"ECS Entity {entity.Index}:{entity.Generation}";
+                var reference = new NodeReference(authoring, null, runtimeWorld, entity);
                 CommandList.Add(sceneNode, out HierarchyNode node);
                 CommandList.SetName(node, name);
                 _entityNodes.Add(key, new EntityNode(node, reference, name));
@@ -641,7 +628,7 @@ namespace Delta.ECS.Unity.Editor
 
         private void SynchronizeSceneSubscriptions(SceneAuthoring[] authorings)
         {
-            var loadedAuthorings = new HashSet<SceneAuthoring>();
+            _loadedAuthorings.Clear();
             for (var i = 0; i < authorings.Length; i++)
             {
                 var authoring = authorings[i];
@@ -650,7 +637,7 @@ namespace Delta.ECS.Unity.Editor
                     continue;
                 }
 
-                loadedAuthorings.Add(authoring);
+                _loadedAuthorings.Add(authoring);
                 if (!_sceneDataSubscriptions.ContainsKey(authoring))
                 {
                     var capturedAuthoring = authoring;
@@ -660,29 +647,31 @@ namespace Delta.ECS.Unity.Editor
                 }
             }
 
-            if (_sceneDataSubscriptions.Count == loadedAuthorings.Count)
+            if (_sceneDataSubscriptions.Count == _loadedAuthorings.Count)
             {
                 return;
             }
 
-            var removed = new List<SceneAuthoring>();
+            _removedAuthorings.Clear();
             foreach (var authoring in _sceneDataSubscriptions.Keys)
             {
-                if (!loadedAuthorings.Contains(authoring))
+                if (!_loadedAuthorings.Contains(authoring))
                 {
-                    removed.Add(authoring);
+                    _removedAuthorings.Add(authoring);
                 }
             }
 
-            for (var i = 0; i < removed.Count; i++)
+            for (var i = 0; i < _removedAuthorings.Count; i++)
             {
-                var authoring = removed[i];
+                var authoring = _removedAuthorings[i];
                 if (authoring != null)
                 {
                     authoring.SceneData.Changed -= _sceneDataSubscriptions[authoring];
                 }
                 _sceneDataSubscriptions.Remove(authoring);
             }
+
+            _removedAuthorings.Clear();
         }
 
         private void OnSceneDataChanged(SceneAuthoring authoring, SceneDataChange change)

package/Editor/SceneEntityInspectorView.cs

@@ -34,6 +34,8 @@ namespace Delta.ECS.Unity.Editor
         internal int ComponentCount => _componentEntries.Count;
         private SceneAuthoring Authoring => _target.Authoring;
 
+        private ComponentRegistry Components => (_target.IsRuntime ? _target.RuntimeWorld : _previewWorld).World.Components;
+
         public SceneEntityInspectorView(SelectionProxy proxy)
             : this(() => proxy != null ? proxy.Target : default)
         {
@@ -190,18 +192,6 @@ namespace Delta.ECS.Unity.Editor
 
         private static Label CreateEntityIcon() => CreateClassLabel("◆", "ecs-entity-icon");
 
-        private ComponentRegistry Components => (_target.IsRuntime ? _target.RuntimeWorld : _previewWorld).World.Components;
-
-        private ComponentId? TryGetComponentId(ComponentData data)
-            => _previewWorld.TryGetComponentId(data, out ComponentId componentId) ? componentId : null;
-
-        private string GetComponentMenuPath(ComponentId componentId)
-        {
-            string namespacePath = Components.GetComponentType(componentId).Namespace?.Replace('.', '/') ?? string.Empty;
-            string shortName = GetShortTypeName(Components.GetComponentType(componentId));
-            return string.IsNullOrEmpty(namespacePath) ? shortName : $"{namespacePath}/{shortName}";
-        }
-
         private static string GetShortTypeName(Type type)
         {
             string name = type.Name;
@@ -223,6 +213,16 @@ namespace Delta.ECS.Unity.Editor
         private static int GetComponentOrder(ulong schema) =>
             InspectorState.instance.GetComponentOrder(schema);
 
+        private ComponentId? TryGetComponentId(ComponentData data)
+            => _previewWorld.TryGetComponentId(data, out ComponentId componentId) ? componentId : null;
+
+        private string GetComponentMenuPath(ComponentId componentId)
+        {
+            string namespacePath = Components.GetComponentType(componentId).Namespace?.Replace('.', '/') ?? string.Empty;
+            string shortName = GetShortTypeName(Components.GetComponentType(componentId));
+            return string.IsNullOrEmpty(namespacePath) ? shortName : $"{namespacePath}/{shortName}";
+        }
+
         private void OnEntitySelectionChanged()
         {
             SyncSelection();

package/README.md

@@ -18,7 +18,7 @@ Add the npm-compatible registry and package to the Unity project's
     }
   ],
   "dependencies": {
-    "com.artromskiy.deltaecs.unity": "0.0.63"
+    "com.artromskiy.deltaecs.unity": "0.0.65"
   }
 }
 ```

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "com.artromskiy.deltaecs.unity",
-  "version": "0.0.63",
+  "version": "0.0.65",
   "displayName": "DeltaECS Unity",
   "description": "Unity scene authoring and editor integration for DeltaECS.",
   "unity": "6000.7",