@js-draw/math 1.21.3 → 1.23.1

package/src/shapes/Triangle.ts

@@ -5,7 +5,7 @@ import Abstract2DShape from './Abstract2DShape';
 import LineSegment2 from './LineSegment2';
 import Rect2 from './Rect2';
 
-type TriangleBoundary = [ LineSegment2, LineSegment2, LineSegment2 ];
+type TriangleBoundary = [LineSegment2, LineSegment2, LineSegment2];
 
 export default class Triangle extends Abstract2DShape {
 	/**
@@ -27,30 +27,26 @@ export default class Triangle extends Abstract2DShape {
 		return new Triangle(vertex1, vertex2, vertex3);
 	}
 
-	public get vertices(): [ Point2, Point2, Point2 ] {
-		return [ this.vertex1, this.vertex2, this.vertex3 ];
+	public get vertices(): [Point2, Point2, Point2] {
+		return [this.vertex1, this.vertex2, this.vertex3];
 	}
 
-	public map(mapping: (vertex: Vec3)=>Vec3): Triangle {
-		return new Triangle(
-			mapping(this.vertex1),
-			mapping(this.vertex2),
-			mapping(this.vertex3),
-		);
+	public map(mapping: (vertex: Vec3) => Vec3): Triangle {
+		return new Triangle(mapping(this.vertex1), mapping(this.vertex2), mapping(this.vertex3));
 	}
 
 	// Transform, treating this as composed of 2D points.
 	public transformed2DBy(affineTransform: Mat33) {
-		return this.map(vertex => affineTransform.transformVec2(vertex));
+		return this.map((vertex) => affineTransform.transformVec2(vertex));
 	}
 
 	// Transforms this by a linear transform --- verticies are treated as
 	// 3D points.
 	public transformedBy(linearTransform: Mat33) {
-		return this.map(vertex => linearTransform.transformVec3(vertex));
+		return this.map((vertex) => linearTransform.transformVec3(vertex));
 	}
 
-	#sides: TriangleBoundary|undefined = undefined;
+	#sides: TriangleBoundary | undefined = undefined;
 
 	/**
 	 * Returns the sides of this triangle, as an array of `LineSegment2`s.
@@ -67,7 +63,7 @@ export default class Triangle extends Abstract2DShape {
 		const side2 = new LineSegment2(this.vertex2, this.vertex3);
 		const side3 = new LineSegment2(this.vertex3, this.vertex1);
 
-		const sides: TriangleBoundary = [ side1, side2, side3 ];
+		const sides: TriangleBoundary = [side1, side2, side3];
 		this.#sides = sides;
 		return sides;
 	}
@@ -76,15 +72,17 @@ export default class Triangle extends Abstract2DShape {
 		const result: Point2[] = [];
 
 		for (const edge of this.getEdges()) {
-			edge.intersectsLineSegment(lineSegment)
-				.forEach(point => result.push(point));
+			edge.intersectsLineSegment(lineSegment).forEach((point) => result.push(point));
 		}
 
 		return result;
 	}
 
 	/** @inheritdoc */
-	public override containsPoint(point: Vec3, epsilon: number = Abstract2DShape.smallValue): boolean {
+	public override containsPoint(
+		point: Vec3,
+		epsilon: number = Abstract2DShape.smallValue,
+	): boolean {
 		// Project `point` onto normals to each of this' sides.
 		// Uses the Separating Axis Theorem (https://en.wikipedia.org/wiki/Hyperplane_separation_theorem#Use_in_collision_detection)
 		const sides = this.getEdges();
@@ -103,7 +101,8 @@ export default class Triangle extends Abstract2DShape {
 
 			const projPoint = orthog.dot(point);
 
-			const inProjection = projPoint >= minProjVertex - epsilon && projPoint <= maxProjVertex + epsilon;
+			const inProjection =
+				projPoint >= minProjVertex - epsilon && projPoint <= maxProjVertex + epsilon;
 			if (!inProjection) {
 				return false;
 			}
@@ -120,7 +119,7 @@ export default class Triangle extends Abstract2DShape {
 	 */
 	public override signedDistance(point: Vec3): number {
 		const sides = this.getEdges();
-		const distances = sides.map(side => side.distance(point));
+		const distances = sides.map((side) => side.distance(point));
 		const distance = Math.min(...distances);
 
 		// If the point is in this' interior, signedDistance must return a negative

package/src/utils/convexHull2Of.test.ts

@@ -4,40 +4,79 @@ import convexHull2Of from './convexHull2Of';
 
 describe('convexHull2Of', () => {
 	it.each([
-		[ [ Vec2.of(1, 1) ] , [ Vec2.of(1, 1) ] ],
+		[[Vec2.of(1, 1)], [Vec2.of(1, 1)]],
 
 		// Line
-		[ [ Vec2.of(1, 1), Vec2.of(2, 2) ] , [ Vec2.of(1, 1), Vec2.of(2, 2) ] ],
+		[
+			[Vec2.of(1, 1), Vec2.of(2, 2)],
+			[Vec2.of(1, 1), Vec2.of(2, 2)],
+		],
 
 		// Just a triangle
-		[ [ Vec2.of(1, 1), Vec2.of(4, 2), Vec2.of(3, 3) ] , [ Vec2.of(1, 1), Vec2.of(4, 2), Vec2.of(3, 3) ]],
+		[
+			[Vec2.of(1, 1), Vec2.of(4, 2), Vec2.of(3, 3)],
+			[Vec2.of(1, 1), Vec2.of(4, 2), Vec2.of(3, 3)],
+		],
 
 		// Triangle with an extra point
-		[ [ Vec2.of(1, 1), Vec2.of(2, 20), Vec2.of(3, 5), Vec2.of(4, 3) ] , [ Vec2.of(1, 1), Vec2.of(4, 3), Vec2.of(2, 20) ]],
+		[
+			[Vec2.of(1, 1), Vec2.of(2, 20), Vec2.of(3, 5), Vec2.of(4, 3)],
+			[Vec2.of(1, 1), Vec2.of(4, 3), Vec2.of(2, 20)],
+		],
 
 		// Points within a triangle
 		[
-			[ Vec2.of(28, 5), Vec2.of(4, 5), Vec2.of(-100, -100), Vec2.of(7, 120), Vec2.of(1, 8), Vec2.of(100, -100), Vec2.of(2, 4), Vec2.of(3, 4), Vec2.of(4, 5) ],
-			[ Vec2.of(-100, -100), Vec2.of(100, -100), Vec2.of(7, 120) ],
+			[
+				Vec2.of(28, 5),
+				Vec2.of(4, 5),
+				Vec2.of(-100, -100),
+				Vec2.of(7, 120),
+				Vec2.of(1, 8),
+				Vec2.of(100, -100),
+				Vec2.of(2, 4),
+				Vec2.of(3, 4),
+				Vec2.of(4, 5),
+			],
+			[Vec2.of(-100, -100), Vec2.of(100, -100), Vec2.of(7, 120)],
 		],
 
 		// Points within a triangle (repeated vertex)
 		[
-			[ Vec2.of(28, 5), Vec2.of(4, 5), Vec2.of(-100, -100), Vec2.of(-100, -100), Vec2.of(7, 120), Vec2.of(1, 8), Vec2.of(100, -100), Vec2.of(2, 4), Vec2.of(3, 4), Vec2.of(4, 5) ],
-			[ Vec2.of(-100, -100), Vec2.of(100, -100), Vec2.of(7, 120) ],
+			[
+				Vec2.of(28, 5),
+				Vec2.of(4, 5),
+				Vec2.of(-100, -100),
+				Vec2.of(-100, -100),
+				Vec2.of(7, 120),
+				Vec2.of(1, 8),
+				Vec2.of(100, -100),
+				Vec2.of(2, 4),
+				Vec2.of(3, 4),
+				Vec2.of(4, 5),
+			],
+			[Vec2.of(-100, -100), Vec2.of(100, -100), Vec2.of(7, 120)],
 		],
 
 		// Points within a square
 		[
-			[ Vec2.of(28, 5), Vec2.of(4, 5), Vec2.of(-100, -100), Vec2.of(100, 100), Vec2.of(7, 100), Vec2.of(1, 8), Vec2.of(-100, 100), Vec2.of(100, -100), Vec2.of(2, 4), Vec2.of(3, 4), Vec2.of(4, 5) ],
-			[ Vec2.of(-100, -100), Vec2.of(100, -100), Vec2.of(100, 100), Vec2.of(-100, 100) ],
+			[
+				Vec2.of(28, 5),
+				Vec2.of(4, 5),
+				Vec2.of(-100, -100),
+				Vec2.of(100, 100),
+				Vec2.of(7, 100),
+				Vec2.of(1, 8),
+				Vec2.of(-100, 100),
+				Vec2.of(100, -100),
+				Vec2.of(2, 4),
+				Vec2.of(3, 4),
+				Vec2.of(4, 5),
+			],
+			[Vec2.of(-100, -100), Vec2.of(100, -100), Vec2.of(100, 100), Vec2.of(-100, 100)],
 		],
 
-		[
-			Rect2.unitSquare.corners,
-			[ Vec2.of(1, 0), Vec2.of(1, 1), Vec2.of(0, 1), Vec2.of(0, 0) ],
-		]
+		[Rect2.unitSquare.corners, [Vec2.of(1, 0), Vec2.of(1, 1), Vec2.of(0, 1), Vec2.of(0, 0)]],
 	])('should compute the convex hull of a set of points (%j)', (points, expected) => {
 		expect(convexHull2Of(points)).toMatchObject(expected);
 	});
-});
+});

package/src/utils/convexHull2Of.ts

@@ -13,11 +13,11 @@ const convexHull2Of = (points: Point2[]) => {
 
 	// 1. Start with a vertex on the hull
 	const lowestPoint = points.reduce(
-		(lowest, current) => current.y < lowest.y ? current : lowest,
-		points[0]
+		(lowest, current) => (current.y < lowest.y ? current : lowest),
+		points[0],
 	);
-	const vertices = [ lowestPoint ];
-	let toProcess = [...points.filter(p => !p.eq(lowestPoint))];
+	const vertices = [lowestPoint];
+	let toProcess = [...points.filter((p) => !p.eq(lowestPoint))];
 	let lastBaseDirection = Vec2.of(-1, 0);
 
 	// 2. Find the point with greatest angle from the vertex:
@@ -29,7 +29,9 @@ const convexHull2Of = (points: Point2[]) => {
 	while (toProcess.length > 0) {
 		const lastVertex = vertices[vertices.length - 1];
 
-		let smallestDotProductSoFar: number = lastBaseDirection.dot(lowestPoint.minus(lastVertex).normalizedOrZero());
+		let smallestDotProductSoFar: number = lastBaseDirection.dot(
+			lowestPoint.minus(lastVertex).normalizedOrZero(),
+		);
 		let furthestPointSoFar = lowestPoint;
 		for (const point of toProcess) {
 			// Maximizing the angle is the same as minimizing the dot product:
@@ -46,7 +48,7 @@ const convexHull2Of = (points: Point2[]) => {
 				smallestDotProductSoFar = currentDotProduct;
 			}
 		}
-		toProcess = toProcess.filter(p => !p.eq(furthestPointSoFar));
+		toProcess = toProcess.filter((p) => !p.eq(furthestPointSoFar));
 
 		const newBaseDirection = furthestPointSoFar.minus(lastVertex).normalized();
 
@@ -68,4 +70,4 @@ const convexHull2Of = (points: Point2[]) => {
 	return vertices;
 };
 
-export default convexHull2Of;
+export default convexHull2Of;

package/tsconfig.json

@@ -1,7 +1,5 @@
 {
 	"extends": "../../tsconfig.json",
 
-	"include": [
-		"**/*.ts"
-	]
+	"include": ["**/*.ts"]
 }

package/typedoc.json

@@ -1,5 +1,5 @@
 {
 	"extends": ["../../typedoc.base.json"],
 	"entryPoints": ["./src/lib.ts"],
-	"readme": "./README.md",
-}
+	"readme": "./README.md"
+}