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

Fix arc negative radians issue

Browse source
This commit is contained in:
Mark Tolmacs 2025-01-07 12:27:29 +01:00
parent fb113e2054
commit b2fcf787e2
No known key found for this signature in database
2 changed files with 20 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

10
packages/math/angle.ts
View file

@ -60,8 +60,14 @@ export const normalizeRadians = (angle: Radians): Radians => {
export const cartesian2Polar = <P extends GenericPoint>([ export const cartesian2Polar = <P extends GenericPoint>([
x, x,
y, y,
]: P): PolarCoords => ]: P): PolarCoords => {
polar(Math.hypot(x, y), normalizeRadians(radians(Math.atan2(y, x)))); const [radius, angle] = polar(
Math.hypot(x, y),
normalizeRadians(radians(Math.atan2(y, x))),
);
return [radius, normalizeRadians(angle)] as PolarCoords;
};
/** /**
* Convert an angle in degrees into randians * Convert an angle in degrees into randians

23
packages/math/arc.ts
View file

@ -25,7 +25,10 @@ export function arc<Point extends GenericPoint>(
startAngle: Radians, startAngle: Radians,
endAngle: Radians, endAngle: Radians,
) { ) {
return { center, radius, startAngle, endAngle } as Arc<Point>; const start = normalizeRadians(startAngle);
const end = normalizeRadians(endAngle);
return { center, radius, startAngle: start, endAngle: end } as Arc<Point>;
} }
/** /**
@ -100,11 +103,10 @@ export function arcSegmentInterceptPoints<Point extends GenericPoint>(
pointFrom(candidate[0] - a.center[0], candidate[1] - a.center[1]), pointFrom(candidate[0] - a.center[0], candidate[1] - a.center[1]),
); );
return a.startAngle < a.endAngle return Math.abs(a.radius - candidateRadius) < PRECISION &&
? Math.abs(a.radius - candidateRadius) < PRECISION && a.startAngle > a.endAngle
a.startAngle <= candidateAngle && ? a.startAngle <= candidateAngle || a.endAngle >= candidateAngle
a.endAngle >= candidateAngle : a.startAngle <= candidateAngle && a.endAngle >= candidateAngle;
: a.startAngle <= candidateAngle || a.endAngle >= candidateAngle;
}); });
} }
@ -128,11 +130,10 @@ export function arcLineInterceptPoints<Point extends GenericPoint>(
pointFrom(candidate[0] - a.center[0], candidate[1] - a.center[1]), pointFrom(candidate[0] - a.center[0], candidate[1] - a.center[1]),
); );
return a.startAngle < a.endAngle return Math.abs(a.radius - candidateRadius) < PRECISION &&
? Math.abs(a.radius - candidateRadius) < PRECISION && a.startAngle > a.endAngle
a.startAngle <= candidateAngle && ? a.startAngle <= candidateAngle || a.endAngle >= candidateAngle
a.endAngle >= candidateAngle : a.startAngle <= candidateAngle && a.endAngle >= candidateAngle;
: a.startAngle <= candidateAngle || a.endAngle >= candidateAngle;
}); });
} }