com.wallstop-studios.unity-helpers 2.0.0-rc16 → 2.0.0-rc18

package/Runtime/Core/Extension/RandomExtensions.cs

@@ -14,14 +14,14 @@
             return random.NextVector2(-amplitude, amplitude);
         }
 
-        public static T NextEnumExcept<T>(this IRandom random, params T[] values)
+        public static T NextEnumExcept<T>(this IRandom random, params T[] exceptions)
             where T : struct, Enum
         {
             T value;
             do
             {
                 value = random.NextEnum<T>();
-            } while (values.Contains(value));
+            } while (0 <= Array.IndexOf(exceptions, value));
 
             return value;
         }
@@ -33,10 +33,38 @@
         )
         {
             T value;
-            do
+
+            switch (values)
             {
-                value = random.NextOf(values);
-            } while (exceptions.Contains(value));
+                case IReadOnlyList<T> list:
+                {
+                    do
+                    {
+                        value = random.NextOf(list);
+                    } while (0 <= Array.IndexOf(exceptions, value));
+
+                    break;
+                }
+                case IReadOnlyCollection<T> collection:
+                {
+                    do
+                    {
+                        value = random.NextOf(collection);
+                    } while (0 <= Array.IndexOf(exceptions, value));
+
+                    break;
+                }
+                default:
+                {
+                    T[] input = values.ToArray();
+                    do
+                    {
+                        value = random.NextOf(input);
+                    } while (0 <= Array.IndexOf(exceptions, value));
+
+                    break;
+                }
+            }
 
             return value;
         }

package/Runtime/Utils/MatchColliderToSprite.cs

@@ -3,19 +3,22 @@
     using System;
     using System.Collections.Generic;
     using UnityEngine;
+    using UnityEngine.Serialization;
     using UnityEngine.UI;
 
     [DisallowMultipleComponent]
     public sealed class MatchColliderToSprite : MonoBehaviour
     {
-        [SerializeField]
-        private SpriteRenderer _spriteRenderer;
+        public Func<Sprite> spriteOverrideProducer;
 
-        [SerializeField]
-        private Image _image;
+        [FormerlySerializedAs("_spriteRenderer")]
+        public SpriteRenderer spriteRenderer;
 
-        [SerializeField]
-        private PolygonCollider2D _collider;
+        [FormerlySerializedAs("_image")]
+        public Image image;
+
+        [FormerlySerializedAs("_collider")]
+        public PolygonCollider2D polygonCollider;
 
         private Sprite _lastHandled;
 
@@ -26,12 +29,17 @@
 
         private void Update()
         {
-            if (_spriteRenderer != null && _lastHandled == _spriteRenderer.sprite)
+            if (spriteOverrideProducer != null && _lastHandled == spriteOverrideProducer())
+            {
+                return;
+            }
+
+            if (spriteRenderer != null && _lastHandled == spriteRenderer.sprite)
             {
                 return;
             }
 
-            if (_image != null && _lastHandled == _image.sprite)
+            if (image != null && _lastHandled == image.sprite)
             {
                 return;
             }
@@ -41,42 +49,46 @@
 
         public void OnValidate()
         {
+            if (polygonCollider == null && !TryGetComponent(out polygonCollider))
+            {
+                return;
+            }
+
             Sprite sprite;
-            if (_spriteRenderer != null || TryGetComponent(out _spriteRenderer))
+            if (spriteOverrideProducer != null)
             {
-                sprite = _spriteRenderer.sprite;
+                sprite = spriteOverrideProducer();
             }
-            else if (_image != null || TryGetComponent(out _image))
+            else if (spriteRenderer != null || TryGetComponent(out spriteRenderer))
             {
-                sprite = _image.sprite;
+                sprite = spriteRenderer.sprite;
             }
-            else
+            else if (image != null || TryGetComponent(out image))
             {
-                sprite = null;
+                sprite = image.sprite;
             }
-
-            if (_collider == null || !TryGetComponent(out _collider))
+            else
             {
-                return;
+                sprite = null;
             }
 
             _lastHandled = sprite;
-            _collider.points = Array.Empty<Vector2>();
+            polygonCollider.points = Array.Empty<Vector2>();
             if (_lastHandled == null)
             {
-                _collider.pathCount = 0;
+                polygonCollider.pathCount = 0;
                 return;
             }
 
             int physicsShapes = _lastHandled.GetPhysicsShapeCount();
-            _collider.pathCount = physicsShapes;
+            polygonCollider.pathCount = physicsShapes;
             List<Vector2> buffer = Buffers<Vector2>.List;
             for (int i = 0; i < physicsShapes; ++i)
             {
                 buffer.Clear();
                 _ = _lastHandled.GetPhysicsShape(i, buffer);
-                _collider.SetPath(i, buffer);
+                polygonCollider.SetPath(i, buffer);
             }
         }
     }
-}
+}

package/package.json

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