com.wallstop-studios.unity-helpers 2.0.0-rc73.13 → 2.0.0-rc73.15

package/Editor/Sprites/ScriptableSpriteAtlasEditor.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 2a8f0685b47e4e3697ff19800eddc3dd
+timeCreated: 1746911361

package/Editor/{SpriteCropper.cs → Sprites/SpriteCropper.cs}

@@ -1,4 +1,4 @@
-namespace WallstopStudios.UnityHelpers.Editor
+namespace WallstopStudios.UnityHelpers.Editor.Sprites
 {
 #if UNITY_EDITOR
     using System;
@@ -6,9 +6,10 @@
     using System.IO;
     using System.Linq;
     using System.Threading.Tasks;
-    using Core.Extension;
     using UnityEditor;
     using UnityEngine;
+    using Core.Extension;
+    using CustomEditors;
     using Object = UnityEngine.Object;
 
     public sealed class SpriteCropper : EditorWindow
@@ -35,64 +36,55 @@
         [SerializeField]
         private bool _onlyNecessary;
 
+        [SerializeField]
+        private int _leftPadding;
+
+        [SerializeField]
+        private int _rightPadding;
+
+        [SerializeField]
+        private int _topPadding;
+
+        [SerializeField]
+        private int _bottomPadding;
+
         private List<string> _filesToProcess;
+        private SerializedObject _serializedObject;
+        private SerializedProperty _inputDirectoriesProperty;
+        private SerializedProperty _onlyNecessaryProperty;
+        private SerializedProperty _leftPaddingProperty;
+        private SerializedProperty _rightPaddingProperty;
+        private SerializedProperty _topPaddingProperty;
+        private SerializedProperty _bottomPaddingProperty;
 
         [MenuItem("Tools/Wallstop Studios/Unity Helpers/" + Name)]
         private static void ShowWindow() => GetWindow<SpriteCropper>(Name);
 
+        private void OnEnable()
+        {
+            _serializedObject = new SerializedObject(this);
+            _inputDirectoriesProperty = _serializedObject.FindProperty(nameof(_inputDirectories));
+            _onlyNecessaryProperty = _serializedObject.FindProperty(nameof(_onlyNecessary));
+            _leftPaddingProperty = _serializedObject.FindProperty(nameof(_leftPadding));
+            _rightPaddingProperty = _serializedObject.FindProperty(nameof(_rightPadding));
+            _topPaddingProperty = _serializedObject.FindProperty(nameof(_topPadding));
+            _bottomPaddingProperty = _serializedObject.FindProperty(nameof(_bottomPadding));
+        }
+
         private void OnGUI()
         {
-            GUILayout.Label("Drag folders below", EditorStyles.boldLabel);
-            SerializedObject so = new(this);
-            so.Update();
-            SerializedProperty dirs = so.FindProperty(nameof(_inputDirectories));
-            EditorGUILayout.PropertyField(dirs, true);
-            SerializedProperty onlyNecessary = so.FindProperty(nameof(_onlyNecessary));
-            EditorGUILayout.PropertyField(onlyNecessary, true);
-            so.ApplyModifiedProperties();
-
-            if (GUILayout.Button("Select Input Folder"))
-            {
-                string path = EditorUtility.OpenFolderPanel(
-                    "Select Sprite Input Folder",
-                    Application.dataPath,
-                    ""
-                );
-                if (!string.IsNullOrWhiteSpace(path))
-                {
-                    if (path.StartsWith(Application.dataPath, StringComparison.Ordinal))
-                    {
-                        path = "Assets" + path.Substring(Application.dataPath.Length);
-                        if (
-                            !_inputDirectories
-                                .Select(AssetDatabase.GetAssetPath)
-                                .Any(directory =>
-                                    string.Equals(
-                                        directory,
-                                        path,
-                                        StringComparison.OrdinalIgnoreCase
-                                    )
-                                )
-                        )
-                        {
-                            Object folder = AssetDatabase.LoadAssetAtPath<Object>(path);
-                            if (folder == null)
-                            {
-                                return;
-                            }
-                            _inputDirectories.Add(folder);
-                        }
-                    }
-                    else
-                    {
-                        EditorUtility.DisplayDialog(
-                            "Invalid Folder",
-                            "Please select a folder inside the project's Assets directory.",
-                            "OK"
-                        );
-                    }
-                }
-            }
+            EditorGUILayout.LabelField("Input directories", EditorStyles.boldLabel);
+            _serializedObject.Update();
+            PersistentDirectoryGUI.PathSelectorObjectArray(
+                _inputDirectoriesProperty,
+                nameof(SpriteCropper)
+            );
+            EditorGUILayout.PropertyField(_onlyNecessaryProperty, true);
+            EditorGUILayout.PropertyField(_leftPaddingProperty, true);
+            EditorGUILayout.PropertyField(_rightPaddingProperty, true);
+            EditorGUILayout.PropertyField(_topPaddingProperty, true);
+            EditorGUILayout.PropertyField(_bottomPaddingProperty, true);
+            _serializedObject.ApplyModifiedProperties();
 
             if (GUILayout.Button("Find Sprites To Process"))
             {
@@ -229,9 +221,6 @@
                     $"An error occurred during processing. Last processed: {lastProcessed}.",
                     e
                 );
-                AssetDatabase.StopAssetEditing();
-                AssetDatabase.SaveAssets();
-                AssetDatabase.Refresh();
             }
             finally
             {
@@ -302,9 +291,7 @@
             int maxX = 0;
             int maxY = 0;
             bool hasVisible = false;
-
             object lockObject = new();
-
             Parallel.For(
                 0,
                 width * height,
@@ -341,18 +328,28 @@
                 }
             );
 
-            int cropWidth = maxX - minX + 1;
-            int cropHeight = maxY - minY + 1;
-
-            if (_onlyNecessary && (!hasVisible || (cropWidth == width && cropHeight == height)))
-            {
-                return null;
-            }
-
+            int cropWidth;
+            int cropHeight;
             if (!hasVisible)
             {
                 cropWidth = 1;
                 cropHeight = 1;
+                minX = 0;
+                minY = 0;
+            }
+            else
+            {
+                minX = Mathf.Max(0, minX - _leftPadding);
+                minY = Mathf.Max(0, minY - _bottomPadding);
+                maxX = Mathf.Min(width, maxX + _rightPadding);
+                maxY = Mathf.Min(height, maxY + _topPadding);
+                cropWidth = maxX - minX + 1;
+                cropHeight = maxY - minY + 1;
+            }
+
+            if (_onlyNecessary && (!hasVisible || (cropWidth == width && cropHeight == height)))
+            {
+                return null;
             }
 
             Texture2D cropped = new(cropWidth, cropHeight, TextureFormat.RGBA32, false);
@@ -407,6 +404,11 @@
                 cropHeight > 0 ? newPivotPixels.y / cropHeight : 0.5f
             );
 
+            if (!hasVisible)
+            {
+                newPivotNorm = new Vector2(0.5f, 0.5f);
+            }
+
             newImporter.spriteImportMode = SpriteImportMode.Single;
             newImporter.spritePivot = newPivotNorm;
             newSettings.spritePivot = newPivotNorm;

package/Editor/{SpriteSettingsApplier.cs → Sprites/SpriteSettingsApplier.cs}

@@ -1,16 +1,16 @@
 // ReSharper disable CompareOfFloatsByEqualityOperator
-namespace WallstopStudios.UnityHelpers.Editor
+namespace WallstopStudios.UnityHelpers.Editor.Sprites
 {
 #if UNITY_EDITOR
-    using Core.Attributes;
-    using Core.Extension;
     using System;
     using System.Collections.Generic;
     using System.IO;
     using System.Linq;
     using UnityEditor;
     using UnityEngine;
-    using Utils;
+    using Core.Attributes;
+    using Core.Extension;
+    using CustomEditors;
     using Object = UnityEngine.Object;
 
     [Serializable]
@@ -77,7 +77,7 @@ namespace WallstopStudios.UnityHelpers.Editor
     }
 
     [CustomPropertyDrawer(typeof(SpriteSettings))]
-    public class SpriteSettingsDrawer : PropertyDrawer
+    public sealed class SpriteSettingsDrawer : PropertyDrawer
     {
         private const float CheckboxWidth = 18f;
         private const float HorizontalSpacing = 5f;
@@ -204,7 +204,7 @@ namespace WallstopStudios.UnityHelpers.Editor
                         valuePropHeight
                     );
 
-                    using (new GUIIndentScope())
+                    using (new EditorGUI.IndentLevelScope())
                     {
                         EditorGUI.PropertyField(valueRect, valueProp, GUIContent.none, true);
                     }
@@ -301,25 +301,16 @@ namespace WallstopStudios.UnityHelpers.Editor
         private void OnGUI()
         {
             _serializedObject.Update();
-
             _scrollPosition = EditorGUILayout.BeginScrollView(_scrollPosition);
 
             EditorGUILayout.LabelField("Sprite Sources", EditorStyles.boldLabel);
             EditorGUILayout.PropertyField(_spritesProp, new GUIContent("Specific Sprites"), true);
-
             EditorGUILayout.Space();
-
             EditorGUILayout.LabelField("Directory Sources", EditorStyles.boldLabel);
-            EditorGUILayout.PropertyField(
+            PersistentDirectoryGUI.PathSelectorObjectArray(
                 _directoriesProp,
-                new GUIContent("Scan Directories"),
-                true
+                nameof(SpriteSettingsApplierWindow)
             );
-            if (GUILayout.Button("Add Directory via Browser"))
-            {
-                AddDirectory();
-            }
-
             EditorGUILayout.Space();
             EditorGUILayout.LabelField("Settings", EditorStyles.boldLabel);
             EditorGUILayout.PropertyField(
@@ -332,7 +323,6 @@ namespace WallstopStudios.UnityHelpers.Editor
                 new GUIContent("Sprite Settings Profiles"),
                 true
             );
-
             EditorGUILayout.Space();
             EditorGUILayout.LabelField("Actions", EditorStyles.boldLabel);
 
@@ -363,67 +353,10 @@ namespace WallstopStudios.UnityHelpers.Editor
             _serializedObject.ApplyModifiedProperties();
         }
 
-        private void AddDirectory()
-        {
-            string path = EditorUtility.OpenFolderPanel("Select Directory", "Assets", "");
-            if (string.IsNullOrWhiteSpace(path))
-            {
-                return;
-            }
-
-            if (path.StartsWith(Application.dataPath, StringComparison.Ordinal))
-            {
-                string relativePath = "Assets" + path.Substring(Application.dataPath.Length);
-                Object folderAsset = AssetDatabase.LoadAssetAtPath<Object>(relativePath);
-                if (folderAsset != null)
-                {
-                    _directoriesProp.serializedObject.Update();
-                    bool alreadyExists = false;
-                    for (int i = 0; i < _directoriesProp.arraySize; i++)
-                    {
-                        if (
-                            _directoriesProp.GetArrayElementAtIndex(i).objectReferenceValue
-                            == folderAsset
-                        )
-                        {
-                            alreadyExists = true;
-                            break;
-                        }
-                    }
-
-                    if (!alreadyExists)
-                    {
-                        int newIndex = _directoriesProp.arraySize;
-                        _directoriesProp.InsertArrayElementAtIndex(newIndex);
-                        _directoriesProp.GetArrayElementAtIndex(newIndex).objectReferenceValue =
-                            folderAsset;
-                        this.Log($"Added directory: {relativePath}");
-                    }
-                    else
-                    {
-                        this.LogWarn($"Directory already in list: {relativePath}");
-                    }
-                    _directoriesProp.serializedObject.ApplyModifiedProperties();
-                }
-                else
-                {
-                    this.LogError(
-                        $"Could not load asset at path: {relativePath}. Is it a valid folder within Assets?"
-                    );
-                }
-            }
-            else
-            {
-                this.LogError(
-                    $"Selected folder must be inside the project's Assets folder. Path selected: {path}"
-                );
-            }
-        }
-
         private List<(string fullFilePath, string relativePath)> GetTargetSpritePaths()
         {
             HashSet<string> uniqueRelativePaths = new(StringComparer.OrdinalIgnoreCase);
-            List<Object> validDirectories = new();
+            HashSet<Object> validDirectories = new();
 
             for (int i = 0; i < _directoriesProp.arraySize; i++)
             {

package/Editor/{TextureResizerWizard.cs → Sprites/TextureResizerWizard.cs}

@@ -1,4 +1,4 @@
-namespace WallstopStudios.UnityHelpers.Editor
+namespace WallstopStudios.UnityHelpers.Editor.Sprites
 {
 #if UNITY_EDITOR
     using System;

package/Editor/{TextureSettingsApplier.cs → Sprites/TextureSettingsApplier.cs}

@@ -1,4 +1,4 @@
-namespace WallstopStudios.UnityHelpers.Editor
+namespace WallstopStudios.UnityHelpers.Editor.Sprites
 {
 #if UNITY_EDITOR
     using System;

package/Editor/Sprites.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 047a84383e254687a6110295f9a67349
+timeCreated: 1746910939

package/Editor/Utils/DxReadOnlyPropertyDrawer.cs

@@ -3,7 +3,7 @@
 #if UNITY_EDITOR
     using UnityEditor;
     using UnityEngine;
-    using WallstopStudios.UnityHelpers.Core.Attributes;
+    using Core.Attributes;
 
     // https://www.patrykgalach.com/2020/01/20/readonly-attribute-in-unity-editor/
     [CustomPropertyDrawer(typeof(DxReadOnlyAttribute))]

package/Runtime/Core/Helper/DirectoryHelper.cs

@@ -4,9 +4,73 @@
     using System.IO;
     using System.Runtime.CompilerServices;
     using UnityEngine;
+#if UNITY_EDITOR
+    using UnityEditor;
+#endif
 
     public static class DirectoryHelper
     {
+        public static void EnsureDirectoryExists(string relativeDirectoryPath)
+        {
+            if (string.IsNullOrWhiteSpace(relativeDirectoryPath))
+            {
+                return;
+            }
+
+#if UNITY_EDITOR
+            if (!relativeDirectoryPath.StartsWith("Assets/"))
+            {
+                if (relativeDirectoryPath.Equals("Assets", StringComparison.OrdinalIgnoreCase))
+                {
+                    return;
+                }
+
+                Debug.LogError(
+                    $"Attempted to create directory outside of Assets: '{relativeDirectoryPath}'"
+                );
+                throw new ArgumentException(
+                    "Cannot create directories outside the Assets folder using AssetDatabase.",
+                    nameof(relativeDirectoryPath)
+                );
+            }
+
+            if (AssetDatabase.IsValidFolder(relativeDirectoryPath))
+            {
+                return;
+            }
+
+            string parentPath = Path.GetDirectoryName(relativeDirectoryPath).SanitizePath();
+            if (
+                string.IsNullOrWhiteSpace(parentPath)
+                || parentPath.Equals("Assets", StringComparison.OrdinalIgnoreCase)
+            )
+            {
+                string folderNameToCreate = Path.GetFileName(relativeDirectoryPath);
+                if (
+                    !string.IsNullOrWhiteSpace(folderNameToCreate)
+                    && !AssetDatabase.IsValidFolder(relativeDirectoryPath)
+                )
+                {
+                    AssetDatabase.CreateFolder("Assets", folderNameToCreate);
+                }
+                return;
+            }
+
+            EnsureDirectoryExists(parentPath);
+            string currentFolderName = Path.GetFileName(relativeDirectoryPath);
+            if (
+                !string.IsNullOrWhiteSpace(currentFolderName)
+                && !AssetDatabase.IsValidFolder(relativeDirectoryPath)
+            )
+            {
+                AssetDatabase.CreateFolder(parentPath, currentFolderName);
+                Debug.Log($"Created folder: {relativeDirectoryPath}");
+            }
+#else
+            Directory.CreateDirectory(relativeDirectoryPath);
+#endif
+        }
+
         public static string GetCallerScriptDirectory([CallerFilePath] string sourceFilePath = "")
         {
             return string.IsNullOrWhiteSpace(sourceFilePath)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "com.wallstop-studios.unity-helpers",
-  "version": "2.0.0-rc73.13",
+  "version": "2.0.0-rc73.15",
   "displayName": "Unity Helpers",
   "description": "Various Unity Helper Library",
   "dependencies": {},
@@ -49,3 +49,5 @@
 
 
 
+
+