diff --git a/Engine.Physics2D/Primitives/Line.cs b/Engine.Physics2D/Primitives/Line.cs index c23bd8a..85a981e 100644 --- a/Engine.Physics2D/Primitives/Line.cs +++ b/Engine.Physics2D/Primitives/Line.cs @@ -107,18 +107,27 @@ public record Line(Vector2D From, Vector2D To) public static bool Intersects(Line left, Line right) { - int o1 = PhysicsMath.Orientation(left.From, left.To, right.From); - int o2 = PhysicsMath.Orientation(left.From, left.To, right.To); - int o3 = PhysicsMath.Orientation(right.From, right.To, left.From); - int o4 = PhysicsMath.Orientation(right.From, right.To, left.To); + int o1 = Vector2D.Orientation(left.From, left.To, right.From); + int o2 = Vector2D.Orientation(left.From, left.To, right.To); + int o3 = Vector2D.Orientation(right.From, right.To, left.From); + int o4 = Vector2D.Orientation(right.From, right.To, left.To); if (o1 != o2 && o3 != o4) return true; - if (o1 == 0 && PhysicsMath.OnSegment(left.From, right.From, left.To)) return true; - if (o2 == 0 && PhysicsMath.OnSegment(left.From, right.To, left.To)) return true; - if (o3 == 0 && PhysicsMath.OnSegment(right.From, left.From, right.To)) return true; - if (o4 == 0 && PhysicsMath.OnSegment(right.From, left.To, right.To)) return true; + if (o1 == 0 && OnSegment(left, right.From)) return true; + if (o2 == 0 && OnSegment(left, right.To)) return true; + if (o3 == 0 && OnSegment(right, left.From)) return true; + if (o4 == 0 && OnSegment(right, left.To)) return true; + + return false; + } + + public static bool OnSegment(Line line, Vector2D point) + { + if (point.X <= MathF.Max(line.From.X, line.To.X) && point.X >= MathF.Min(line.From.X, line.To.X) && + point.Y <= MathF.Max(line.From.Y, line.To.Y) && point.Y >= MathF.Min(line.From.Y, line.To.Y)) + return true; return false; } diff --git a/Engine.Physics2D/Primitives/LineEquation.cs b/Engine.Physics2D/Primitives/LineEquation.cs index 8c80782..06ff657 100644 --- a/Engine.Physics2D/Primitives/LineEquation.cs +++ b/Engine.Physics2D/Primitives/LineEquation.cs @@ -1,3 +1,5 @@ +using Syntriax.Engine.Core; + namespace Syntriax.Engine.Physics2D.Primitives; public record LineEquation(float Slope, float OffsetY)