Merge pull request #1 from sator-imaging/active/v3

Active/v3

Author: sator-imaging

CHANGELOG.md

@@ -6,10 +6,33 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 
-## [Unreleased]
+## [Unreleased](https://github.com/sator-imaging/Unity-AltSourceGenerator)
 
+- nothing yet
+
+
+
+## [3.0.0](https://github.com/sator-imaging/Unity-AltSourceGenerator/releases/tag/v3.0.0)
+
+
+### API Changes 😉
+
+#### Features works only on Unity Editor
+
+classes moved to `Editor` namespace.
+
+#### `USGEngine.ProcessFile()` will be removed
+
+use `USGUtility.ForceGenerateByType(typeof(...))` instead.
+
+#### `USGUtility.**ByName()` will be removed
+
+methods still exist but obsolete. use `USGUtility.**ByType()` instead.
+
+
+
+## [2.0.0](https://github.com/sator-imaging/Unity-AltSourceGenerator/releases/tag/v2.0.0)
 
-## [2.0.0]()
 
 ### Breaking Changes ;-)
 
@@ -26,7 +49,7 @@ now private. use `ProcessFile(path, *true*)` instead.
 
 `showInProjectPanel` now false by default.
 
-#### usg<T>(params string[] memberNames)
+#### usg\<T>(params string[] memberNames)
 
 `global::` namespace will be added.
 

Editor/EditorEvent.cs

@@ -4,7 +4,7 @@
 using System.Reflection;
 using UnityEditor;
 
-namespace SatorImaging.UnitySourceGenerator
+namespace SatorImaging.UnitySourceGenerator.Editor
 {
     public static class EditorEvent
     {
@@ -24,7 +24,8 @@ internal static void RegisterFocusChangedEvent(bool registerOrRemove)
             //https://github.com/Unity-Technologies/UnityCsReference/blob/master/Editor/Mono/EditorApplication.cs#L275
             var focusChanged = typeof(EditorApplication).GetField("focusChanged",
                 BindingFlags.Static | BindingFlags.NonPublic);
-            if (focusChanged == null) return;
+            if (focusChanged == null)
+                return;
 
             // TODO: better cleanup.
             //       currently, event can be unregistered but it seems empty action runs on focus changed event...?
@@ -50,32 +51,33 @@ internal static void RegisterFocusChangedEvent(bool registerOrRemove)
             //Debug.Log($"[USG] Null? {currentAction == null}  Method:{currentAction.Method} Target:{currentAction.Target}");
 
             _restoreAutoRefresh = EditorPrefs.GetInt(PREF_AUTO_REFRESH, EditorPrefs.GetInt(PREF_AUTO_REFRESH_OLD, DEFAULT_AUTO_REFRESH));
-            _restoreDirMonitoring = EditorPrefs.GetBool(PREF_DIR_MONITORING, DEFAULT_DIR_MONITORING);
+            //_restoreDirMonitoring = EditorPrefs.GetBool(PREF_DIR_MONITORING, DEFAULT_DIR_MONITORING);
         }
 
         const bool DEFAULT_DIR_MONITORING = true;
         const int DEFAULT_AUTO_REFRESH = 1;
         const string PREF_AUTO_REFRESH = "kAutoRefreshMode";
         const string PREF_AUTO_REFRESH_OLD = "kAutoRefresh";
-        const string PREF_DIR_MONITORING = "DirectoryMonitoring";
-        static bool _restoreDirMonitoring = DEFAULT_DIR_MONITORING;
+        //const string PREF_DIR_MONITORING = "DirectoryMonitoring";
+        //static bool _restoreDirMonitoring = DEFAULT_DIR_MONITORING;
         static int _restoreAutoRefresh = DEFAULT_AUTO_REFRESH;
         static void OnEditorApplicationFocus(bool focus)
         {
             //https://github.com/Unity-Technologies/UnityCsReference/blob/master/Editor/Mono/PreferencesWindow/AssetPipelinePreferences.cs#L94
             if (focus == false)
             {
                 _restoreAutoRefresh = EditorPrefs.GetInt(PREF_AUTO_REFRESH, EditorPrefs.GetInt(PREF_AUTO_REFRESH_OLD, DEFAULT_AUTO_REFRESH));
-                _restoreDirMonitoring = EditorPrefs.GetBool(PREF_DIR_MONITORING, DEFAULT_DIR_MONITORING);
+                //_restoreDirMonitoring = EditorPrefs.GetBool(PREF_DIR_MONITORING, DEFAULT_DIR_MONITORING);
+
                 //AssetDatabase.DisallowAutoRefresh();
                 EditorApplication.LockReloadAssemblies();
-                EditorPrefs.SetBool(PREF_DIR_MONITORING, false);
+                //EditorPrefs.SetBool(PREF_DIR_MONITORING, false);
                 EditorPrefs.SetInt(PREF_AUTO_REFRESH, 0);
                 EditorPrefs.SetInt(PREF_AUTO_REFRESH_OLD, 0);
             }
             else
             {
-                EditorPrefs.SetBool(PREF_DIR_MONITORING, _restoreDirMonitoring);
+                //EditorPrefs.SetBool(PREF_DIR_MONITORING, _restoreDirMonitoring);
                 EditorPrefs.SetInt(PREF_AUTO_REFRESH, _restoreAutoRefresh);
                 EditorPrefs.SetInt(PREF_AUTO_REFRESH_OLD, _restoreAutoRefresh);
 

Editor/EditorExtension.cs

@@ -1,11 +1,11 @@
 #if UNITY_EDITOR
 
-using System.IO;
+using System.Collections.Generic;
 using UnityEditor;
 
-namespace SatorImaging.UnitySourceGenerator
+namespace SatorImaging.UnitySourceGenerator.Editor
 {
-    static class EditorExtension
+    public static class EditorExtension
     {
         const string ROOT_MENU = @"Assets/Unity Source Generator/";
         const string TEMPLATE_PATH = @"Packages/com.sator-imaging.alt-source-generator/Template/Template_";
@@ -16,16 +16,23 @@ static class EditorExtension
         [MenuItem(ROOT_MENU + "Force Generate while Overwriting Disabled")]
         static void ForceGenerateSelectedScripts()
         {
+            if (Selection.assetGUIDs == null || Selection.assetGUIDs.Length == 0)
+                return;
+
             // NOTE: when multiple files selected, first import event initialize C# environment.
             //       --> https://docs.unity3d.com/2021.3/Documentation/Manual/DomainReloading.html
-            //       need to use USGEngine.ProcessFile() instead.
+            //       so that need to process files at once.
+            var filePathList = new List<string>(Selection.assetGUIDs.Length);
+
             foreach (var guid in Selection.assetGUIDs)
             {
                 var path = AssetDatabase.GUIDToAssetPath(guid);
-                //USGEngine.IgnoreOverwriteSettingOnAttribute = true;
-                //USGEngine.ProcessFile(path);
-                USGUtility.ForceGenerateByName(Path.GetFileNameWithoutExtension(path), false);
+                if (AssetDatabase.LoadAssetAtPath<MonoScript>(path) is not MonoScript)
+                    continue;
+
+                filePathList.Add(path);
             }
+            USGEngine.Process(filePathList.ToArray(), true);
         }
 
 

Editor/ProjectSettingsData.cs

@@ -5,7 +5,7 @@
 using UnityEngine;
 
 
-namespace SatorImaging.UnitySourceGenerator
+namespace SatorImaging.UnitySourceGenerator.Editor
 {
     public class ProjectSettingsData : ProjectSettingsSingleton<ProjectSettingsData>
     {