- Separated EntityTemplate functionality from Actor to new EntityTemplateProvider component

Author: Watcher3056

Entity System/Unity Layer/Actor.cs

@@ -86,9 +86,6 @@ public Actor Root
         private Dictionary<Type, ActorComponent> _actorComponents = new Dictionary<Type, ActorComponent>();
         private readonly Dictionary<Type, object> _actorComponentsAndData = new();
 
-        [field: SerializeField]
-        public EntityTemplateAsset EntityTemplate { get; private set; }
-
         [SerializeField, ReadOnly]
         private List<ActorComponent> _allComponents = new List<ActorComponent>();
 
@@ -572,7 +569,6 @@ int GetPriority(Component c)
             foreach (var component in _allComponents)
                 component.SetActor(this);
 
-            EditorApplyEntityTemplate();
             EditorValidateAllComponentDependencies();
             ValidateSetup();
             EditorUpdateUnusedDependencies();
@@ -692,44 +688,7 @@ private void EditorValidateActorComponentsDependencies()
             EditorUpdateMissingActorDependenciesList();
         }
 
-        private void EditorApplyEntityTemplate()
-        {
-            if (EntityTemplate == null)
-                return;
-
-            var componentTypes = EntityTemplate.GetComponentTypes();
-
-            List<Type> providersToAdd = new List<Type>();
-
-            foreach (var type in componentTypes)
-            {
-                Type providerType = EntityComponentProviderFinder.FindEntityComponentProviderMatching(type);
-
-                if (providerType != null)
-                {
-                    if (_allComponents.Exists(c => c.GetType() == providerType))
-                        continue;
-                    if (_entityComponentsMissing.Exists(c => c.GetType() == type))
-                        continue;
-
-                    providersToAdd.Add(providerType);
-                }
-            }
-
-            if (providersToAdd.Count > 0)
-            {
-                UnityEditor.EditorApplication.delayCall += () =>
-                {
-                    if (this == null) return;
-
-                    foreach (var provider in providersToAdd)
-                        if (gameObject.GetComponent(provider) == null)
-                            UnityEditor.Undo.AddComponent(gameObject, provider);
-
-                    UnityEditor.EditorUtility.SetDirty(gameObject);
-                };
-            }
-        }
+        
 
         public List<string> EditorGetMissingDependenciesNamesForAllComponents(EditorDependenciesType dependenciesType)
         {
@@ -880,11 +839,8 @@ public List<ActorComponent> EditorGetUnusedActorComponentsForComponent(ActorComp
 
         public bool EditorHasUnusedDependencies() => _editorUnusedDependencies.Count > 0;
 
-        public void EditorSetEntityTemplate(EntityTemplateAsset entityTemplateAsset)
-        {
-            EntityTemplate = entityTemplateAsset;
-            EditorApplyEntityTemplate();
-        }
+        public List<ActorComponent> EditorGetAllComponentsSerialized() => _allComponents;
+        public List<IEntityComponent> EditorGetEntityComponentsMissingSerialized() => _entityComponentsMissing;
 #endif
     }
 }

Entity System/Unity Layer/EasyCSBehavior.cs

@@ -176,6 +176,7 @@ private void EditorSortComponentOrder()
 
             Component prefabRoot = GetComponent<PrefabRootData>();
             Component entityProvider = GetComponent<EntityProvider>();
+            Component entityTemplateProvider = GetComponent<EntityTemplateProvider>();
             Component actor = GetComponent<Actor>();
 
             // Collect categorized components
@@ -200,6 +201,7 @@ private void EditorSortComponentOrder()
             // Compose new sorted order
             if (prefabRoot) sorted.Add(prefabRoot);
             if (entityProvider) sorted.Add(entityProvider);
+            if (entityTemplateProvider) sorted.Add(entityTemplateProvider);
             if (actor) sorted.Add(actor);
 
             sorted.AddRange(actorData.Except(sorted));

Entity System/Unity Layer/EntityTemplateProvider.cs

@@ -0,0 +1,81 @@
+using System;
+using System.Collections.Generic;
+using TriInspector;
+using UnityEngine;
+
+namespace EasyCS
+{
+    [RequireComponent(typeof(Actor))]
+    [IconClass(ConstantsIcons.IconEntity)]
+#if ODIN_INSPECTOR
+    [HideMonoScript]
+#endif
+    public class EntityTemplateProvider : EasyCSBehavior
+    {
+        [field: SerializeField]
+        public EntityTemplateAsset EntityTemplate { get; private set; }
+
+
+#if UNITY_EDITOR
+        protected override void OnValidate()
+        {
+            base.OnValidate();
+
+            EditorApplyEntityTemplate();
+        }
+
+        private void EditorApplyEntityTemplate()
+        {
+            if (EntityTemplate == null)
+                return;
+
+            Actor actor = GetComponent<Actor>();
+            if (actor == null)
+                return;
+
+            var componentTypes = EntityTemplate.GetComponentTypes();
+
+            List<Type> providersToAdd = new List<Type>();
+
+            foreach (var type in componentTypes)
+            {
+                Type providerType = EntityComponentProviderFinder.FindEntityComponentProviderMatching(type);
+
+                if (providerType != null)
+                {
+                    var allComponents = actor.EditorGetAllComponentsSerialized();
+                    var entityComponentsMissing = actor.EditorGetEntityComponentsMissingSerialized();
+
+                    if (allComponents.Exists(c => c.GetType() == providerType))
+                        continue;
+                    if (entityComponentsMissing.Exists(c => c.GetType() == type))
+                        continue;
+
+                    providersToAdd.Add(providerType);
+                }
+            }
+
+            if (providersToAdd.Count > 0)
+            {
+                UnityEditor.EditorApplication.delayCall += () =>
+                {
+                    if (this == null) return;
+
+                    foreach (var provider in providersToAdd)
+                        if (gameObject.GetComponent(provider) == null)
+                            UnityEditor.Undo.AddComponent(gameObject, provider);
+
+                    UnityEditor.EditorUtility.SetDirty(gameObject);
+                };
+            }
+        }
+
+        public void EditorSetEntityTemplate(EntityTemplateAsset entityTemplateAsset)
+        {
+            EntityTemplate = entityTemplateAsset;
+            EditorApplyEntityTemplate();
+        }
+
+#endif
+    }
+}

Entity System/Unity Layer/EntityTemplateProvider.cs.meta

@@ -131,7 +131,8 @@ public static GameObject BuildEntityObject(EntityData entityData, Transform curr
         {
             GameObject entityGO = current == null ? new GameObject() : current.gameObject;
             entityGO.AddComponent<EntityEditorComponentFlag>().hideFlags = HideFlags.HideInInspector;
-            Actor actor= entityGO.AddComponent<Actor>();
+            Actor actor = entityGO.AddComponent<Actor>();
+            EntityTemplateProvider entityTemplateProvider = entityGO.AddComponent<EntityTemplateProvider>();
 
             if (string.IsNullOrEmpty(entityData.Name) == false)
                 entityGO.name = entityData.Name;
@@ -186,7 +187,7 @@ public static GameObject BuildEntityObject(EntityData entityData, Transform curr
                 }
             }
 
-            actor.EditorSetEntityTemplate(entityData.Template);
+            entityTemplateProvider.EditorSetEntityTemplate(entityData.Template);
 
             return entityGO;
         }

Factory System/Editor/EntityPrefabBuilder.cs

@@ -122,7 +122,7 @@ private static EntityFactory.EntityData BuildEntityDataRecursive(Transform trans
                 entityData.ChildEntities.Add(childEntityData);
             }
 
-            entityData.Template = transform.GetComponent<Actor>().EntityTemplate;
+            entityData.Template = transform.GetComponent<EntityTemplateProvider>().EntityTemplate;
 
             return entityData;
         }

Factory System/Editor/PrefabEditSessionManager.cs

@@ -9,6 +9,8 @@ private void OnTransformChildrenChanged()
         {
             foreach (Transform child in transform)
                 child.gameObject.TryGetElseSetComponent<Actor>();
+            foreach (Transform child in transform)
+                child.gameObject.TryGetElseSetComponent<EntityTemplateProvider>();
         }
     }
 }