mirror of
https://github.com/excalidraw/excalidraw.git
synced 2025-05-03 10:00:07 -04:00
More refactor
This commit is contained in:
parent
392dd5b0b8
commit
b697f63cad
18 changed files with 206 additions and 199 deletions
|
@ -1,12 +1,12 @@
|
|||
import { radians } from "./angle";
|
||||
import {
|
||||
ellipse,
|
||||
interceptPointsOfLineAndEllipse,
|
||||
pointInEllipse,
|
||||
pointOnEllipse,
|
||||
ellipseSegmentInterceptPoints,
|
||||
ellipseIncludesPoint,
|
||||
ellipseTouchesPoint,
|
||||
} from "./ellipse";
|
||||
import { point } from "./point";
|
||||
import { lineSegment } from "./segment";
|
||||
import { segment } from "./segment";
|
||||
import type { Ellipse, GlobalPoint } from "./types";
|
||||
|
||||
describe("point and ellipse", () => {
|
||||
|
@ -14,41 +14,44 @@ describe("point and ellipse", () => {
|
|||
|
||||
it("point on ellipse", () => {
|
||||
[point(0, 1), point(0, -1), point(2, 0), point(-2, 0)].forEach((p) => {
|
||||
expect(pointOnEllipse(p, target)).toBe(true);
|
||||
expect(ellipseTouchesPoint(p, target)).toBe(true);
|
||||
});
|
||||
expect(pointOnEllipse(point(-1.4, 0.7), target, 0.1)).toBe(true);
|
||||
expect(pointOnEllipse(point(-1.4, 0.71), target, 0.01)).toBe(true);
|
||||
expect(ellipseTouchesPoint(point(-1.4, 0.7), target, 0.1)).toBe(true);
|
||||
expect(ellipseTouchesPoint(point(-1.4, 0.71), target, 0.01)).toBe(true);
|
||||
|
||||
expect(pointOnEllipse(point(1.4, 0.7), target, 0.1)).toBe(true);
|
||||
expect(pointOnEllipse(point(1.4, 0.71), target, 0.01)).toBe(true);
|
||||
expect(ellipseTouchesPoint(point(1.4, 0.7), target, 0.1)).toBe(true);
|
||||
expect(ellipseTouchesPoint(point(1.4, 0.71), target, 0.01)).toBe(true);
|
||||
|
||||
expect(pointOnEllipse(point(1, -0.86), target, 0.1)).toBe(true);
|
||||
expect(pointOnEllipse(point(1, -0.86), target, 0.01)).toBe(true);
|
||||
expect(ellipseTouchesPoint(point(1, -0.86), target, 0.1)).toBe(true);
|
||||
expect(ellipseTouchesPoint(point(1, -0.86), target, 0.01)).toBe(true);
|
||||
|
||||
expect(pointOnEllipse(point(-1, -0.86), target, 0.1)).toBe(true);
|
||||
expect(pointOnEllipse(point(-1, -0.86), target, 0.01)).toBe(true);
|
||||
expect(ellipseTouchesPoint(point(-1, -0.86), target, 0.1)).toBe(true);
|
||||
expect(ellipseTouchesPoint(point(-1, -0.86), target, 0.01)).toBe(true);
|
||||
|
||||
expect(pointOnEllipse(point(-1, 0.8), target)).toBe(false);
|
||||
expect(pointOnEllipse(point(1, -0.8), target)).toBe(false);
|
||||
expect(ellipseTouchesPoint(point(-1, 0.8), target)).toBe(false);
|
||||
expect(ellipseTouchesPoint(point(1, -0.8), target)).toBe(false);
|
||||
});
|
||||
|
||||
it("point in ellipse", () => {
|
||||
[point(0, 1), point(0, -1), point(2, 0), point(-2, 0)].forEach((p) => {
|
||||
expect(pointInEllipse(p, target)).toBe(true);
|
||||
expect(ellipseIncludesPoint(p, target)).toBe(true);
|
||||
});
|
||||
|
||||
expect(pointInEllipse(point(-1, 0.8), target)).toBe(true);
|
||||
expect(pointInEllipse(point(1, -0.8), target)).toBe(true);
|
||||
expect(ellipseIncludesPoint(point(-1, 0.8), target)).toBe(true);
|
||||
expect(ellipseIncludesPoint(point(1, -0.8), target)).toBe(true);
|
||||
|
||||
expect(pointInEllipse(point(-1, 1), target)).toBe(false);
|
||||
expect(pointInEllipse(point(-1.4, 0.8), target)).toBe(false);
|
||||
// Point on outline
|
||||
expect(ellipseIncludesPoint(point(2, 0), target)).toBe(true);
|
||||
|
||||
expect(ellipseIncludesPoint(point(-1, 1), target)).toBe(false);
|
||||
expect(ellipseIncludesPoint(point(-1.4, 0.8), target)).toBe(false);
|
||||
});
|
||||
});
|
||||
|
||||
describe("line and ellipse", () => {
|
||||
it("detects outside segment", () => {
|
||||
const l = lineSegment<GlobalPoint>(point(-100, 0), point(-10, 0));
|
||||
const l = segment<GlobalPoint>(point(-100, 0), point(-10, 0));
|
||||
const e = ellipse(point(0, 0), radians(0), 2, 2);
|
||||
expect(interceptPointsOfLineAndEllipse(e, l).length).toBe(0);
|
||||
expect(ellipseSegmentInterceptPoints(e, l).length).toBe(0);
|
||||
});
|
||||
});
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue