com.wallstop-studios.unity-helpers 2.0.0-rc73.3 → 2.0.0-rc73.4

package/Editor/AnimationCopier.cs

@@ -9,6 +9,7 @@
     using UnityEditor;
     using UnityEngine;
     using Core.Extension;
+    using Core.Helper;
 
     public sealed class AnimationCopierWindow : EditorWindow
     {
@@ -58,7 +59,7 @@
             public string DestinationRelativePath { get; set; }
         }
 
-        [MenuItem("Tools/Wallstop Studios/Unity Helpers/Animation Copier Window", priority = -2)]
+        [MenuItem("Tools/Wallstop Studios/Unity Helpers/Animation Copier", priority = -2)]
         public static void ShowWindow()
         {
             GetWindow<AnimationCopierWindow>("Animation Copier");
@@ -185,7 +186,7 @@
                     if (newRelPath != null)
                     {
                         relativePath = newRelPath;
-                        fullPath = selectedPath.Replace(Path.DirectorySeparatorChar, '/');
+                        fullPath = selectedPath.SanitizePath();
                         EditorPrefs.SetString(prefKey, relativePath);
                         this.Log($"{label} set to: {relativePath}");
                         ValidatePaths();
@@ -460,7 +461,7 @@
                         FileName = Path.GetFileName(sourceRelPath),
                         RelativeDirectory = GetRelativeSubPath(
                             _animationSourcePathRelative,
-                            directoryName.Replace(Path.DirectorySeparatorChar, '/')
+                            directoryName.SanitizePath()
                         ),
                         Hash = CalculateFileHash(sourceFullPath),
                     };
@@ -469,7 +470,7 @@
                             fileInfo.RelativeDirectory,
                             fileInfo.FileName
                         )
-                        .Replace(Path.DirectorySeparatorChar, '/');
+                        .SanitizePath();
                     _sourceAnimations.Add(fileInfo);
 
                     EditorUtility.DisplayProgressBar(
@@ -615,7 +616,8 @@
 
                     string sourceAssetPath = animInfo.RelativePath;
                     string destinationAssetPath = animInfo.DestinationRelativePath;
-                    string destDirectory = Path.GetDirectoryName(destinationAssetPath);
+                    string destDirectory = Path.GetDirectoryName(destinationAssetPath)
+                        .SanitizePath();
 
                     if (
                         !string.IsNullOrEmpty(destDirectory)
@@ -784,7 +786,7 @@
                 return null;
             }
 
-            fullPath = fullPath.Replace(Path.DirectorySeparatorChar, '/');
+            fullPath = fullPath.SanitizePath();
             if (
                 fullPath.EndsWith("/Assets", StringComparison.OrdinalIgnoreCase)
                 && Path.GetFileName(fullPath).Equals("Assets", StringComparison.OrdinalIgnoreCase)
@@ -793,7 +795,7 @@
                 return "Assets";
             }
 
-            string assetsPath = Application.dataPath.Replace(Path.DirectorySeparatorChar, '/');
+            string assetsPath = Application.dataPath.SanitizePath();
             if (fullPath.StartsWith(assetsPath, StringComparison.OrdinalIgnoreCase))
             {
                 if (fullPath.Length == assetsPath.Length)
@@ -828,7 +830,7 @@
 
             if (relativePath.Equals("Assets", StringComparison.OrdinalIgnoreCase))
             {
-                return Application.dataPath.Replace(Path.DirectorySeparatorChar, '/');
+                return Application.dataPath.SanitizePath();
             }
 
             if (relativePath.StartsWith("Assets/", StringComparison.OrdinalIgnoreCase))
@@ -837,7 +839,7 @@
                     0,
                     Application.dataPath.Length - "Assets".Length
                 );
-                return (projectRoot + relativePath).Replace(Path.DirectorySeparatorChar, '/');
+                return (projectRoot + relativePath).SanitizePath();
             }
             return null;
         }
@@ -920,8 +922,7 @@
                 return;
             }
 
-            string parentPath = Path.GetDirectoryName(relativeDirectoryPath)
-                ?.Replace(Path.DirectorySeparatorChar, '/');
+            string parentPath = Path.GetDirectoryName(relativeDirectoryPath).SanitizePath();
 
             if (
                 string.IsNullOrEmpty(parentPath)

package/Runtime/Core/Helper/PathHelper.cs

@@ -1,6 +1,7 @@
 using System.Runtime.CompilerServices;
 
 [assembly: InternalsVisibleTo(assemblyName: "WallstopStudios.UnityHelpers.Styles")]
+[assembly: InternalsVisibleTo(assemblyName: "WallstopStudios.UnityHelpers.Editor")]
 
 namespace WallstopStudios.UnityHelpers.Core.Helper
 {
@@ -8,7 +9,7 @@ namespace WallstopStudios.UnityHelpers.Core.Helper
     {
         public static string SanitizePath(this string path)
         {
-            return path.Replace('\\', '/');
+            return path?.Replace('\\', '/');
         }
     }
 }

package/Styles/Elements/Progress/MarchingAntsProgressBar.cs

@@ -13,16 +13,16 @@
             Vertical = 1,
         }
 
-        public const string ussClassName = "marching-ants-progress-bar";
-        public const string ussTrackClassName = ussClassName + "__track";
-        public const string ussFillContainerClassName = ussClassName + "__fill-container";
-        public const string ussFillClassName = ussClassName + "__fill";
-        public const string ussTrackColorVarName = "--ants-track-color";
-        public const string ussProgressColorVarName = "--ants-progress-color";
-        public const string ussThicknessVarName = "--ants-thickness";
-        public const string ussBorderRadiusVarName = "--ants-border-radius";
-        public const string ussDashOnVarName = "--ants-dash-on";
-        public const string ussDashOffVarName = "--ants-dash-off";
+        public const string USSClassName = "marching-ants-progress-bar";
+        public const string USSTrackClassName = USSClassName + "__track";
+        public const string USSFillContainerClassName = USSClassName + "__fill-container";
+        public const string USSFillClassName = USSClassName + "__fill";
+        public const string USSTrackColorVarName = "--ants-track-color";
+        public const string USSProgressColorVarName = "--ants-progress-color";
+        public const string USSThicknessVarName = "--ants-thickness";
+        public const string USSBorderRadiusVarName = "--ants-border-radius";
+        public const string USSDashOnVarName = "--ants-dash-on";
+        public const string USSDashOffVarName = "--ants-dash-off";
 
         private readonly VisualElement _trackElement;
         private readonly VisualElement _fillContainer;
@@ -288,9 +288,9 @@
 
         public MarchingAntsProgressBar()
         {
-            AddToClassList(ussClassName);
+            AddToClassList(USSClassName);
             _trackElement = new VisualElement { name = "track", pickingMode = PickingMode.Ignore };
-            _trackElement.AddToClassList(ussTrackClassName);
+            _trackElement.AddToClassList(USSTrackClassName);
             _trackElement.style.position = Position.Absolute;
             _trackElement.style.left = 0;
             _trackElement.style.top = 0;
@@ -303,7 +303,7 @@
                 name = "fill-container",
                 pickingMode = PickingMode.Ignore,
             };
-            _fillContainer.AddToClassList(ussFillContainerClassName);
+            _fillContainer.AddToClassList(USSFillContainerClassName);
             _fillContainer.style.overflow = Overflow.Hidden;
             _fillContainer.style.position = Position.Absolute;
             _fillContainer.style.left = 0;
@@ -312,7 +312,7 @@
             _fillContainer.style.height = Length.Percent(100);
             Add(_fillContainer);
             _fillElement = new VisualElement { name = "fill", pickingMode = PickingMode.Ignore };
-            _fillElement.AddToClassList(ussFillClassName);
+            _fillElement.AddToClassList(USSFillClassName);
             _fillElement.style.position = Position.Absolute;
             _fillElement.style.left = 0;
             _fillElement.style.top = 0;
@@ -453,7 +453,7 @@
         {
             if (
                 customStyle.TryGetValue(
-                    new CustomStyleProperty<Color>(ussTrackColorVarName),
+                    new CustomStyleProperty<Color>(USSTrackColorVarName),
                     out Color tc
                 )
             )
@@ -463,7 +463,7 @@
 
             if (
                 customStyle.TryGetValue(
-                    new CustomStyleProperty<Color>(ussProgressColorVarName),
+                    new CustomStyleProperty<Color>(USSProgressColorVarName),
                     out Color pc
                 )
             )
@@ -473,7 +473,7 @@
 
             if (
                 customStyle.TryGetValue(
-                    new CustomStyleProperty<float>(ussThicknessVarName),
+                    new CustomStyleProperty<float>(USSThicknessVarName),
                     out float th
                 )
             )
@@ -483,7 +483,7 @@
 
             if (
                 customStyle.TryGetValue(
-                    new CustomStyleProperty<float>(ussBorderRadiusVarName),
+                    new CustomStyleProperty<float>(USSBorderRadiusVarName),
                     out float br
                 )
             )
@@ -493,7 +493,7 @@
 
             if (
                 customStyle.TryGetValue(
-                    new CustomStyleProperty<float>(ussDashOnVarName),
+                    new CustomStyleProperty<float>(USSDashOnVarName),
                     out float don
                 )
             )
@@ -503,7 +503,7 @@
 
             if (
                 customStyle.TryGetValue(
-                    new CustomStyleProperty<float>(ussDashOffVarName),
+                    new CustomStyleProperty<float>(USSDashOffVarName),
                     out float doff
                 )
             )

package/package.json

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