Merge branch 'main' into feature/performance_tuning

CyberAgentGameEntertainment · Jan 18, 2024 · 262d1c9 · 262d1c9
2 parents 4273d6e + 52f4c81
commit 262d1c9
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 1 deletion.
diff --git a/Assets/SmartAddresser/Editor/Core/Tools/Shared/SmartAddresserProjectSettings.cs b/Assets/SmartAddresser/Editor/Core/Tools/Shared/SmartAddresserProjectSettings.cs
@@ -12,6 +12,7 @@ public sealed class SmartAddresserProjectSettings : ScriptableSingleton<SmartAdd
         [SerializeField] private LayoutRuleData primaryData;
         [SerializeField] private MonoScript versionExpressionParser;
         [SerializeField] private Validation validation = new Validation();
+        [SerializeField] private bool sortByAssetPaths = false;
 
         public LayoutRuleData PrimaryData
         {
@@ -52,6 +53,19 @@ public Validation ValidationSettings
             }
         }
 
+        public bool SortByAssetPaths
+        {
+            get => sortByAssetPaths;
+            set
+            {
+                if (value == sortByAssetPaths)
+                    return;
+
+                sortByAssetPaths = value;
+                Save(true);    
+            }
+        }
+
         [Serializable]
         public sealed class Validation
         {

diff --git a/Assets/SmartAddresser/Editor/Core/Tools/Shared/SmartAddresserProjectSettingsProvider.cs b/Assets/SmartAddresser/Editor/Core/Tools/Shared/SmartAddresserProjectSettingsProvider.cs
@@ -82,6 +82,13 @@ public override void OnGUI(string searchContext)
                         projectSettings.ValidationSettings = new SmartAddresserProjectSettings.Validation(duplicateAddresses,
                             duplicateAssetPaths, entryHasMultipleVersions);
                 }
+
+                using (var ccs = new EditorGUI.ChangeCheckScope())
+                {
+                    var sortByAssetPaths = EditorGUILayout.Toggle("Sort by assetPaths", projectSettings.SortByAssetPaths);
+                    if (ccs.changed)
+                        projectSettings.SortByAssetPaths = sortByAssetPaths;
+                }
             }
         }
 

diff --git a/Assets/SmartAddresser/Editor/Foundation/AssetDatabaseAdapter/AssetDatabaseAdapter.cs b/Assets/SmartAddresser/Editor/Foundation/AssetDatabaseAdapter/AssetDatabaseAdapter.cs
@@ -1,4 +1,5 @@
 using System;
+using SmartAddresser.Editor.Core.Tools.Shared;
 using UnityEditor;
 
 namespace SmartAddresser.Editor.Foundation.AssetDatabaseAdapter
@@ -7,7 +8,14 @@ public sealed class AssetDatabaseAdapter : IAssetDatabaseAdapter
     {
         public string[] GetAllAssetPaths()
         {
-            return AssetDatabase.GetAllAssetPaths();
+            string[] allAssetPaths = AssetDatabase.GetAllAssetPaths();
+            var projectSettings = SmartAddresserProjectSettings.instance;
+            if (projectSettings == null || !projectSettings.SortByAssetPaths)
+            {
+                return allAssetPaths;
+            }
+            Array.Sort(allAssetPaths, StringComparer.OrdinalIgnoreCase);
+            return allAssetPaths;
         }
 
         public string GUIDToAssetPath(string guid)