Merge pull request #129 from brunomikoski/feature/collection-generator-tweaks

Feature/collection generator tweaks

Author: brunomikoski

Scripts/Editor/CustomEditors/CollectionCustomEditor.cs

@@ -607,7 +607,7 @@ private void DrawBottomMenu()
                 {
                     EditorApplication.delayCall += () =>
                     {
-                        CollectionGenerators.RunGenerator(generatorType);
+                        CollectionGenerators.RunGenerator(generatorType, collection);
                     };
                 }
             }

Scripts/Editor/Generators/CollectionGenerators.cs

@@ -52,13 +52,13 @@ private static Type[] GetGeneratorTypes()
             return InterfaceType.GetAllAssignableClasses();
         }
 
-        public static Type GetGeneratorTypeForCollection(Type collectionType)
+        public static Type GetGeneratorTypeForCollection(Type collectionType, bool allowSubclasses = true)
         {
             Type[] generatorTypes = GetGeneratorTypes();
             foreach (Type generatorType in generatorTypes)
             {
                 GetGeneratorTypes(generatorType, out Type generatorCollectionType, out Type generatorTemplateType);
-                if (generatorCollectionType == collectionType)
+                if (generatorCollectionType == collectionType || collectionType.IsSubclassOf(generatorCollectionType))
                     return generatorType;
             }
 
@@ -76,7 +76,14 @@ public static void RunAllGenerators()
             AssetDatabase.SaveAssets();
             AssetDatabase.Refresh();
         }
+        
+        public static void RunGenerator(Type generatorType, ScriptableObjectCollection targetCollection = null, bool generateStaticAccess = false)
+        {
+            IScriptableObjectCollectionGeneratorBase generator = GetGenerator(generatorType);
 
+            RunGeneratorInternal(generator, targetCollection, true, generateStaticAccess);        
+        }
+        
         public static void RunGenerator(Type generatorType, bool generateStaticAccess = false)
         {
             RunGeneratorInternal(generatorType, true, generateStaticAccess);
@@ -91,32 +98,35 @@ public static void RunGenerator<GeneratorType>(bool generateStaticAccess = false
         public static void RunGenerator(
             IScriptableObjectCollectionGeneratorBase generator, bool generateStaticAccess = false)
         {
-            RunGeneratorInternal(generator, true, generateStaticAccess);
+            RunGeneratorInternal(generator, null, true, generateStaticAccess);
         }
 
         private static void RunGeneratorInternal(Type generatorType, bool refresh, bool generateStaticAccess = false)
         {
             IScriptableObjectCollectionGeneratorBase generator = GetGenerator(generatorType);
 
-            RunGeneratorInternal(generator, refresh, generateStaticAccess);
+            RunGeneratorInternal(generator, null, refresh, generateStaticAccess);
         }
 
         private static void RunGeneratorInternal(
-            IScriptableObjectCollectionGeneratorBase generator, bool refresh, bool generateStaticAccess)
+            IScriptableObjectCollectionGeneratorBase generator, ScriptableObjectCollection collection, bool refresh, bool generateStaticAccess)
         {
             Type generatorType = generator.GetType();
 
             GetGeneratorTypes(generatorType, out Type collectionType, out Type itemTemplateType);
 
-            // Check that the corresponding collection exists.
-            CollectionsRegistry.Instance.TryGetCollectionOfType(
-                collectionType, out ScriptableObjectCollection collection);
             if (collection == null)
             {
-                Debug.LogWarning(
-                    $"Tried to generate items for collection '{collectionType.Name}' but no such " +
-                    $"collection existed.");
-                return;
+                // Check that the corresponding collection exists.
+                CollectionsRegistry.Instance.TryGetCollectionOfType(
+                    collectionType, out collection);
+                if (collection == null)
+                {
+                    Debug.LogWarning(
+                        $"Tried to generate items for collection '{collectionType.Name}' but no such " +
+                        $"collection existed.");
+                    return;
+                }
             }
 
             // Make an empty list that will hold the generated item templates.
@@ -137,8 +147,6 @@ private static void RunGeneratorInternal(
             {
                 for (int i = collection.Items.Count - 1; i >= 0; i--)
                 {
-                    bool shouldRemoveItem = false;
-
                     // Remove any items for which there isn't a template by the same name.
                     bool foundItemOfSameName = false;
                     for (int j = 0; j < templates.Count; j++)
@@ -176,6 +184,14 @@ private static void RunGeneratorInternal(
 
                 CopyFieldsFromTemplateToItem(itemTemplate, itemInstance);
             }
+            
+            
+            // Optional Callback to be called when the generation completes
+            MethodInfo completionCallback = generatorType.GetMethod(
+                "OnItemsGenerationComplete", BindingFlags.Public | BindingFlags.Instance);
+            if (completionCallback != null)
+                completionCallback!.Invoke(generator, new object[] {collection });
+            
 
             if (refresh)
             {

Scripts/Runtime/Core/CollectionsRegistry.cs

@@ -176,7 +176,7 @@ public bool TryGetCollectionsOfType<T>(out List<T> inputActionMapCollections) wh
             for (int i = 0; i < collections.Count; i++)
             {
                 ScriptableObjectCollection scriptableObjectCollection = collections[i];
-                if (scriptableObjectCollection.GetType() == typeof(T))
+                if (scriptableObjectCollection.GetType() == typeof(T) || scriptableObjectCollection.GetType().IsSubclassOf(typeof(T)))
                     result.Add((T)scriptableObjectCollection);
             }