CodeGenerator takes arrays of IComponentCodeGenerator and IPoolCodeGe…

…nerator to generate
sschmid · Jun 2, 2015 · 1b621ba · 1b621ba
1 parent 1499f8c
commit 1b621ba
Show file tree

Hide file tree

Showing 50 changed files with 441 additions and 295 deletions.
diff --git a/Entitas.CodeGenerator/Entitas.CodeGenerator/CodeGenerator.cs b/Entitas.CodeGenerator/Entitas.CodeGenerator/CodeGenerator.cs
@@ -6,16 +6,25 @@ namespace Entitas.CodeGenerator {
     public static class CodeGenerator {
         public const string componentSuffix = "Component";
 
-        public static void Generate(Type[] types, string[] poolNames, string dir) {
+        public static void Generate(Type[] types, string[] poolNames, string dir,
+                IComponentCodeGenerator[] componentCodeGenerators, IPoolCodeGenerator[] poolCodeGenerators) {
+
             if (!Directory.Exists(dir)) {
                 Directory.CreateDirectory(dir);
             }
 
             CleanDir(dir);
             var components = GetComponents(types);
-            generateIndicesLookup(dir, components);
-            generateComponentExtensions(dir, components);
-            generatePoolAttributes(dir, poolNames);
+
+            foreach (var generator in componentCodeGenerators) {
+                var files = generator.Generate(components);
+                writeFiles(dir, files);
+            }
+
+            foreach (var generator in poolCodeGenerators) {
+                var files = generator.Generate(poolNames);
+                writeFiles(dir, files);
+            }
         }
 
         public static void CleanDir(string dir) {
@@ -37,24 +46,9 @@ public static Type[]GetComponents(Type[] types) {
                 .ToArray();
         }
 
-        static void generateIndicesLookup(string dir, Type[] components) {
-            var files = new IndicesLookupGenerator().Generate(components);
-            writeFiles(dir, files);
-        }
-
-        static void generateComponentExtensions(string dir, Type[] components) {
-            var files = new ComponentExtensionsGenerator().Generate(components);
-            writeFiles(dir, files);
-        }
-
-        static void generatePoolAttributes(string dir, string[] poolNames) {
-            var files = new PoolAttributeGenerator().Generate(poolNames);
-            writeFiles(dir, files);
-        }
-
         static void writeFiles(string dir, CodeGenFile[] files) {
             foreach (var file in files) {
-                File.WriteAllText(file.fileName + ".cs", file.fileContent);
+                File.WriteAllText(dir + file.fileName + ".cs", file.fileContent);
             }
         }
     }

diff --git a/Entitas.CodeGenerator/Program.cs b/Entitas.CodeGenerator/Program.cs
@@ -4,6 +4,17 @@
 public class Program {
     public static void Main(string[] args) {
         var assembly = Assembly.GetAssembly(typeof(CodeGenerator));
-        CodeGenerator.Generate(assembly.GetTypes(), new string[0], "Generated/");
+
+        var componentCodeGenerators = new IComponentCodeGenerator[] {
+            new IndicesLookupGenerator(),
+            new ComponentExtensionsGenerator()
+        };
+
+        var poolCodeGenerators = new IPoolCodeGenerator[] {
+            new PoolAttributeGenerator()
+        };
+
+        CodeGenerator.Generate(assembly.GetTypes(), new string[0], "Generated/",
+            componentCodeGenerators, poolCodeGenerators);
     }
 }
diff --git a/Entitas.Unity.CodeGenerator/Assets/Entitas.Unity.CodeGenerator/Editor/CodeGeneratorEditor.cs b/Entitas.Unity.CodeGenerator/Assets/Entitas.Unity.CodeGenerator/Editor/CodeGeneratorEditor.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Reflection;
 using Entitas;
+using Entitas.CodeGenerator;
 using UnityEditor;
 
 namespace Entitas.Unity.CodeGenerator {
@@ -10,7 +11,19 @@ public static class CodeGeneratorEditor {
         public static void Generate() {
             var types = Assembly.GetAssembly(typeof(Entity)).GetTypes();
             var config = new CodeGeneratorConfig(EntitasPreferencesEditor.LoadConfig());
-            Entitas.CodeGenerator.CodeGenerator.Generate(types, config.pools, config.generatedFolderPath);
+
+            var componentCodeGenerators = new IComponentCodeGenerator [] {
+                new IndicesLookupGenerator(),
+                new ComponentExtensionsGenerator()
+            };
+
+            var poolCodeGenerators = new IPoolCodeGenerator [] {
+                new PoolAttributeGenerator()
+            };
+
+            Entitas.CodeGenerator.CodeGenerator.Generate(types, config.pools, config.generatedFolderPath,
+                componentCodeGenerators, poolCodeGenerators);
+
             AssetDatabase.Refresh();
         }
     }

diff --git a/...ets/Tests/Generated/TestAttribute.cs.meta → ...Entitas.CodeGenerator/CodeGenFile.cs.meta b/...ets/Tests/Generated/TestAttribute.cs.meta → ...Entitas.CodeGenerator/CodeGenFile.cs.meta
diff --git a/Entitas.Unity.CodeGenerator/Assets/Libraries/Entitas.CodeGenerator/CodeGenerator.cs b/Entitas.Unity.CodeGenerator/Assets/Libraries/Entitas.CodeGenerator/CodeGenerator.cs
@@ -6,16 +6,25 @@ namespace Entitas.CodeGenerator {
     public static class CodeGenerator {
         public const string componentSuffix = "Component";
 
-        public static void Generate(Type[] types, string[] poolNames, string dir) {
+        public static void Generate(Type[] types, string[] poolNames, string dir,
+                IComponentCodeGenerator[] componentCodeGenerators, IPoolCodeGenerator[] poolCodeGenerators) {
+
             if (!Directory.Exists(dir)) {
                 Directory.CreateDirectory(dir);
             }
 
             CleanDir(dir);
             var components = GetComponents(types);
-            generateIndicesLookup(dir, components);
-            generateComponentExtensions(dir, components);
-            generatePoolAttributes(dir, poolNames);
+
+            foreach (var generator in componentCodeGenerators) {
+                var files = generator.Generate(components);
+                writeFiles(dir, files);
+            }
+
+            foreach (var generator in poolCodeGenerators) {
+                var files = generator.Generate(poolNames);
+                writeFiles(dir, files);
+            }
         }
 
         public static void CleanDir(string dir) {
@@ -37,24 +46,9 @@ public static Type[]GetComponents(Type[] types) {
                 .ToArray();
         }
 
-        static void generateIndicesLookup(string dir, Type[] components) {
-            var files = new IndicesLookupGenerator().Generate(components);
-            writeFiles(dir, files);
-        }
-
-        static void generateComponentExtensions(string dir, Type[] components) {
-            var files = new ComponentExtensionsGenerator().Generate(components);
-            writeFiles(dir, files);
-        }
-
-        static void generatePoolAttributes(string dir, string[] poolNames) {
-            var files = new PoolAttributeGenerator().Generate(poolNames);
-            writeFiles(dir, files);
-        }
-
         static void writeFiles(string dir, CodeGenFile[] files) {
             foreach (var file in files) {
-                File.WriteAllText(file.fileName + ".cs", file.fileContent);
+                File.WriteAllText(dir + file.fileName + ".cs", file.fileContent);
             }
         }
     }

diff --git a/...nity.CodeGenerator/Assets/Libraries/Entitas.CodeGenerator/IComponentCodeGenerator.cs.meta b/...nity.CodeGenerator/Assets/Libraries/Entitas.CodeGenerator/IComponentCodeGenerator.cs.meta
diff --git a/...tas.Unity.CodeGenerator/Assets/Libraries/Entitas.CodeGenerator/IPoolCodeGenerator.cs.meta b/...tas.Unity.CodeGenerator/Assets/Libraries/Entitas.CodeGenerator/IPoolCodeGenerator.cs.meta
diff --git a/Entitas.Unity.CodeGenerator/Assets/Tests/Generated/TestAttribute.cs b/Entitas.Unity.CodeGenerator/Assets/Tests/Generated/TestAttribute.cs
diff --git a/Entitas.Unity.CodeGenerator/Assets/Tests/Generated/TestComponentGeneratedExtension.cs b/Entitas.Unity.CodeGenerator/Assets/Tests/Generated/TestComponentGeneratedExtension.cs
@@ -16,6 +16,11 @@ public bool isTest {
                 }
             }
         }
+
+        public Entity IsTest(bool value) {
+            isTest = value;
+            return this;
+        }
     }
 }
 

diff --git a/Entitas.Unity.CodeGenerator/Assets/Tests/Generated/TestComponentGeneratedExtension.cs.meta b/Entitas.Unity.CodeGenerator/Assets/Tests/Generated/TestComponentGeneratedExtension.cs.meta
diff --git a/Entitas.Unity.CodeGenerator/Assets/Tests/Generated/TestComponentIds.cs.meta b/Entitas.Unity.CodeGenerator/Assets/Tests/Generated/TestComponentIds.cs.meta
diff --git a/Entitas.Unity.CodeGenerator/Entitas.properties b/Entitas.Unity.CodeGenerator/Entitas.properties
@@ -1,4 +1,4 @@
 Entitas.CodeGenerator.GeneratedFolderPath = Assets/Tests/Generated/
 Entitas.CodeGenerator.Pools = Test
-Entitas.Unity.CodeGenerator.GeneratedFolderPath = Assets/Generated/
+Entitas.Unity.CodeGenerator.GeneratedFolderPath = Assets/Tests/Generated/
 Entitas.Unity.CodeGenerator.Pools = 
diff --git a/Entitas.Unity.VisualDebugging/Assets/Libraries/Entitas.CodeGenerator/CodeGenFile.cs.meta b/Entitas.Unity.VisualDebugging/Assets/Libraries/Entitas.CodeGenerator/CodeGenFile.cs.meta
diff --git a/Entitas.Unity.VisualDebugging/Assets/Libraries/Entitas.CodeGenerator/CodeGenerator.cs b/Entitas.Unity.VisualDebugging/Assets/Libraries/Entitas.CodeGenerator/CodeGenerator.cs
@@ -6,16 +6,25 @@ namespace Entitas.CodeGenerator {
     public static class CodeGenerator {
         public const string componentSuffix = "Component";
 
-        public static void Generate(Type[] types, string[] poolNames, string dir) {
+        public static void Generate(Type[] types, string[] poolNames, string dir,
+                IComponentCodeGenerator[] componentCodeGenerators, IPoolCodeGenerator[] poolCodeGenerators) {
+
             if (!Directory.Exists(dir)) {
                 Directory.CreateDirectory(dir);
             }
 
             CleanDir(dir);
             var components = GetComponents(types);
-            generateIndicesLookup(dir, components);
-            generateComponentExtensions(dir, components);
-            generatePoolAttributes(dir, poolNames);
+
+            foreach (var generator in componentCodeGenerators) {
+                var files = generator.Generate(components);
+                writeFiles(dir, files);
+            }
+
+            foreach (var generator in poolCodeGenerators) {
+                var files = generator.Generate(poolNames);
+                writeFiles(dir, files);
+            }
         }
 
         public static void CleanDir(string dir) {
@@ -37,24 +46,9 @@ public static Type[]GetComponents(Type[] types) {
                 .ToArray();
         }
 
-        static void generateIndicesLookup(string dir, Type[] components) {
-            var files = new IndicesLookupGenerator().Generate(components);
-            writeFiles(dir, files);
-        }
-
-        static void generateComponentExtensions(string dir, Type[] components) {
-            var files = new ComponentExtensionsGenerator().Generate(components);
-            writeFiles(dir, files);
-        }
-
-        static void generatePoolAttributes(string dir, string[] poolNames) {
-            var files = new PoolAttributeGenerator().Generate(poolNames);
-            writeFiles(dir, files);
-        }
-
         static void writeFiles(string dir, CodeGenFile[] files) {
             foreach (var file in files) {
-                File.WriteAllText(file.fileName + ".cs", file.fileContent);
+                File.WriteAllText(dir + file.fileName + ".cs", file.fileContent);
             }
         }
     }

diff --git a/...ty.VisualDebugging/Assets/Libraries/Entitas.CodeGenerator/IComponentCodeGenerator.cs.meta b/...ty.VisualDebugging/Assets/Libraries/Entitas.CodeGenerator/IComponentCodeGenerator.cs.meta
diff --git a/...s.Unity.VisualDebugging/Assets/Libraries/Entitas.CodeGenerator/IPoolCodeGenerator.cs.meta b/...s.Unity.VisualDebugging/Assets/Libraries/Entitas.CodeGenerator/IPoolCodeGenerator.cs.meta
diff --git a/...isualDebugging/Assets/Libraries/Entitas.Unity.CodeGenerator/Editor/CodeGeneratorEditor.cs b/...isualDebugging/Assets/Libraries/Entitas.Unity.CodeGenerator/Editor/CodeGeneratorEditor.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Reflection;
 using Entitas;
+using Entitas.CodeGenerator;
 using UnityEditor;
 
 namespace Entitas.Unity.CodeGenerator {
@@ -10,7 +11,19 @@ public static class CodeGeneratorEditor {
         public static void Generate() {
             var types = Assembly.GetAssembly(typeof(Entity)).GetTypes();
             var config = new CodeGeneratorConfig(EntitasPreferencesEditor.LoadConfig());
-            Entitas.CodeGenerator.CodeGenerator.Generate(types, config.pools, config.generatedFolderPath);
+
+            var componentCodeGenerators = new IComponentCodeGenerator [] {
+                new IndicesLookupGenerator(),
+                new ComponentExtensionsGenerator()
+            };
+
+            var poolCodeGenerators = new IPoolCodeGenerator [] {
+                new PoolAttributeGenerator()
+            };
+
+            Entitas.CodeGenerator.CodeGenerator.Generate(types, config.pools, config.generatedFolderPath,
+                componentCodeGenerators, poolCodeGenerators);
+
             AssetDatabase.Refresh();
         }
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,6 +16,11 @@ public bool isTest { @@
                     }
                 }
             }
+            public Entity IsTest(bool value) {
+                isTest = value;
+                return this;
+            }
         }
     }
@@ Expand Down @@