Templates cache refactoring

Author: TimGameDev

UnityWeld/Binding/AbstractTemplateSelector.cs

@@ -10,7 +10,8 @@ namespace UnityWeld.Binding
 {
     public abstract class AbstractTemplateSelector : AbstractMemberBinding
     {
-        [SerializeField] private GameObject templatesRoot;
+        [Header("Set templates for collection")]
+        [SerializeField] private Template[] _templates;
         [SerializeField] private string viewModelPropertyName = string.Empty;
 
         private IDictionary<Type, Template> _availableTemplates;
@@ -40,13 +41,10 @@ public string ViewModelPropertyName
             set => viewModelPropertyName = value;
         }
 
-        /// <summary>
-        /// The GameObject in the scene that is the parent object for the tenplates.
-        /// </summary>
-        public GameObject TemplatesRoot
+        public Template[] Templates
         {
-            get => templatesRoot;
-            set => templatesRoot = value;
+            get => _templates;
+            set => _templates = value;
         }
 
         /// <summary>
@@ -68,25 +66,23 @@ protected IDictionary<Type, Template> AvailableTemplates
         // Cache available templates.
         private void CacheTemplates()
         {
+            if(_templates == null || _templates.Length == 0)
+            {
+                return;
+            }
+
             _availableTemplates = new Dictionary<Type, Template>();
 
-            var buffer = Buffer.Templates;
-            templatesRoot.GetComponentsInChildren(true, buffer);
-            foreach(var template in buffer)
-            {
-                template.gameObject.SetActive(false);
-                var typeName = template.GetViewModelTypeName();
-                var type = TypeResolver.TypesWithBindingAttribute.FirstOrDefault(t => t.ToString() == typeName);
-                if(type == null)
-                {
-                    Debug.LogError(
-                        $"Template object {template.name} references type {typeName}, but no matching type with a [Binding] attribute could be found.",
-                        template);
-                    continue;
-                }
 
-                _availableTemplates.Add(type, template);
-            }
+            _availableTemplates = _templates
+                                  .Select(template =>
+                                  {
+                                      var typeName = template.GetViewModelTypeName();
+                                      var type = TypeResolver.TypesWithBindingAttribute
+                                                             .FirstOrDefault(t => t.ToString() == typeName);
+                                      return (type, template);
+                                  })
+                                  .ToDictionary(o => o.type, o => o.template);
         }
 
         /// <summary>

UnityWeld_Editor/CollectionBindingEditor.cs

@@ -11,29 +11,26 @@ class CollectionBindingEditor : BaseBindingEditor
         private CollectionBinding _targetScript;
         private SerializedProperty _templateInitialPoolCountProperty;
         private SerializedProperty _itemsContainerProperty;
+        private SerializedProperty _templatesProperty;
 
         private bool _viewModelPrefabModified;
-        private bool _templatesRootPrefabModified;
-        private bool _templateInitialPoolCountPrefabModified;
-        private bool _itemsContainerPrefabModified;
 
         protected override void OnEnabled()
         {
             // Initialise everything
             _targetScript = (CollectionBinding)target;
             _templateInitialPoolCountProperty = serializedObject.FindProperty("_templateInitialPoolCount");
             _itemsContainerProperty = serializedObject.FindProperty("_itemsContainer");
+            _templatesProperty = serializedObject.FindProperty("_templates");
         }
 
         protected override void OnInspector()
         {
             UpdatePrefabModifiedProperties();
 
-            EditorStyles.label.fontStyle = _templateInitialPoolCountPrefabModified ? FontStyle.Bold : DefaultFontStyle;
             EditorGUILayout.PropertyField(_templateInitialPoolCountProperty);
-
-            EditorStyles.label.fontStyle = _itemsContainerPrefabModified ? FontStyle.Bold : DefaultFontStyle;
             EditorGUILayout.PropertyField(_itemsContainerProperty);
+            EditorGUILayout.PropertyField(_templatesProperty, true);
 
             EditorStyles.label.fontStyle = _viewModelPrefabModified ? FontStyle.Bold : DefaultFontStyle;
             ShowViewModelPropertyMenu(
@@ -43,19 +40,6 @@ protected override void OnInspector()
                 _targetScript.ViewModelPropertyName,
                 property => true
             );
-
-            EditorStyles.label.fontStyle = _templatesRootPrefabModified ? FontStyle.Bold : DefaultFontStyle;
-            UpdateProperty(
-                updatedValue => _targetScript.TemplatesRoot = updatedValue,
-                _targetScript.TemplatesRoot,
-                (GameObject)EditorGUILayout.ObjectField(
-                    new GUIContent("Collection templates", "Parent object for all templates to copy and bind to items in the collection."), 
-                    _targetScript.TemplatesRoot, 
-                    typeof(GameObject), 
-                    true
-                ),
-                "Set collection templates root"
-            );
         }
 
         /// <summary>
@@ -74,18 +58,6 @@ private void UpdatePrefabModifiedProperties()
                     case "viewModelPropertyName":
                         _viewModelPrefabModified = property.prefabOverride;
                         break;
-
-                    case "TemplateInitialPoolCount":
-                        _templateInitialPoolCountPrefabModified = property.prefabOverride;
-                        break;
-
-                    case "templatesRoot":
-                        _templatesRootPrefabModified = property.prefabOverride;
-                        break;
-                    
-                    case "_itemsContainer":
-                        _itemsContainerPrefabModified = property.prefabOverride;
-                        break;
                 }
             }
             while (property.Next(false));

UnityWeld_Editor/TemplateBindingEditor.cs

@@ -11,11 +11,12 @@ class TemplateBindingEditor : BaseBindingEditor
         private TemplateBinding targetScript;
 
         private bool viewModelPrefabModified;
-        private bool templatesRootPrefabModified;
+        private SerializedProperty _templatesProperty;
 
         protected override  void OnEnabled()
         {
             targetScript = (TemplateBinding)target;
+            _templatesProperty = serializedObject.FindProperty("_templates");
         }
 
         protected override void OnInspector()
@@ -37,24 +38,7 @@ protected override void OnInspector()
                 property => true
             );
 
-            EditorStyles.label.fontStyle = templatesRootPrefabModified 
-                ? FontStyle.Bold 
-                : DefaultFontStyle;
-
-            UpdateProperty(
-                updatedValue => targetScript.TemplatesRoot = updatedValue,
-                targetScript.TemplatesRoot,
-                (GameObject)EditorGUILayout.ObjectField(
-                    new GUIContent(
-                        "Templates root object", 
-                        "Parent object to the objects we want to use as templates."
-                    ),
-                    targetScript.TemplatesRoot, 
-                    typeof(GameObject), 
-                    true
-                ),
-                "Set template binding root object"
-            );
+            EditorGUILayout.PropertyField(_templatesProperty, true);
         }
 
         /// <summary>
@@ -74,10 +58,6 @@ private void UpdatePrefabModifiedProperties()
                     case "viewModelPropertyName":
                         viewModelPrefabModified = property.prefabOverride;
                         break;
-
-                    case "templatesRoot":
-                        templatesRootPrefabModified = property.prefabOverride;
-                        break;
                 }
             }
             while (property.Next(false));