com.wallstop-studios.unity-helpers 2.1.0 → 2.1.2

package/Tests/Editor/Sprites/ScriptableSpriteAtlasEditorTests.cs

@@ -6,6 +6,7 @@ namespace WallstopStudios.UnityHelpers.Tests.Editor.Sprites
     using UnityEditor;
     using UnityEngine;
     using UnityEngine.U2D;
+    using WallstopStudios.UnityHelpers.Core.Helper;
     using WallstopStudios.UnityHelpers.Editor.Sprites;
     using WallstopStudios.UnityHelpers.Tests.Editor.Utils;
 
@@ -31,7 +32,7 @@ namespace WallstopStudios.UnityHelpers.Tests.Editor.Sprites
         public void GeneratesSpriteAtlasAssetFromConfig()
         {
             // Create a source sprite
-            string spritePath = Path.Combine(Root, "icon.png").Replace('\\', '/');
+            string spritePath = Path.Combine(Root, "icon.png").SanitizePath();
             CreatePng(spritePath, 8, 8, Color.red);
             AssetDatabase.Refresh();
 
@@ -41,7 +42,7 @@ namespace WallstopStudios.UnityHelpers.Tests.Editor.Sprites
             config.spritesToPack.Add(AssetDatabase.LoadAssetAtPath<Sprite>(spritePath));
             config.outputSpriteAtlasDirectory = Root;
             config.outputSpriteAtlasName = "TestAtlas";
-            string configPath = Path.Combine(Root, "TestAtlasConfig.asset").Replace('\\', '/');
+            string configPath = Path.Combine(Root, "TestAtlasConfig.asset").SanitizePath();
             AssetDatabase.CreateAsset(config, configPath);
             AssetDatabase.SaveAssets();
             AssetDatabase.Refresh();
@@ -55,7 +56,7 @@ namespace WallstopStudios.UnityHelpers.Tests.Editor.Sprites
 
             AssetDatabase.Refresh();
 
-            string atlasPath = Path.Combine(Root, "TestAtlas.spriteatlas").Replace('\\', '/');
+            string atlasPath = Path.Combine(Root, "TestAtlas.spriteatlas").SanitizePath();
             SpriteAtlas atlas = AssetDatabase.LoadAssetAtPath<SpriteAtlas>(atlasPath);
             Assert.IsTrue(atlas != null, ".spriteatlas should be generated");
         }
@@ -77,7 +78,7 @@ namespace WallstopStudios.UnityHelpers.Tests.Editor.Sprites
 
         private static void CreatePng(string relPath, int w, int h, Color c)
         {
-            string dir = Path.GetDirectoryName(relPath).Replace('\\', '/');
+            string dir = Path.GetDirectoryName(relPath)?.SanitizePath();
             EnsureFolder(dir);
             Texture2D t = new(w, h, TextureFormat.RGBA32, false);
             Color[] pix = new Color[w * h];
@@ -101,7 +102,7 @@ namespace WallstopStudios.UnityHelpers.Tests.Editor.Sprites
                     ),
                     rel
                 )
-                .Replace('\\', '/');
+                .SanitizePath();
         }
     }
 #endif

package/Tests/Editor/Sprites/SpriteCropperAdditionalTests.cs

@@ -5,6 +5,7 @@ namespace WallstopStudios.UnityHelpers.Tests.Editor.Sprites
     using NUnit.Framework;
     using UnityEditor;
     using UnityEngine;
+    using WallstopStudios.UnityHelpers.Core.Helper;
     using WallstopStudios.UnityHelpers.Editor.Sprites;
     using WallstopStudios.UnityHelpers.Tests.Editor.Utils;
     using Object = UnityEngine.Object;
@@ -30,7 +31,7 @@ namespace WallstopStudios.UnityHelpers.Tests.Editor.Sprites
         [Test]
         public void AppliesPaddingAndAdjustsPivotCorrectly()
         {
-            string src = (Root + "/pad_src.png").Replace('\\', '/');
+            string src = (Root + "/pad_src.png").SanitizePath();
             // 20x20, opaque 10x10 at (5,5)
             CreatePngWithOpaqueRect(src, 20, 20, 5, 5, 10, 10, Color.white);
             AssetDatabase.Refresh();

package/Tests/Editor/Sprites/SpriteCropperTests.cs

@@ -5,6 +5,7 @@ namespace WallstopStudios.UnityHelpers.Tests.Editor.Sprites
     using NUnit.Framework;
     using UnityEditor;
     using UnityEngine;
+    using WallstopStudios.UnityHelpers.Core.Helper;
     using WallstopStudios.UnityHelpers.Editor.Sprites;
     using WallstopStudios.UnityHelpers.Tests.Editor.Utils;
 
@@ -29,7 +30,7 @@ namespace WallstopStudios.UnityHelpers.Tests.Editor.Sprites
         [Test]
         public void CropsTransparentMarginsAndPreservesPivot()
         {
-            string src = Path.Combine(Root, "src.png").Replace('\\', '/');
+            string src = Path.Combine(Root, "src.png").SanitizePath();
             // 16x16 with an opaque 10x10 square starting at (3,3)
             CreatePngWithOpaqueRect(src, 16, 16, 3, 3, 10, 10, Color.white);
             AssetDatabase.Refresh();
@@ -72,8 +73,8 @@ namespace WallstopStudios.UnityHelpers.Tests.Editor.Sprites
         [Test]
         public void WritesToOutputDirectoryWhenNotOverwriting()
         {
-            string src = Path.Combine(Root, "src2.png").Replace('\\', '/');
-            string outDir = Path.Combine(Root, "Out").Replace('\\', '/');
+            string src = Path.Combine(Root, "src2.png").SanitizePath();
+            string outDir = Path.Combine(Root, "Out").SanitizePath();
             EnsureFolder(outDir);
             CreatePngWithOpaqueRect(src, 8, 8, 2, 2, 4, 4, Color.green);
             AssetDatabase.Refresh();
@@ -96,7 +97,7 @@ namespace WallstopStudios.UnityHelpers.Tests.Editor.Sprites
 
             AssetDatabase.Refresh();
 
-            string dst = Path.Combine(outDir, "Cropped_src2.png").Replace('\\', '/');
+            string dst = Path.Combine(outDir, "Cropped_src2.png").SanitizePath();
             Assert.That(File.Exists(RelToFull(dst)), Is.True, "Cropped output should exist");
 
             Texture2D tex = AssetDatabase.LoadAssetAtPath<Texture2D>(dst);
@@ -116,7 +117,7 @@ namespace WallstopStudios.UnityHelpers.Tests.Editor.Sprites
             Color color
         )
         {
-            string dir = Path.GetDirectoryName(relPath).Replace('\\', '/');
+            string dir = Path.GetDirectoryName(relPath)?.SanitizePath();
             EnsureFolder(dir);
             Texture2D t = new(w, h, TextureFormat.RGBA32, false) { alphaIsTransparency = true };
             Color[] pix = new Color[w * h];
@@ -155,7 +156,7 @@ namespace WallstopStudios.UnityHelpers.Tests.Editor.Sprites
                     ),
                     rel
                 )
-                .Replace('\\', '/');
+                .SanitizePath();
         }
     }
 #endif

package/Tests/Editor/Sprites/SpritePivotAdjusterAdditionalTests.cs

@@ -5,6 +5,7 @@ namespace WallstopStudios.UnityHelpers.Tests.Editor.Sprites
     using NUnit.Framework;
     using UnityEditor;
     using UnityEngine;
+    using WallstopStudios.UnityHelpers.Core.Helper;
     using WallstopStudios.UnityHelpers.Editor.Sprites;
     using WallstopStudios.UnityHelpers.Tests.Editor.Utils;
     using Object = UnityEngine.Object;
@@ -32,7 +33,7 @@ namespace WallstopStudios.UnityHelpers.Tests.Editor.Sprites
         [Test]
         public void RespectsAlphaCutoffWhenComputingPivot()
         {
-            string src = (Root + "/alpha_bias.png").Replace('\\', '/');
+            string src = (Root + "/alpha_bias.png").SanitizePath();
             // 20x20 with a faint (alpha=0.2) 4x4 block at bottom-left and a solid 4x4 at top-right
             CreateDualAlphaPattern(src, 20, 20);
             AssetDatabase.Refresh();

package/Tests/Editor/Sprites/SpritePivotAdjusterTests.cs

@@ -5,6 +5,7 @@ namespace WallstopStudios.UnityHelpers.Tests.Editor.Sprites
     using NUnit.Framework;
     using UnityEditor;
     using UnityEngine;
+    using WallstopStudios.UnityHelpers.Core.Helper;
     using WallstopStudios.UnityHelpers.Editor.Sprites;
     using WallstopStudios.UnityHelpers.Tests.Editor.Utils;
 
@@ -29,7 +30,7 @@ namespace WallstopStudios.UnityHelpers.Tests.Editor.Sprites
         [Test]
         public void AdjustsPivotToAlphaWeightedCenter()
         {
-            string path = Path.Combine(Root, "pivot.png").Replace('\\', '/');
+            string path = Path.Combine(Root, "pivot.png").SanitizePath();
             // 10x10 image, opaque L-shape to bias center toward bottom-left
             CreateAsymmetricAlpha(path, 10, 10);
             AssetDatabase.Refresh();
@@ -66,7 +67,7 @@ namespace WallstopStudios.UnityHelpers.Tests.Editor.Sprites
 
         private static void CreateAsymmetricAlpha(string relPath, int w, int h)
         {
-            string dir = Path.GetDirectoryName(relPath).Replace('\\', '/');
+            string dir = Path.GetDirectoryName(relPath).SanitizePath();
             EnsureFolder(dir);
             Texture2D t = new(w, h, TextureFormat.RGBA32, false) { alphaIsTransparency = true };
             Color[] pix = new Color[w * h];
@@ -106,7 +107,7 @@ namespace WallstopStudios.UnityHelpers.Tests.Editor.Sprites
                     ),
                     rel
                 )
-                .Replace('\\', '/');
+                .SanitizePath();
         }
     }
 #endif

package/Tests/Editor/Sprites/TextureResizerWizardTests.cs

@@ -5,6 +5,7 @@ namespace WallstopStudios.UnityHelpers.Tests.Editor.Sprites
     using NUnit.Framework;
     using UnityEditor;
     using UnityEngine;
+    using WallstopStudios.UnityHelpers.Core.Helper;
     using WallstopStudios.UnityHelpers.Editor.Sprites;
     using WallstopStudios.UnityHelpers.Tests.Editor.Utils;
 
@@ -31,7 +32,7 @@ namespace WallstopStudios.UnityHelpers.Tests.Editor.Sprites
         [Test]
         public void ResizesTextureAccordingToMultipliers()
         {
-            string path = Path.Combine(Root, "tex.png").Replace('\\', '/');
+            string path = Path.Combine(Root, "tex.png").SanitizePath();
             CreatePng(path, 16, 10, Color.green);
             AssetDatabase.Refresh();
 
@@ -59,7 +60,7 @@ namespace WallstopStudios.UnityHelpers.Tests.Editor.Sprites
         [Test]
         public void DoesNothingWhenNumResizesIsZero()
         {
-            string path = Path.Combine(Root, "nochange.png").Replace('\\', '/');
+            string path = Path.Combine(Root, "nochange.png").SanitizePath();
             CreatePng(path, 12, 7, Color.blue);
             AssetDatabase.Refresh();
             int w0 = AssetDatabase.LoadAssetAtPath<Texture2D>(path).width;
@@ -80,7 +81,7 @@ namespace WallstopStudios.UnityHelpers.Tests.Editor.Sprites
         [Test]
         public void RespectsDryRunAndDoesNotModifyFile()
         {
-            string path = Path.Combine(Root, "dry.png").Replace('\\', '/');
+            string path = Path.Combine(Root, "dry.png").SanitizePath();
             CreatePng(path, 10, 6, Color.white);
             AssetDatabase.Refresh();
 
@@ -108,7 +109,7 @@ namespace WallstopStudios.UnityHelpers.Tests.Editor.Sprites
         [Test]
         public void WritesToOutputFolderLeavingOriginalUnchanged()
         {
-            string path = Path.Combine(Root, "out.png").Replace('\\', '/');
+            string path = Path.Combine(Root, "out.png").SanitizePath();
             CreatePng(path, 8, 4, Color.black);
             AssetDatabase.Refresh();
 
@@ -134,7 +135,7 @@ namespace WallstopStudios.UnityHelpers.Tests.Editor.Sprites
             Assert.That(orig.width, Is.EqualTo(8));
             Assert.That(orig.height, Is.EqualTo(4));
 
-            string outPath = Path.Combine(OutRoot, "out.png").Replace('\\', '/');
+            string outPath = Path.Combine(OutRoot, "out.png").SanitizePath();
             Texture2D outTex = AssetDatabase.LoadAssetAtPath<Texture2D>(outPath);
             Assert.IsTrue(outTex != null, "Expected resized texture in output folder");
             Assert.That(outTex.width, Is.EqualTo(16));
@@ -144,7 +145,7 @@ namespace WallstopStudios.UnityHelpers.Tests.Editor.Sprites
         [Test]
         public void MultiplePassesAccumulateSize()
         {
-            string path = Path.Combine(Root, "multi.png").Replace('\\', '/');
+            string path = Path.Combine(Root, "multi.png").SanitizePath();
             CreatePng(path, 16, 10, Color.gray);
             AssetDatabase.Refresh();
 
@@ -171,7 +172,7 @@ namespace WallstopStudios.UnityHelpers.Tests.Editor.Sprites
         [Test]
         public void RestoresImporterReadabilityAfterRun()
         {
-            string path = Path.Combine(Root, "restore.png").Replace('\\', '/');
+            string path = Path.Combine(Root, "restore.png").SanitizePath();
             CreatePng(path, 8, 8, Color.red);
             AssetDatabase.Refresh();
 
@@ -217,7 +218,7 @@ namespace WallstopStudios.UnityHelpers.Tests.Editor.Sprites
 
         private static void CreatePng(string relPath, int w, int h, Color c)
         {
-            string dir = Path.GetDirectoryName(relPath).Replace('\\', '/');
+            string dir = Path.GetDirectoryName(relPath).SanitizePath();
             EnsureFolder(dir);
             Texture2D t = new(w, h, TextureFormat.RGBA32, false);
             Color[] pix = new Color[w * h];
@@ -241,7 +242,7 @@ namespace WallstopStudios.UnityHelpers.Tests.Editor.Sprites
                     ),
                     rel
                 )
-                .Replace('\\', '/');
+                .SanitizePath();
         }
     }
 #endif

package/Tests/Editor/Sprites/TextureSettingsApplierAPITests.cs

@@ -5,6 +5,7 @@ namespace WallstopStudios.UnityHelpers.Tests.Editor.Sprites
     using NUnit.Framework;
     using UnityEditor;
     using UnityEngine;
+    using WallstopStudios.UnityHelpers.Core.Helper;
     using WallstopStudios.UnityHelpers.Editor.Sprites;
     using WallstopStudios.UnityHelpers.Tests.Editor.Utils;
 
@@ -32,7 +33,7 @@ namespace WallstopStudios.UnityHelpers.Tests.Editor.Sprites
         [Test]
         public void AppliesDefaultPlatformSettingsViaAPI()
         {
-            string texPath = (Root + "/api_tex.png").Replace('\\', '/');
+            string texPath = (Root + "/api_tex.png").SanitizePath();
             CreatePng(texPath, 16, 16, Color.white);
             AssetDatabase.Refresh();
 

package/Tests/Editor/Tags/AttributeMetadataCacheTests.cs

@@ -0,0 +1,192 @@
+namespace WallstopStudios.UnityHelpers.Tests.Editor.Tags
+{
+    using System;
+    using System.Reflection;
+    using NUnit.Framework;
+    using UnityEngine;
+    using UnityHelpers.Tags;
+
+    [TestFixture]
+    public sealed class AttributeMetadataCacheTests
+    {
+        [Test]
+        public void SetMetadataSortsSerializedContent()
+        {
+            AttributeMetadataCache cache =
+                ScriptableObject.CreateInstance<AttributeMetadataCache>();
+
+            try
+            {
+                string[] attributeNames = new string[] { "Gamma", "Alpha", "Beta" };
+
+                string alphaAttributesTypeName =
+                    typeof(AlphaAttributesComponent).AssemblyQualifiedName ?? string.Empty;
+                string bravoAttributesTypeName =
+                    typeof(BravoAttributesComponent).AssemblyQualifiedName ?? string.Empty;
+
+                AttributeMetadataCache.TypeFieldMetadata alphaTypeMetadata = new(
+                    alphaAttributesTypeName,
+                    new string[] { "gammaField", "betaField" }
+                );
+
+                AttributeMetadataCache.TypeFieldMetadata bravoTypeMetadata = new(
+                    bravoAttributesTypeName,
+                    new string[] { "zetaField", "alphaField" }
+                );
+
+                string alphaRelationalTypeName =
+                    typeof(AlphaRelationalComponent).AssemblyQualifiedName ?? string.Empty;
+                string bravoRelationalTypeName =
+                    typeof(BravoRelationalComponent).AssemblyQualifiedName ?? string.Empty;
+
+                AttributeMetadataCache.RelationalFieldMetadata[] alphaRelationalFields =
+                    new AttributeMetadataCache.RelationalFieldMetadata[]
+                    {
+                        new(
+                            "betaRelation",
+                            AttributeMetadataCache.RelationalAttributeKind.Parent,
+                            AttributeMetadataCache.FieldKind.HashSet,
+                            typeof(Light).AssemblyQualifiedName ?? string.Empty,
+                            true
+                        ),
+                        new(
+                            "alphaRelation",
+                            AttributeMetadataCache.RelationalAttributeKind.Child,
+                            AttributeMetadataCache.FieldKind.Single,
+                            typeof(Transform).AssemblyQualifiedName ?? string.Empty,
+                            false
+                        ),
+                    };
+
+                AttributeMetadataCache.RelationalFieldMetadata[] bravoRelationalFields =
+                    new AttributeMetadataCache.RelationalFieldMetadata[]
+                    {
+                        new(
+                            "zetaRelation",
+                            AttributeMetadataCache.RelationalAttributeKind.Sibling,
+                            AttributeMetadataCache.FieldKind.List,
+                            typeof(Camera).AssemblyQualifiedName ?? string.Empty,
+                            true
+                        ),
+                        new(
+                            "alphaRelation",
+                            AttributeMetadataCache.RelationalAttributeKind.Child,
+                            AttributeMetadataCache.FieldKind.Single,
+                            typeof(Transform).AssemblyQualifiedName ?? string.Empty,
+                            false
+                        ),
+                    };
+
+                AttributeMetadataCache.RelationalTypeMetadata[] relationalMetadata =
+                    new AttributeMetadataCache.RelationalTypeMetadata[]
+                    {
+                        new(
+                            bravoRelationalTypeName,
+                            new AttributeMetadataCache.RelationalFieldMetadata[]
+                            {
+                                bravoRelationalFields[0],
+                                null,
+                                bravoRelationalFields[1],
+                            }
+                        ),
+                        null,
+                        new(alphaRelationalTypeName, alphaRelationalFields),
+                    };
+
+                AttributeMetadataCache.TypeFieldMetadata[] typeMetadata =
+                    new AttributeMetadataCache.TypeFieldMetadata[]
+                    {
+                        bravoTypeMetadata,
+                        null,
+                        alphaTypeMetadata,
+                    };
+
+                cache.SetMetadata(attributeNames, typeMetadata, relationalMetadata);
+
+                string[] storedAttributeNames = GetPrivateField<string[]>(
+                    cache,
+                    "_allAttributeNames"
+                );
+                Assert.That(
+                    storedAttributeNames,
+                    Is.EqualTo(new string[] { "Alpha", "Beta", "Gamma" })
+                );
+
+                AttributeMetadataCache.TypeFieldMetadata[] storedTypeMetadata =
+                    GetPrivateField<AttributeMetadataCache.TypeFieldMetadata[]>(
+                        cache,
+                        "_typeMetadata"
+                    );
+                Assert.That(storedTypeMetadata.Length, Is.EqualTo(2));
+                Assert.That(storedTypeMetadata[0].typeName, Is.EqualTo(alphaAttributesTypeName));
+                Assert.That(
+                    storedTypeMetadata[0].fieldNames,
+                    Is.EqualTo(new string[] { "betaField", "gammaField" })
+                );
+                Assert.That(storedTypeMetadata[1].typeName, Is.EqualTo(bravoAttributesTypeName));
+                Assert.That(
+                    storedTypeMetadata[1].fieldNames,
+                    Is.EqualTo(new string[] { "alphaField", "zetaField" })
+                );
+
+                AttributeMetadataCache.RelationalTypeMetadata[] storedRelationalMetadata =
+                    GetPrivateField<AttributeMetadataCache.RelationalTypeMetadata[]>(
+                        cache,
+                        "_relationalTypeMetadata"
+                    );
+                Assert.That(storedRelationalMetadata.Length, Is.EqualTo(2));
+                Assert.That(
+                    storedRelationalMetadata[0].typeName,
+                    Is.EqualTo(alphaRelationalTypeName)
+                );
+                Assert.That(storedRelationalMetadata[0].fields.Length, Is.EqualTo(2));
+                Assert.That(
+                    storedRelationalMetadata[0].fields[0].fieldName,
+                    Is.EqualTo("alphaRelation")
+                );
+                Assert.That(
+                    storedRelationalMetadata[0].fields[1].fieldName,
+                    Is.EqualTo("betaRelation")
+                );
+                Assert.That(
+                    storedRelationalMetadata[1].typeName,
+                    Is.EqualTo(bravoRelationalTypeName)
+                );
+                Assert.That(storedRelationalMetadata[1].fields.Length, Is.EqualTo(2));
+                Assert.That(
+                    storedRelationalMetadata[1].fields[0].fieldName,
+                    Is.EqualTo("alphaRelation")
+                );
+                Assert.That(
+                    storedRelationalMetadata[1].fields[1].fieldName,
+                    Is.EqualTo("zetaRelation")
+                );
+            }
+            finally
+            {
+                UnityEngine.Object.DestroyImmediate(cache);
+            }
+        }
+
+        private static T GetPrivateField<T>(AttributeMetadataCache cache, string fieldName)
+        {
+            BindingFlags bindingFlags = BindingFlags.Instance | BindingFlags.NonPublic;
+            FieldInfo field = typeof(AttributeMetadataCache).GetField(fieldName, bindingFlags);
+            if (field == null)
+            {
+                throw new InvalidOperationException($"Field '{fieldName}' was not found.");
+            }
+
+            object value = field.GetValue(cache);
+            return value is T castValue ? castValue : default;
+        }
+
+        private sealed class AlphaAttributesComponent : AttributesComponent { }
+
+        private sealed class BravoAttributesComponent : AttributesComponent { }
+
+        private sealed class AlphaRelationalComponent : MonoBehaviour { }
+
+        private sealed class BravoRelationalComponent : MonoBehaviour { }
+    }
+}

package/Tests/Editor/Tags/AttributeMetadataCacheTests.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: e6e89a6fc9964f9f92a7bb5cbb4f793d
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Tests/Editor/Tags.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 43bfcdf80a014948b5377ffa29afa8df
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: