smig/excalidraw
1
0
Fork 0
mirror of https://github.com/excalidraw/excalidraw.git synced 2025-05-03 10:00:07 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Replace intersection code

Browse source
This commit is contained in:
Mark Tolmacs 2024-10-01 16:24:31 +02:00
parent 411deae176
commit 0c02972695
No known key found for this signature in database
18 changed files with 507 additions and 687 deletions
Download patch file Download diff file Expand all files Collapse all files

10
packages/math/line.ts
View file

@ -1,4 +1,4 @@
import { ellipseIntersectsLine } from "./ellipse";
import { ellipseLineIntersectionPoints } from "./ellipse";
import { point, pointCenter, pointRotateRads } from "./point";
import { segmentIncludesPoint } from "./segment";
import type { GenericPoint, Line, Radians, Segment } from "./types";
@ -60,7 +60,7 @@ export function lineRotate<Point extends GenericPoint>(
* @param b Another line to intersect
* @returns The intersection point
*/
export function lineIntersectsLine<Point extends GenericPoint>(
export function lineLineIntersectionPoint<Point extends GenericPoint>(
[[x1, y1], [x2, y2]]: Line<Point>,
[[x3, y3], [x4, y4]]: Line<Point>,
): Point | null {
@ -83,11 +83,11 @@ export function lineIntersectsLine<Point extends GenericPoint>(
* @param s
* @returns
*/
export function lineIntersectsSegment<Point extends GenericPoint>(
export function lineSegmentIntersectionPoints<Point extends GenericPoint>(
l: Line<Point>,
s: Segment<Point>,
): Point | null {
const candidate = lineIntersectsLine(l, line(s[0], s[1]));
const candidate = lineLineIntersectionPoint(l, line(s[0], s[1]));
if (!candidate || !segmentIncludesPoint(candidate, s)) {
return null;
}
@ -95,4 +95,4 @@ export function lineIntersectsSegment<Point extends GenericPoint>(
return candidate;
}
export const lineInterceptsEllipse = ellipseIntersectsLine;
export const lineInterceptsEllipse = ellipseLineIntersectionPoints;