Some codegen wip stuff and removed permutation code

Author: zaucy

packages/com.seaube.ecs-idl/Editor/EcsIdl.Editor.asmdef

@@ -2,7 +2,8 @@
 	"name": "EcsIdl.Editor",
 	"rootNamespace": "",
 	"references": [
-		"EcsIdl"
+		"EcsIdl",
+		"Unity.EditorCoroutines.Editor"
 	],
 	"includePlatforms": [
 		"Editor"

packages/com.seaube.ecs-idl/Editor/EcsIdlCodegenPlugin.cs

@@ -0,0 +1,6 @@
+public abstract class EcsIdlCodegenPlugin {
+	public abstract System.Threading.Tasks.Task Generate
+		( EcsIdlPackage  pkg
+		, string         outputPath
+		);
+}

packages/com.seaube.ecs-idl/Editor/EcsIdlCodegenPlugin.cs.meta

@@ -0,0 +1,7 @@
+using System;
+
+[AttributeUsage(AttributeTargets.Class)]
+public class EcsIdlCodegenPluginAttribute : Attribute {
+	public string name = "";
+	public string extname = "";
+}

packages/com.seaube.ecs-idl/Editor/EcsIdlCodegenPluginAttribute.cs

@@ -54,6 +54,7 @@ static void OnPostprocessAllAssets
 			}
 		}
 
+		UnityEngine.Debug.Log("any packages update?!");
 		if(importedPkgs.Count > 0 || deletedPkgs.Count > 0 || movedPkgs.Count > 0) {
 			RefreshEcsIdlCodegen(importedPkgs, deletedPkgs, movedPkgs);
 		}
@@ -115,5 +116,37 @@ static void RefreshEcsIdlCodegen
 
 		Progress.Report(progressId, 0.1f);
 		codegen.Start();
+		
+		UnityEngine.Debug.Log("getting plugins!");
+		foreach(var plugin in GetCodegenPlugins()) {
+			UnityEngine.Debug.Log("plugin!");
+		}
+	}
+
+	static IEnumerable<EcsIdlCodegenPlugin> GetCodegenPlugins() {
+		var assemblies = System.AppDomain.CurrentDomain.GetAssemblies();
+
+		foreach(var assembly in assemblies) {
+			foreach(var type in assembly.GetTypes()) {
+				var pluginAttrs = type.GetCustomAttributes(
+					typeof(EcsIdlCodegenPluginAttribute),
+					inherit: true
+				);
+
+				if(pluginAttrs.Length > 0) {
+					var pluginAttr = pluginAttrs[0] as EcsIdlCodegenPluginAttribute;
+					UnityEngine.Debug.Log($"Plugin Name: {pluginAttr!.name}");
+					var plugin =
+						System.Activator.CreateInstance(type) as EcsIdlCodegenPlugin;
+					if(plugin == null) {
+						UnityEngine.Debug.Log(
+							$"Invalid EcsIdlCodegenPlugin: {pluginAttr!.name}"
+						);
+					} else {
+						yield return plugin;
+					}
+				}
+			}
+		}
 	}
 }

packages/com.seaube.ecs-idl/Editor/EcsIdlCodegenPluginAttribute.cs.meta

@@ -11,6 +11,14 @@ class EcsIdlSettings : ScriptableObject {
 	public const string path = "Project/EcsIdlProjectSettings";
 	public const SettingsScope scope = SettingsScope.Project;
 
+	/// <summary>Path to <c>ecs_idl_parser_info_codegen.exe</c>. If unset
+	/// the latest will be downloaded and used instead.</summary>
+	public string parseInfoCodegenPluginPath = "";
+
+	/// <summary>Path to <c>ecs_idl_csharp_codegen.exe</c>. If unset the latest
+	/// will be downloaded and used instead.</summary>
+	public string csharpCodegenPluginPath = "";
+
 	internal static EcsIdlSettings GetOrCreateSettings() {
 		var settings = AssetDatabase.LoadAssetAtPath<EcsIdlSettings>(assetPath);
 		if(settings == null) {
@@ -45,6 +53,8 @@ public static SettingsProvider CreateEcsIdlSettingsProvider() {
 				"ECS IDL",
 				"ECS-IDL",
 				"ECS",
+				"ECS Plugin",
+				"Plugin",
 				"Runtime",
 				"Library",
 			}),

packages/com.seaube.ecs-idl/Editor/EcsIdlPackagesPostprocessor.cs

@@ -7,9 +7,14 @@
 using EcsIdl.UnitySync;
 using UnityEngine.SceneManagement;
 using UnityEditor.SceneManagement;
+using Unity.EditorCoroutines.Editor;
+using System.Threading.Tasks;
+using System.Collections.Concurrent;
 
 using ComponentIdsList = System.Collections.Generic.SortedSet<System.Int32>;
 
+#nullable enable
+
 class EcsIdlUnitySyncGameObjectPreview : PreviewSceneStage {
 
 	public static EcsIdlUnitySyncGameObjectPreview CreateInstance() {
@@ -18,14 +23,21 @@ public static EcsIdlUnitySyncGameObjectPreview CreateInstance() {
 		);
 	}
 
-	public EntityGameObjectPool pool;
-	public event System.Action onOpenStage;
+	public EntityGameObjectPool? pool;
+	public event System.Action? onOpenStage;
 
 	protected override void OnEnable() {
 		base.OnEnable();
 		scene = EditorSceneManager.NewPreviewScene();
 		pool = EntityGameObjectPool.CreateInstance();
 		pool.targetScene = scene;
+
+		if(Camera.main != null) {
+			SceneManager.MoveGameObjectToScene(
+				Instantiate(Camera.main.gameObject),
+				scene
+			);
+		}
 	}
 
 	protected override bool OnOpenStage() {
@@ -45,6 +57,8 @@ protected override GUIContent CreateHeaderContent() {
 
 public class EcsIdlUnitySyncDebugWindow : EditorWindow {
 	static bool allMonoBehavioursFoldout = false;
+	static bool refreshing = false;
+	static Vector2 scrollPosition = new Vector2();
 	static ComponentIdsList testComponentIds = new ComponentIdsList();
 
 	[MenuItem("Window/ECS IDL/Unity Sync Debug")]
@@ -56,12 +70,11 @@ static void Init() {
 	private List<System.Type> allMonoBehaviourTypes = new List<System.Type>();
 	private List<System.Type> monoBehaviourTypes = new List<System.Type>();
 	private List<System.Type> componentTypes = new List<System.Type>();
-	private EcsIdlUnitySyncGameObjectPreview previewSceneStage;
+	private EcsIdlUnitySyncGameObjectPreview? previewSceneStage;
 
 	void OnEnable() {
 		titleContent = new GUIContent("Unity Sync Debug");
-		RefreshTypes();
-		RefreshComponentMonoBehaviourTypes();
+		StartRefresh();
 
 		CompilationPipeline.compilationFinished += OnCompilationFinished;
 	}
@@ -78,26 +91,59 @@ void OnCompilationFinished
 		( object _
 		)
 	{
-		RefreshTypes();
-		RefreshComponentMonoBehaviourTypes();
+		StartRefresh();
+	}
 
-		// Re-open preview scene if it was open before a compilation started. It can
-		// get messed up after a compile is done.
-		if(previewSceneStage != null) {
-			OpenPreviewScene();
+	void StartRefresh() {
+		refreshing = true;
+		EditorCoroutineUtility.StartCoroutine(Refresh(), this);
+	}
+
+	IEnumerator<string> Refresh() {
+		int progressId = Progress.Start("Finding ECS IDL types");
+		bool cancelledRequested = false;
+		bool cancelled = false;
+
+		Progress.RegisterCancelCallback(progressId, () => {
+			if(cancelled) return true;
+
+			cancelledRequested = true;
+			return false;
+		});
+		UnityEngine.Debug.Log("Refresh()?");
+
+		try {
+			foreach(var (pc, typeName) in RefreshTypes()) {
+				if(cancelledRequested) {
+					cancelled = true;
+					Progress.Cancel(progressId);
+					refreshing = false;
+					yield break;
+				}
+
+				Progress.Report(progressId, pc, typeName);
+
+				yield return "";
+			}
+
+			RefreshComponentMonoBehaviourTypes();
+		} finally {
+			Progress.Remove(progressId);
+			refreshing = false;
 		}
 	}
 
-	void RefreshTypes() {
+	IEnumerable<(float, string)> RefreshTypes() {
 		if(!EditorApplication.isPlaying) {
 			UnitySyncMonoBehaviours.ClearRegisteredMonoBehaviourTypes();
+			yield return (0F, "");
 		}
+
+		allMonoBehaviourTypes.Clear();
+		componentTypes.Clear();
+
 		foreach(var assembly in System.AppDomain.CurrentDomain.GetAssemblies()) {
 			foreach(var type in assembly.GetTypes()) {
-				if(!EditorApplication.isPlaying) {
-					UnitySyncMonoBehaviours.RegisterMonoBehaviourType(type);
-				}
-
 				if(EcsIdl.Util.IsComponent(type)) {
 					componentTypes.Add(type);
 				} else {
@@ -108,6 +154,29 @@ void RefreshTypes() {
 				}
 			}
 		}
+
+		componentTypes = componentTypes.OrderBy(t => t.FullName).ToList();
+		allMonoBehaviourTypes =
+			allMonoBehaviourTypes.OrderBy(t => t.FullName).ToList();
+
+		yield return (0F, "");
+
+		if(!EditorApplication.isPlaying) {
+			var registerProgress =
+				UnitySyncMonoBehaviours.RegisterMonoBehaviourTypes(
+					allMonoBehaviourTypes
+				);
+			int registeredTypes = 0;
+			foreach(var type in registerProgress) {
+				yield return (
+					((float)registeredTypes / (float)allMonoBehaviourTypes.Count()),
+					type.FullName
+				);
+				registeredTypes += 1;
+			}
+		} else {
+			yield return (1F, "");
+		}
 	}
 
 	void RefreshComponentMonoBehaviourTypes() {
@@ -172,6 +241,7 @@ void PreviewEntityGameObjectPoolRemove
 	}
 
 	void OnGUI() {
+		scrollPosition = EditorGUILayout.BeginScrollView(scrollPosition);
 		allMonoBehavioursFoldout = EditorGUILayout.BeginFoldoutHeaderGroup(
 			allMonoBehavioursFoldout,
 			"All MonoBehaviour Scripts"
@@ -202,6 +272,7 @@ void OnGUI() {
 		EditorGUILayout.Space();
 
 		++EditorGUI.indentLevel;
+
 		EditorGUILayout.LabelField("Test Components", EditorStyles.boldLabel);
 		foreach(var componentType in componentTypes) {
 			var componentId = EcsIdl.Util.GetComponentID(componentType);
@@ -252,6 +323,10 @@ void OnGUI() {
 		}
 
 		--EditorGUI.indentLevel;
+
+		GUILayout.Space(20);
+
+		EditorGUILayout.EndScrollView();
 	}
 
 	private void OpenPreviewScene() {

packages/com.seaube.ecs-idl/Editor/EcsIdlSettings.cs

@@ -1,15 +1,17 @@
- using UnityEngine;
- using System.Collections.Generic;
- using UnityEditor;
+using UnityEngine;
+using System.Collections.Generic;
+using UnityEditor;
 
+#nullable enable
+
 [CustomEditor(typeof(EcsIdlPackage))]
 [CanEditMultipleObjects]
 public class EcsIdlPackageEditor : Editor {
 	private static Dictionary<string, bool> pkgFoldouts =
 		new Dictionary<string, bool>();
 
 	public override void OnInspectorGUI() {
-		EcsIdlPackage mainPkg = null;
+		EcsIdlPackage? mainPkg = null;
 		List<EcsIdlPackage> pkgList = new List<EcsIdlPackage>();
 
 		foreach(var target in targets) {

packages/com.seaube.ecs-idl/Editor/EcsIdlUnitySyncDebugWindow.cs

@@ -63,6 +63,22 @@ public static System.Int32 GetComponentID
 			return (System.Int32)idField.GetValue(null);
 		}
 
+		public static System.Int32 GetActionID<T>() where T : EcsIdl.Action {
+			return GetActionID(typeof(T));
+		}
+
+		public static System.Int32 GetActionID
+			( System.Type actionType
+			)
+		{
+			var idField = actionType.GetField(
+				"id",
+				BindingFlags.Static | BindingFlags.Public
+			);
+
+			return (System.Int32)idField.GetValue(null);
+		}
+
 		public static IEnumerable<ComponentIdsList> GetComponentIdPermutations
 			( ComponentIdsList componentIds
 			)
@@ -72,15 +88,24 @@ public static IEnumerable<ComponentIdsList> GetComponentIdPermutations
 			var count = componentIds.Count;
 			if(count == 0) yield return new ComponentIdsList();
 
+			UnityEngine.Debug.Log("PERMUTATION START");
 			for(;count > 0; --count) {
 				if( count == componentIds.Count ) yield return componentIds;
 				if( count > componentIds.Count ) yield break;
 				var ptrs = Enumerable.Range(0, count).ToArray();
 
 				while(ptrs[0] <= componentIdsList.Count - count) {
-					yield return new ComponentIdsList(
+					var permutationList = new ComponentIdsList(
 						ptrs.Select(p => componentIdsList[p])
 					);
+					yield return permutationList;
+					string msg = "\t{";
+					foreach(var id in permutationList) {
+						msg += id + ", ";
+					}
+					msg = msg.TrimEnd(new char[]{',', ' '});
+					msg += "}";
+					UnityEngine.Debug.Log(msg);
 
 					++ptrs[count - 1];
 
@@ -96,6 +121,7 @@ public static IEnumerable<ComponentIdsList> GetComponentIdPermutations
 					}
 				}
 			}
+			UnityEngine.Debug.Log("PERMUTATION END");
 		}
 
 	}