com.wallstop-studios.unity-helpers 2.0.0-rc73.1 → 2.0.0-rc73.10

package/Editor/SpriteSettingsApplier.cs

@@ -10,6 +10,7 @@ namespace WallstopStudios.UnityHelpers.Editor
     using System.Linq;
     using UnityEditor;
     using UnityEngine;
+    using Utils;
     using Object = UnityEngine.Object;
 
     [Serializable]
@@ -203,9 +204,10 @@ namespace WallstopStudios.UnityHelpers.Editor
                         valuePropHeight
                     );
 
-                    EditorGUI.indentLevel++;
-                    EditorGUI.PropertyField(valueRect, valueProp, GUIContent.none, true);
-                    EditorGUI.indentLevel--;
+                    using (new GUIIndentScope())
+                    {
+                        EditorGUI.PropertyField(valueRect, valueProp, GUIContent.none, true);
+                    }
 
                     currentRect.y += valueRect.height + EditorGUIUtility.standardVerticalSpacing;
                 }

package/Editor/Utils/GUIIndentScope.cs

@@ -0,0 +1,20 @@
+namespace WallstopStudios.UnityHelpers.Editor.Utils
+{
+#if UNITY_EDITOR
+    using System;
+    using UnityEditor;
+
+    public sealed class GUIIndentScope : IDisposable
+    {
+        public GUIIndentScope()
+        {
+            EditorGUI.indentLevel++;
+        }
+
+        public void Dispose()
+        {
+            EditorGUI.indentLevel--;
+        }
+    }
+#endif
+}

package/Editor/Utils/GUIIndentScope.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: ba7be1ee2025494c963d393c9b5e5c2f
+timeCreated: 1746811930

package/Runtime/Core/DataStructure/Circle.cs

@@ -34,7 +34,7 @@
             float yN = Math.Max(center.y, rectangle.y);
             float dX = xN - center.x;
             float dY = yN - center.y;
-            return (dX * dX + dY * dY) <= _radiusSquared;
+            return dX * dX + dY * dY <= _radiusSquared;
         }
 
         public bool Overlaps(Bounds bounds)

package/Runtime/Core/DataStructure/QuadTree.cs

@@ -45,7 +45,7 @@
 
                 Bounds[] quadrants =
                 {
-                    new Bounds(
+                    new(
                         new Vector3(
                             boundary.center.x - halfQuadrantSize.x,
                             boundary.center.y + halfQuadrantSize.y,
@@ -53,7 +53,7 @@
                         ),
                         quadrantSize
                     ),
-                    new Bounds(
+                    new(
                         new Vector3(
                             boundary.center.x + halfQuadrantSize.x,
                             boundary.center.y + halfQuadrantSize.y,
@@ -61,7 +61,7 @@
                         ),
                         quadrantSize
                     ),
-                    new Bounds(
+                    new(
                         new Vector3(
                             boundary.center.x + halfQuadrantSize.x,
                             boundary.center.y - halfQuadrantSize.y,
@@ -69,7 +69,7 @@
                         ),
                         quadrantSize
                     ),
-                    new Bounds(
+                    new(
                         new Vector3(
                             boundary.center.x - halfQuadrantSize.x,
                             boundary.center.y - halfQuadrantSize.y,

package/Runtime/Core/Extension/ColorExtensions.cs

@@ -534,14 +534,14 @@
                 rgb.b > 0.04045 ? Mathf.Pow((rgb.b + 0.055f) / 1.055f, 2.4f) : rgb.b / 12.92f;
 
             double x = (r * 0.4124 + g * 0.3576 + b * 0.1805) / 0.95047;
-            double y = (r * 0.2126 + g * 0.7152 + b * 0.0722);
+            double y = r * 0.2126 + g * 0.7152 + b * 0.0722;
             double z = (r * 0.0193 + g * 0.1192 + b * 0.9505) / 1.08883;
 
-            x = x > 0.008856 ? Mathf.Pow((float)x, 1f / 3f) : (7.787 * x) + 16f / 116f;
-            y = y > 0.008856 ? Mathf.Pow((float)y, 1f / 3f) : (7.787 * y) + 16f / 116f;
-            z = z > 0.008856 ? Mathf.Pow((float)z, 1f / 3f) : (7.787 * z) + 16f / 116f;
+            x = x > 0.008856 ? Mathf.Pow((float)x, 1f / 3f) : 7.787 * x + 16f / 116f;
+            y = y > 0.008856 ? Mathf.Pow((float)y, 1f / 3f) : 7.787 * y + 16f / 116f;
+            z = z > 0.008856 ? Mathf.Pow((float)z, 1f / 3f) : 7.787 * z + 16f / 116f;
 
-            return new LABColor((116 * y) - 16, 500 * (x - y), 200 * (y - z));
+            return new LABColor(116 * y - 16, 500 * (x - y), 200 * (y - z));
         }
 
         private static Color LABToRGB(double l, double a, double b)

package/Runtime/Core/Extension/IEnumerableExtensions.cs

@@ -78,7 +78,7 @@
 
         public static IEnumerable<IEnumerable<T>> Partition<T>(this IEnumerable<T> items, int size)
         {
-            using var enumerator = items.GetEnumerator();
+            using IEnumerator<T> enumerator = items.GetEnumerator();
             bool hasNext = enumerator.MoveNext();
 
             IEnumerable<T> NextPartitionOf()

package/Runtime/Core/Extension/UnityExtensions.cs

@@ -126,9 +126,9 @@
                 xMin,
                 yMin,
                 zMin,
-                (xMax - xMin) + 1,
-                (yMax - yMin) + 1,
-                (zMax - zMin) + 1
+                xMax - xMin + 1,
+                yMax - yMin + 1,
+                zMax - zMin + 1
             );
         }
 
@@ -160,9 +160,9 @@
                 xMin,
                 yMin,
                 zMin,
-                (xMax - xMin) + 1,
-                (yMax - yMin) + 1,
-                (zMax - zMin) + 1
+                xMax - xMin + 1,
+                yMax - yMin + 1,
+                zMax - zMin + 1
             );
         }
 
@@ -584,8 +584,8 @@
             public float LargestAngle(FastVector3Int point)
             {
                 Vector2 worldPoint = _grid.CellToWorld(point);
-                float angleFrom = Vector2.Angle((toWorld - fromWorld), (worldPoint - fromWorld));
-                float angleTo = Vector2.Angle((fromWorld - toWorld), (worldPoint - toWorld));
+                float angleFrom = Vector2.Angle(toWorld - fromWorld, worldPoint - fromWorld);
+                float angleTo = Vector2.Angle(fromWorld - toWorld, worldPoint - toWorld);
                 return Math.Max(angleFrom, angleTo);
             }
         }
@@ -1126,7 +1126,7 @@
                 }
 
                 if (
-                    (newVector.x < position.x) == (position.x <= oldVector.x)
+                    newVector.x < position.x == position.x <= oldVector.x
                     && (position.y - (long)lhs.y) * (rhs.x - lhs.x)
                         < (rhs.y - (long)lhs.y) * (position.x - lhs.x)
                 )
@@ -1274,7 +1274,7 @@
                     yield break;
                 }
 
-                scaleFactor *= (4 / 3f);
+                scaleFactor *= 4 / 3f;
             }
         }
 
@@ -1416,8 +1416,8 @@
             float ty = v.y;
 
             Vector2 rotatedVector;
-            rotatedVector.x = (cos * tx) - (sin * ty);
-            rotatedVector.y = (sin * tx) + (cos * ty);
+            rotatedVector.x = cos * tx - sin * ty;
+            rotatedVector.y = sin * tx + cos * ty;
 
             return rotatedVector;
         }
@@ -1564,12 +1564,12 @@
 
         public static bool IsOnEdge2D(this FastVector3Int position, BoundsInt bounds)
         {
-            if (bounds.xMin == position.x || (bounds.xMax - 1) == position.x)
+            if (bounds.xMin == position.x || bounds.xMax - 1 == position.x)
             {
                 return bounds.yMin <= position.y && position.y < bounds.yMax;
             }
 
-            if (bounds.yMin == position.y || (bounds.yMax - 1) == position.y)
+            if (bounds.yMin == position.y || bounds.yMax - 1 == position.y)
             {
                 return bounds.xMin <= position.x && position.x < bounds.xMax;
             }

package/Runtime/Core/Helper/Helpers.cs

@@ -47,9 +47,9 @@
             }
 
             float a =
-                (targetVelocity.x * targetVelocity.x)
-                + (targetVelocity.y * targetVelocity.y)
-                - (projectileSpeed * projectileSpeed);
+                targetVelocity.x * targetVelocity.x
+                + targetVelocity.y * targetVelocity.y
+                - projectileSpeed * projectileSpeed;
 
             float b =
                 2
@@ -59,10 +59,10 @@
                 );
 
             float c =
-                ((target.x - launchLocation.x) * (target.x - launchLocation.x))
-                + ((target.y - launchLocation.y) * (target.y - launchLocation.y));
+                (target.x - launchLocation.x) * (target.x - launchLocation.x)
+                + (target.y - launchLocation.y) * (target.y - launchLocation.y);
 
-            float disc = b * b - (4 * a * c);
+            float disc = b * b - 4 * a * c;
             if (disc < 0)
             {
                 return target;
@@ -72,8 +72,8 @@
             float t2 = (-1 * b - Mathf.Sqrt(disc)) / (2 * a);
             float t = Mathf.Max(t1, t2); // let us take the larger time value
 
-            float aimX = target.x + (targetVelocity.x * t);
-            float aimY = target.y + (targetVelocity.y * t);
+            float aimX = target.x + targetVelocity.x * t;
+            float aimY = target.y + targetVelocity.y * t;
 
             if (float.IsNaN(aimX) || float.IsNaN(aimY))
             {
@@ -283,7 +283,7 @@
                 // optional delay execution from happening on 0, 1, 2, ... n-1 to 1, 2, ... n
                 if (
                     totalExecuted < totalCount
-                    && ((totalExecuted + (delay ? 1f : 0f)) / totalCount) <= percent
+                    && (totalExecuted + (delay ? 1f : 0f)) / totalCount <= percent
                 )
                 {
                     action();

package/Runtime/Core/Helper/Logging/UnityLogTagFormatter.cs

@@ -137,11 +137,9 @@
             const string sizeCheck = "size=";
             AddDecoration(
                 format =>
-                    (
-                        format.StartsWith(sizeCheck, StringComparison.OrdinalIgnoreCase)
-                            && int.TryParse(format.Substring(sizeCheck.Length), out _)
-                        || int.TryParse(format, out _)
-                    ),
+                    format.StartsWith(sizeCheck, StringComparison.OrdinalIgnoreCase)
+                        && int.TryParse(format.Substring(sizeCheck.Length), out _)
+                    || int.TryParse(format, out _),
                 format: (format, value) =>
                 {
                     if (!int.TryParse(format, out int size))
@@ -373,11 +371,26 @@
         )
         {
             bool stopLooping = false;
-            foreach (var entry in _matchingDecorations)
+            foreach (
+                KeyValuePair<
+                    int,
+                    List<(
+                        string tag,
+                        bool editorOnly,
+                        Func<string, bool> predicate,
+                        Func<string, object, string> formatter
+                    )>
+                > entry in _matchingDecorations
+            )
             {
                 for (int i = 0; i < entry.Value.Count; i++)
                 {
-                    var existingDecoration = entry.Value[i];
+                    (
+                        string tag,
+                        bool editorOnly,
+                        Func<string, bool> predicate,
+                        Func<string, object, string> formatter
+                    ) existingDecoration = entry.Value[i];
                     if (
                         !string.Equals(
                             existingDecoration.tag,
@@ -459,7 +472,17 @@
             ) decoration
         )
         {
-            foreach (var entry in _matchingDecorations)
+            foreach (
+                KeyValuePair<
+                    int,
+                    List<(
+                        string tag,
+                        bool editorOnly,
+                        Func<string, bool> predicate,
+                        Func<string, object, string> formatter
+                    )>
+                > entry in _matchingDecorations
+            )
             {
                 for (int i = 0; i < entry.Value.Count; ++i)
                 {

package/Runtime/Core/Helper/Partials/ObjectHelpers.cs

@@ -156,7 +156,7 @@
                 }
             }
 
-            Transform transform = (component as Transform) ?? component.transform;
+            Transform transform = component as Transform ?? component.transform;
             if (transform == null)
             {
                 return;
@@ -187,7 +187,7 @@
                 behavior.enabled = enabled;
             }
 
-            Transform transform = (component as Transform) ?? component.transform;
+            Transform transform = component as Transform ?? component.transform;
             if (transform == null)
             {
                 return;

package/Runtime/Core/Helper/PathHelper.cs

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

package/Runtime/Core/Helper/PathHelper.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 8505d4ced07d414aaf2c677ce5283997
+timeCreated: 1746657053

package/Runtime/Core/Random/DotNetRandom.cs

@@ -11,7 +11,7 @@
         public static DotNetRandom Instance => ThreadLocalRandom<DotNetRandom>.Instance;
 
         public override RandomState InternalState =>
-            new RandomState(unchecked((ulong)_seed), state2: _numberGenerated);
+            new(unchecked((ulong)_seed), state2: _numberGenerated);
 
         private ulong _numberGenerated;
         private int _seed;

package/Runtime/Core/Random/SplitMix64.cs

@@ -45,7 +45,7 @@
                 ulong z = _state;
                 z = (z ^ (z >> 30)) * 0xBF58476D1CE4E5B9UL;
                 z = (z ^ (z >> 27)) * 0x94D049BB133111EBUL;
-                z ^= (z >> 31);
+                z ^= z >> 31;
 
                 return (uint)z;
             }

package/Runtime/Core/Random/SquirrelRandom.cs

@@ -54,11 +54,11 @@
         private static uint NextUintInternal(ref uint seed)
         {
             seed *= BitNoise1;
-            seed ^= (seed >> 8);
+            seed ^= seed >> 8;
             seed += BitNoise2;
-            seed ^= (seed << 8);
+            seed ^= seed << 8;
             seed *= BitNoise3;
-            seed ^= (seed >> 8);
+            seed ^= seed >> 8;
             return seed;
         }
 
@@ -68,17 +68,17 @@
             uint result = unchecked((uint)x);
             result *= BitNoise1;
             result += seed;
-            result ^= (result >> 8);
+            result ^= result >> 8;
             result += BitNoise2;
-            result ^= (result << 8);
+            result ^= result << 8;
             result *= BitNoise3;
-            result ^= (result >> 8);
+            result ^= result >> 8;
             return (result >> 8) * MagicFloat;
         }
 
         private static float NextNoise(int x, int y, uint seed)
         {
-            return NextNoise(x + (LargePrime * y), seed);
+            return NextNoise(x + LargePrime * y, seed);
         }
     }
 }

package/Runtime/Core/Random/ThreadLocalRandom.cs

@@ -5,7 +5,7 @@
     public static class ThreadLocalRandom<T>
         where T : IRandom, new()
     {
-        private static readonly ThreadLocal<T> RandomCache = new ThreadLocal<T>(() => new T());
+        private static readonly ThreadLocal<T> RandomCache = new(() => new T());
 
         public static T Instance => RandomCache.Value;
     }

package/Runtime/Core/Random/WyRandom.cs

@@ -16,7 +16,7 @@
 
         public static WyRandom Instance => ThreadLocalRandom<WyRandom>.Instance;
 
-        public override RandomState InternalState => new RandomState(_state);
+        public override RandomState InternalState => new(_state);
 
         private ulong _state;
 

package/Runtime/Tags/AttributeEffect.cs

@@ -8,6 +8,7 @@
     using System.Text.Json.Serialization;
     using Core.Extension;
     using Core.Helper;
+    using UnityEngine;
 #if ODIN_INSPECTOR
     using Sirenix.OdinInspector;
 #endif

package/Runtime/Tags/EffectHandler.cs

@@ -297,7 +297,7 @@
                     if (cosmeticEffectData.RequiresInstancing)
                     {
                         this.LogWarn(
-                            $"Double-deregistration detected for handle {handle:json}. Existing handles: [{(string.Join(",", _instancedCosmeticEffects.Keys))}]."
+                            $"Double-deregistration detected for handle {handle:json}. Existing handles: [{string.Join(",", _instancedCosmeticEffects.Keys)}]."
                         );
                         continue;
                     }