com.wallstop-studios.unity-helpers 1.0.1-rc12 → 1.0.1-rc13

package/Runtime/Core/Math/Line.cs

@@ -1,9 +1,13 @@
 namespace UnityHelpers.Core.Math
 {
+    using System;
+    using System.Runtime.Serialization;
     using Extension;
     using UnityEngine;
 
     // https://pastebin.com/iQDhQTFN
+    [Serializable]
+    [DataContract]
     public readonly struct Line
     {
         public readonly Vector2 from;
@@ -48,4 +52,4 @@
             return true;
         }
     }
-}
+}

package/Runtime/Core/Math/Parabola.cs

@@ -5,7 +5,7 @@
 
     [DataContract]
     [Serializable]
-    public sealed class Parabola
+    public readonly struct Parabola
     {
         public readonly float Length;
 
@@ -23,6 +23,7 @@
             {
                 throw new ArgumentException($"Expected a length greater than 0, but found: {length:0.00}.");
             }
+
             Length = length;
 
             A = -4 * max / (length * length);
@@ -41,4 +42,4 @@
             return true;
         }
     }
-}
+}

package/Runtime/Core/Math/PointPolygonCheck.cs

@@ -10,16 +10,20 @@
             int j = polygon.Length - 1;
             for (int i = 0; i < polygon.Length; i++)
             {
-                if (polygon[i].y < point.y && polygon[j].y >= point.y || polygon[j].y < point.y && polygon[i].y >= point.y)
+                if (polygon[i].y < point.y && polygon[j].y >= point.y ||
+                    polygon[j].y < point.y && polygon[i].y >= point.y)
                 {
-                    if (polygon[i].x + (point.y - polygon[i].y) / (polygon[j].y - polygon[i].y) * (polygon[j].x - polygon[i].x) < point.x)
+                    if (polygon[i].x + (point.y - polygon[i].y) / (polygon[j].y - polygon[i].y) *
+                        (polygon[j].x - polygon[i].x) < point.x)
                     {
                         result = !result;
                     }
                 }
+
                 j = i;
             }
+
             return result;
         }
     }
-}
+}

package/Runtime/Core/Math/Range.cs

@@ -10,22 +10,34 @@
     /// </summary>
     [Serializable]
     [DataContract]
-    public struct Range<T> : IEquatable<Range<T>> where T: IEquatable<T>, IComparable<T>
+    public struct Range<T> : IEquatable<Range<T>> where T : IEquatable<T>, IComparable<T>
     {
         [DataMember]
         public T min;
+
         [DataMember]
         public T max;
 
-        public Range(T min, T max)
+        [DataMember]
+        public bool startInclusive;
+
+        [DataMember]
+        public bool endInclusive;
+
+        public Range(T min, T max, bool startInclusive = true, bool endInclusive = true)
         {
             this.min = min;
             this.max = max;
+            this.startInclusive = startInclusive;
+            this.endInclusive = endInclusive;
         }
 
         public bool Equals(Range<T> other)
         {
-            return Equals(min, other.min) && Equals(max, other.max);
+            return min.Equals(other.min) &&
+                   max.Equals(other.max) &&
+                   startInclusive == other.startInclusive &&
+                   endInclusive == other.endInclusive;
         }
 
         public override bool Equals(object obj)
@@ -35,7 +47,7 @@
 
         public override int GetHashCode()
         {
-            return Objects.HashCode(min, max);
+            return Objects.HashCode(min, max, startInclusive, endInclusive);
         }
 
         public override string ToString()
@@ -45,12 +57,29 @@
 
         public bool WithinRange(T value)
         {
-            if (value.CompareTo(min) < 0)
+            int comparison = value.CompareTo(min);
+            if (comparison < 0)
+            {
+                return false;
+            }
+
+            if (!startInclusive && comparison == 0)
+            {
+                return false;
+            }
+
+            comparison = value.CompareTo(max);
+            if (0 < comparison)
+            {
+                return false;
+            }
+
+            if (!endInclusive && comparison == 0)
             {
                 return false;
             }
 
-            return value.CompareTo(max) <= 0;
+            return true;
         }
     }
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "com.wallstop-studios.unity-helpers",
-  "version": "1.0.1-rc12",
+  "version": "1.0.1-rc13",
   "displayName": "Unity Helpers",
   "description": "Various Unity Helper Library",
   "dependencies": {