RangeFloat replaced with ValueRange within ShapeEngine.

Author: SoloByte

ShapeEngine/Core/RangeFloat.cs

@@ -96,4 +96,5 @@ public static bool OverlappingRange(float minA, float maxA, float minB, float ma
         return minB <= maxA && minA <= maxB;
     }
 
-}
+}
+

ShapeEngine/Core/RangeInt.cs

@@ -6,6 +6,8 @@ namespace ShapeEngine.Core;
 /// <summary>
 /// Deprecated! Will be removed in a future update. Please use ValueRange & ValueRangeInt.
 /// </summary>
+
+
 public class RangeInt
 {
     public int Min;
@@ -48,4 +50,5 @@ public int Clamp(int value)
     {
         return ShapeMath.Clamp(value, Min, Max);
     }
-}
+}
+

ShapeEngine/Core/Shapes/Rect.cs

@@ -302,7 +302,7 @@ public bool SeperateAxis(Vector2 axisStart, Vector2 axisEnd)
         var rProjection = RangeHull(edgeARange, edgeBRange);
 
         var axisRange = Segment.ProjectSegment(axisStart, axisEnd, n);
-        return !axisRange.OverlappingRange(rProjection);
+        return !axisRange.OverlapValueRange(rProjection);
     }
 
     public Rect Lerp(Rect to, float f)
@@ -1168,7 +1168,7 @@ public static Segments GetEdges(Vector2 tl, Vector2 bl, Vector2 br, Vector2 tr)
     public static Rect Empty => new();
 
 
-    private static RangeFloat RangeHull(RangeFloat a, RangeFloat b)
+    private static ValueRange RangeHull(ValueRange a, ValueRange b)
     {
         return new
             (
@@ -2135,8 +2135,8 @@ public readonly bool OverlapShape(Rect b)
         var bTopLeft = new Vector2(b.X, b.Y);
         var bBottomRight = bTopLeft + new Vector2(b.Width, b.Height);
         return
-            RangeFloat.OverlappingRange(aTopLeft.X, aBottomRight.X, bTopLeft.X, bBottomRight.X) &&
-            RangeFloat.OverlappingRange(aTopLeft.Y, aBottomRight.Y, bTopLeft.Y, bBottomRight.Y);
+            ValueRange.OverlapValueRange(aTopLeft.X, aBottomRight.X, bTopLeft.X, bBottomRight.X) &&
+            ValueRange.OverlapValueRange(aTopLeft.Y, aBottomRight.Y, bTopLeft.Y, bBottomRight.Y);
     }
     public readonly bool OverlapShape(Polygon poly)
     {

ShapeEngine/Core/Shapes/Segment.cs

@@ -375,10 +375,10 @@ public static bool IsPointOnLine(Vector2 point, Vector2 start, Vector2 dir)
         {
             return IsPointOnRay(point, start, dir) || IsPointOnRay(point, start, -dir);
         }
-        public static RangeFloat ProjectSegment(Vector2 aPos, Vector2 aEnd, Vector2 onto)
+        public static ValueRange ProjectSegment(Vector2 aPos, Vector2 aEnd, Vector2 onto)
         {
-            Vector2 unitOnto = Vector2.Normalize(onto);
-            RangeFloat r = new(ShapeVec.Dot(unitOnto, aPos), ShapeVec.Dot(unitOnto, aEnd));
+            var unitOnto = Vector2.Normalize(onto);
+            ValueRange r = new(ShapeVec.Dot(unitOnto, aPos), ShapeVec.Dot(unitOnto, aEnd));
             return r;
         }
         public static bool SegmentOnOneSide(Vector2 axisPos, Vector2 axisDir, Vector2 segmentStart, Vector2 segmentEnd)
@@ -499,7 +499,7 @@ public static bool OverlapSegmentSegment(Vector2 aStart, Vector2 aEnd, Vector2 b
             {
                 var rangeA = ProjectSegment(aStart, aEnd, axisADir);
                 var rangeB = ProjectSegment(bStart, bEnd, axisADir);
-                return rangeA.OverlappingRange(rangeB); // Rect.OverlappingRange(rangeA, rangeB);
+                return rangeA.OverlapValueRange(rangeB); // Rect.OverlappingRange(rangeA, rangeB);
             }
             return true;
         }
@@ -1177,28 +1177,30 @@ public bool OverlapShape(Quad q)
         public bool OverlapShape(Rect r)
         {
             if (!r.OverlapRectLine(Start, Displacement)) return false;
-            RangeFloat rectRange = new
+            var rectRange = new ValueRange
                 (
                     r.X,
                     r.X + r.Width
                 );
-            RangeFloat segmentRange = new
+            var segmentRange = new ValueRange
                 (
                     Start.X,
                     End.X
                 );
 
-            if (!rectRange.OverlappingRange(segmentRange)) return false;
+            if (!rectRange.OverlapValueRange(segmentRange)) return false;
 
-            rectRange.Min = r.Y;
-            rectRange.Max = r.Y + r.Height;
-            rectRange.Sort();
+            rectRange = new(r.Y, r.Y + r.Height);
+            // rectRange.Min = r.Y;
+            // rectRange.Max = r.Y + r.Height;
+            // rectRange.Sort();
 
-            segmentRange.Min = Start.Y;
-            segmentRange.Max = End.Y;
-            segmentRange.Sort();
+            segmentRange = new(Start.Y, End.Y);
+            // segmentRange.Min = Start.Y;
+            // segmentRange.Max = End.Y;
+            // segmentRange.Sort();
 
-            return rectRange.OverlappingRange(segmentRange);
+            return rectRange.OverlapValueRange(segmentRange);
         }
         public bool OverlapShape(Polygon poly)
         {

ShapeEngine/Core/ValueRange.cs

@@ -64,4 +64,11 @@ public ValueRange(float max)
     public float Clamp(float value) => ShapeMath.Clamp(value, Min, Max);
 
     public bool OverlapValueRange(ValueRange other) => other.Min <= Max && Min <= other.Max;
+
+    public static bool OverlapValueRange(float aMin, float aMax, float bMin, float bMax)
+    {
+        var aRange = new ValueRange(aMin, aMax);
+        var bRange = new ValueRange(bMin, bMax);
+        return aRange.OverlapValueRange(bRange);
+    }
 }

ShapeEngine/Screen/CameraFollowerSingle.cs

@@ -12,7 +12,7 @@ public class CameraFollowerSingle : ICameraFollower
     public ICameraFollowTarget? Target { get; private set; } = null;
     public ICameraFollowTarget? NewTarget { get; private set; } = null;
     // public bool Active { get; private set; } = false;
-    public RangeFloat BoundaryDis;
+    public ValueRange BoundaryDis;
     public float Speed;
 
     private float changeTargetDuration = 0f;

ShapeEngine/Text/FontDimensions.cs

@@ -6,7 +6,7 @@ namespace ShapeEngine.Text;
 
 public readonly struct FontDimensions
 {
-    public static RangeFloat FontSizeRange = new(10, 150);
+    public static ValueRange FontSizeRange = new(10, 150);
 
     public readonly Font Font;
     public float BaseSize => Font.BaseSize;