Add generic components

Addons/Features/Editor/SystemsCodeGenerator.cs

@@ -10,6 +10,18 @@ namespace ME.BECS.Editor.Systems {
 
     public class SystemsCodeGenerator : CustomCodeGenerator {
 
+        private static string[] _cachedGraphGuids;
+        private static System.DateTime _graphsCacheTime;
+
+        private static string[] GetCachedGraphGuids() {
+            var now = System.DateTime.Now;
+            if (_cachedGraphGuids == null || (now - _graphsCacheTime).TotalSeconds > 5) {
+                _cachedGraphGuids = UnityEditor.AssetDatabase.FindAssets("t:SystemsGraph");
+                _graphsCacheTime = now;
+            }
+            return _cachedGraphGuids;
+        }
+
         private void AddMethod<T>(SystemsGraph graph, string baseName, string methodName, Method method, out scg::List<string> content, out scg::List<string> innerMethods) where T : class {
             //var name = System.Text.RegularExpressions.Regex.Replace(graph.name, @"(\s+|@|&|'|\(|\)|<|>|#|-)", "_");
             content = new scg::List<string>();
@@ -48,7 +60,7 @@ public string AddContent(scg::List<FileContent> filesContent) {
 
             var content = new scg::List<string>();
             if (this.editorAssembly == false) {
-                var graphs = UnityEditor.AssetDatabase.FindAssets("t:SystemsGraph");
+                var graphs = GetCachedGraphGuids();
                 if (filesContent != null) {
                     foreach (var guid in graphs) {
                         var path = UnityEditor.AssetDatabase.GUIDToAssetPath(guid);
@@ -164,6 +176,7 @@ public string AddContent(scg::List<FileContent> filesContent) {
                     content.Add("}");
                     content.Add("[UnityEngine.Scripting.PreserveAttribute]");
                     content.Add("public static void SystemsLoad() {");
+                    graphs = GetCachedGraphGuids();
                     foreach (var guid in graphs) {
                         var path = UnityEditor.AssetDatabase.GUIDToAssetPath(guid);
                         var graph = UnityEditor.AssetDatabase.LoadAssetAtPath<SystemsGraph>(path);
@@ -245,12 +258,18 @@ public string GetArgString() {
             }
 
             public string GetWriteOpString(string key) {
-                var index = this.keyToIndex[key];
+                if (this.keyToIndex.TryGetValue(key, out var index) == false) {
+                    this.Add(key);
+                    index = this.keyToIndex[key];
+                }
                 return $"dependencies[{index}] = {key};";
             }
 
             public string GetReadOpString(string key) {
-                var index = this.keyToIndex[key];
+                if (this.keyToIndex.TryGetValue(key, out var index) == false) {
+                    this.Add(key);
+                    index = this.keyToIndex[key];
+                }
                 return $"dependencies[{index}]";
             }
 
@@ -539,6 +558,7 @@ n is ME.BECS.Extensions.GraphProcessor.RelayNode ||
                                                         // Parallel mode
                                                         var srcDep = index;
                                                         methodContent.Add($"var depsGeneric{srcDep.ToString()} = new NativeArray<Unity.Jobs.JobHandle>({types.Length}, Constants.ALLOCATOR_TEMP);");
+                                                        collectedDeps.Add($"dep{srcDep.ToString()}");
                                                         var withoutSync = true;
                                                         foreach (var cType in types) {
                                                             var type = systemType.MakeGenericType(cType);
@@ -548,7 +568,6 @@ n is ME.BECS.Extensions.GraphProcessor.RelayNode ||
                                                             methodContent.Add($"(({EditorUtils.GetTypeName(type)}*)systems[{(index.globalIndex + index.genericIndex)}])->{method}(ref systemContext);");
                                                             methodContent.Add($"depsGeneric{srcDep.ToString()}[{index.genericIndex}] = systemContext.dependsOn;");
                                                             methodContent.Add("}");
-                                                            if (index.genericIndex == 0) collectedDeps.Add($"dep{indexStr}");
                                                             printedDependencies.Add($"dep{indexStr}");
                                                             if (withoutSync == true) {
                                                                 var syncState = IsSyncNotRequired(type);
@@ -572,6 +591,7 @@ n is ME.BECS.Extensions.GraphProcessor.RelayNode ||
                                                             var type = systemType.MakeGenericType(cType);
                                                             methodContent.Add($"systemContext = SystemContext.Create(dt, in world, localDependsOn);");
                                                             methodContent.Add($"(({EditorUtils.GetTypeName(type)}*)systems[{(index.globalIndex + index.genericIndex)}])->{method}(ref systemContext);");
+                                                            collectedDeps.Add($"dep{indexStr}");
                                                             var withoutSync = IsSyncNotRequired(type);
                                                             AddApply(systemNode, index, ref schemeDependsOn, "systemContext.dependsOn", "localDependsOn", forceWithoutSync: withoutSync);
                                                             index.AddGeneric();
@@ -914,8 +934,17 @@ private static int GetNodeIndex(SystemsGraph graph, ME.BECS.Extensions.GraphProc
             return index;
         }
 
-        public static int InitializeGraph(CustomCodeGenerator generator, scg::Dictionary<System.Type, string> systemTypeToVar, scg::List<string> content, SystemsGraph graph, int rootGraphId, int index) {
-            for (int idx = 0; idx < graph.nodes.Count; ++idx) {
+        public static int InitializeGraph(
+            CustomCodeGenerator generator,
+            scg::Dictionary<System.Type, string> systemTypeToVar,
+            scg::List<string> content,
+            SystemsGraph graph,
+            int rootGraphId,
+            int index
+        )
+        {
+            for (int idx = 0; idx < graph.nodes.Count; ++idx)
+            {
                 var node = graph.nodes[idx];
                 if (node is ME.BECS.FeaturesGraph.Nodes.SystemNode systemNode) {
                     var system = systemNode.system;
@@ -942,7 +971,9 @@ public static int InitializeGraph(CustomCodeGenerator generator, scg::Dictionary
                                     ++index;
                                 }
                             }
-                        } else {
+                        }
+                        else
+                        {
                             var systemTypeStr = EditorUtils.GetTypeName(systemType);
                             content.Add("{");
                             content.Add($"var item = allocator.Allocate(TSize<{systemTypeStr}>.sizeInt, TAlign<{systemTypeStr}>.alignInt);");
@@ -955,8 +986,17 @@ public static int InitializeGraph(CustomCodeGenerator generator, scg::Dictionary
                             ++index;
                         }
                     }
-                } else if (node is ME.BECS.FeaturesGraph.Nodes.GraphNode graphNode) {
-                    index = InitializeGraph(generator, systemTypeToVar, content, graphNode.graphValue, rootGraphId, index);
+                }
+                else if (node is ME.BECS.FeaturesGraph.Nodes.GraphNode graphNode)
+                {
+                    index = InitializeGraph(
+                        generator,
+                        systemTypeToVar,
+                        content,
+                        graphNode.graphValue,
+                        rootGraphId,
+                        index
+                    );
                 }
             }
 
@@ -1050,7 +1090,7 @@ public static void InjectDependencies(SystemsGraph graph, scg::List<string> cont
                         containsBool = true;
                     }
                     if (typeof(IInject).IsAssignableFrom(field.FieldType) == true) {
-                        var jobTypeStr = EditorUtils.GetTypeName(jobType);
+                        var jobTypeStr = EditorUtils.GetJobTypeName(jobType);
                         localContent.Add($"JobInject<{jobTypeStr}>.Init();");
                         break;
                     }
@@ -1066,7 +1106,7 @@ public static void InjectDependencies(SystemsGraph graph, scg::List<string> cont
             foreach (var jobType in types) {
                 if (jobType.IsVisible == false) continue;
                 var fields = jobType.GetFields(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic);
-                var jobTypeStr = EditorUtils.GetTypeName(jobType);
+                var jobTypeStr = EditorUtils.GetJobTypeName(jobType);
                 var containsBool = false;
                 localContent.Clear();
                 foreach (var field in fields) {
@@ -1110,7 +1150,8 @@ private static void CollectJobsTypes(MethodInfo root, scg::HashSet<System.Type>
             var visited = new scg::HashSet<MethodPointerData>();
             while (q.Count > 0) {
                 var body = q.Dequeue();
-                var instructions = body.GetInstructions();
+                var instructions = CodeGenerator.GetCachedInstructions(body);
+                if (instructions == null) continue;
                 foreach (var inst in instructions) {
                     if (inst.Operand is MethodInfo methodInfo) {
                         if ((methodInfo.Name == "Schedule" || methodInfo.Name == "ScheduleSingleWithInject" || methodInfo.Name == "ScheduleSingleWithInjectByRef") && methodInfo.IsGenericMethod == true) {