com.wallstop-studios.unity-helpers 2.0.0-rc74.4 → 2.0.0-rc74.6

package/Editor/Sprites/ScriptableSpriteAtlasEditor.cs

@@ -816,6 +816,7 @@
             int errorCount = 0;
             HashSet<string> processedAssetPaths = new();
 
+            List<TextureImporter> importers = new();
             AssetDatabase.StartAssetEditing();
             try
             {
@@ -901,6 +902,7 @@
                     if (settingsActuallyModified)
                     {
                         importer.SaveAndReimport();
+                        importers.Add(importer);
                         modifiedCount++;
                         this.Log(
                             $"Set import settings for texture: {assetPath} (from sprite: {sprite.name}) to uncompressed ({targetFormat})."
@@ -914,8 +916,14 @@
                 EditorUtility.ClearProgressBar();
             }
 
+            foreach (TextureImporter importer in importers)
+            {
+                importer.SaveAndReimport();
+            }
+
             if (modifiedCount > 0 || errorCount > 0)
             {
+                AssetDatabase.SaveAssets();
                 AssetDatabase.Refresh();
             }
 

package/Editor/Sprites/SpriteCropper.cs

@@ -5,11 +5,13 @@
     using System.Collections.Generic;
     using System.IO;
     using System.Linq;
+    using System.Text.RegularExpressions;
     using System.Threading.Tasks;
     using UnityEditor;
     using UnityEngine;
     using Core.Extension;
     using CustomEditors;
+    using Microsoft.CodeAnalysis.CSharp.Syntax;
     using Object = UnityEngine.Object;
 
     public sealed class SpriteCropper : EditorWindow
@@ -33,6 +35,9 @@
         [SerializeField]
         private List<Object> _inputDirectories = new();
 
+        [SerializeField]
+        private string _spriteNameRegex = ".*";
+
         [SerializeField]
         private bool _onlyNecessary;
 
@@ -56,6 +61,9 @@
         private SerializedProperty _rightPaddingProperty;
         private SerializedProperty _topPaddingProperty;
         private SerializedProperty _bottomPaddingProperty;
+        private SerializedProperty _spriteNameRegexProperty;
+
+        private Regex _regex;
 
         [MenuItem("Tools/Wallstop Studios/Unity Helpers/" + Name)]
         private static void ShowWindow() => GetWindow<SpriteCropper>(Name);
@@ -69,6 +77,7 @@
             _rightPaddingProperty = _serializedObject.FindProperty(nameof(_rightPadding));
             _topPaddingProperty = _serializedObject.FindProperty(nameof(_topPadding));
             _bottomPaddingProperty = _serializedObject.FindProperty(nameof(_bottomPadding));
+            _spriteNameRegexProperty = _serializedObject.FindProperty(nameof(_spriteNameRegex));
         }
 
         private void OnGUI()
@@ -79,6 +88,7 @@
                 _inputDirectoriesProperty,
                 nameof(SpriteCropper)
             );
+            EditorGUILayout.PropertyField(_spriteNameRegexProperty, true);
             EditorGUILayout.PropertyField(_onlyNecessaryProperty, true);
             EditorGUILayout.PropertyField(_leftPaddingProperty, true);
             EditorGUILayout.PropertyField(_rightPaddingProperty, true);
@@ -88,6 +98,9 @@
 
             if (GUILayout.Button("Find Sprites To Process"))
             {
+                _regex = !string.IsNullOrWhiteSpace(_spriteNameRegex)
+                    ? new Regex(_spriteNameRegex)
+                    : null;
                 FindFilesToProcess();
             }
 
@@ -146,6 +159,13 @@
                     {
                         continue;
                     }
+
+                    string fileName = Path.GetFileNameWithoutExtension(file);
+                    if (_regex != null && !_regex.IsMatch(fileName))
+                    {
+                        continue;
+                    }
+
                     _filesToProcess.Add(file);
                 }
             }

package/Editor/Sprites/SpriteSettingsApplier.cs

@@ -559,6 +559,7 @@ namespace WallstopStudios.UnityHelpers.Editor.Sprites
                 return;
             }
 
+            List<TextureImporter> importers = new();
             AssetDatabase.StartAssetEditing();
             try
             {
@@ -591,6 +592,7 @@ namespace WallstopStudios.UnityHelpers.Editor.Sprites
                     try
                     {
                         importer.SaveAndReimport();
+                        importers.Add(importer);
                     }
                     catch (Exception ex)
                     {
@@ -604,6 +606,11 @@ namespace WallstopStudios.UnityHelpers.Editor.Sprites
             {
                 AssetDatabase.StopAssetEditing();
                 EditorUtility.ClearProgressBar();
+                foreach (TextureImporter importer in importers)
+                {
+                    importer.SaveAndReimport();
+                }
+
                 this.Log($"Processed {spriteCount} sprites.");
                 if (0 < spriteCount)
                 {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "com.wallstop-studios.unity-helpers",
-  "version": "2.0.0-rc74.4",
+  "version": "2.0.0-rc74.6",
   "displayName": "Unity Helpers",
   "description": "Various Unity Helper Library",
   "dependencies": {},
@@ -57,6 +57,8 @@
 
 
 
+
+