@js-draw/math 1.26.0 → 1.27.1

package/dist/cjs/Color4.d.ts

@@ -69,6 +69,8 @@ export declare class Color4 {
      * ```
      */
     mix(other: Color4, fractionTo: number): Color4;
+    /** Returns a new color with a different opacity. */
+    withAlpha(a: number): Color4;
     /**
      * Ignoring this color's alpha component, returns a vector with components,
      * $$

package/dist/cjs/Color4.js

@@ -183,6 +183,10 @@ class Color4 {
         const fractionOfThis = 1 - fractionTo;
         return new Color4(this.r * fractionOfThis + other.r * fractionTo, this.g * fractionOfThis + other.g * fractionTo, this.b * fractionOfThis + other.b * fractionTo, this.a * fractionOfThis + other.a * fractionTo);
     }
+    /** Returns a new color with a different opacity. */
+    withAlpha(a) {
+        return new Color4(this.r, this.g, this.b, a);
+    }
     /**
      * Ignoring this color's alpha component, returns a vector with components,
      * $$

package/dist/cjs/shapes/Path.d.ts

@@ -185,9 +185,13 @@ export declare class Path {
     mapPoints(mapping: (point: Point2) => Point2): Path;
     transformedBy(affineTransfm: Mat33): Path;
     /**
-     * @internal
+     * @internal -- TODO: This method may have incorrect output in some cases.
      */
     closedContainsPoint(point: Point2): boolean;
+    /**
+     * @returns `true` if this path (interpreted as a closed path) contains the given rectangle.
+     */
+    closedContainsRect(rect: Rect2): boolean;
     union(other: Path | PathCommand[] | null, options?: {
         allowReverse?: boolean;
     }): Path;

package/dist/cjs/shapes/Path.js

@@ -751,7 +751,7 @@ class Path {
         return this.mapPoints((point) => affineTransfm.transformVec2(point));
     }
     /**
-     * @internal
+     * @internal -- TODO: This method may have incorrect output in some cases.
      */
     closedContainsPoint(point) {
         const bbox = this.getExactBBox();
@@ -761,7 +761,30 @@ class Path {
         const pointOutside = point.plus(Vec2_1.Vec2.of(bbox.width, 0));
         const asClosed = this.asClosed();
         const lineToOutside = new LineSegment2_1.default(point, pointOutside);
-        return asClosed.intersection(lineToOutside).length % 2 === 1;
+        const intersections = asClosed.intersection(lineToOutside);
+        const filteredIntersections = intersections.filter((intersection, index) => {
+            if (index === 0)
+                return true; // No previous
+            const previousIntersection = intersections[index - 1];
+            const isRepeatedIntersection = previousIntersection.parameterValue >= 1 && intersection.parameterValue <= 0;
+            return !isRepeatedIntersection;
+        });
+        return filteredIntersections.length % 2 === 1;
+    }
+    /**
+     * @returns `true` if this path (interpreted as a closed path) contains the given rectangle.
+     */
+    closedContainsRect(rect) {
+        if (!this.bbox.containsRect(rect))
+            return false;
+        if (!rect.corners.every((corner) => this.closedContainsPoint(corner)))
+            return false;
+        for (const edge of rect.getEdges()) {
+            if (this.intersection(edge).length) {
+                return false;
+            }
+        }
+        return true;
     }
     // Creates a new path by joining [other] to the end of this path
     union(other, 

package/dist/mjs/Color4.d.ts

@@ -69,6 +69,8 @@ export declare class Color4 {
      * ```
      */
     mix(other: Color4, fractionTo: number): Color4;
+    /** Returns a new color with a different opacity. */
+    withAlpha(a: number): Color4;
     /**
      * Ignoring this color's alpha component, returns a vector with components,
      * $$

package/dist/mjs/Color4.mjs

@@ -177,6 +177,10 @@ export class Color4 {
         const fractionOfThis = 1 - fractionTo;
         return new Color4(this.r * fractionOfThis + other.r * fractionTo, this.g * fractionOfThis + other.g * fractionTo, this.b * fractionOfThis + other.b * fractionTo, this.a * fractionOfThis + other.a * fractionTo);
     }
+    /** Returns a new color with a different opacity. */
+    withAlpha(a) {
+        return new Color4(this.r, this.g, this.b, a);
+    }
     /**
      * Ignoring this color's alpha component, returns a vector with components,
      * $$

package/dist/mjs/shapes/Path.d.ts

@@ -185,9 +185,13 @@ export declare class Path {
     mapPoints(mapping: (point: Point2) => Point2): Path;
     transformedBy(affineTransfm: Mat33): Path;
     /**
-     * @internal
+     * @internal -- TODO: This method may have incorrect output in some cases.
      */
     closedContainsPoint(point: Point2): boolean;
+    /**
+     * @returns `true` if this path (interpreted as a closed path) contains the given rectangle.
+     */
+    closedContainsRect(rect: Rect2): boolean;
     union(other: Path | PathCommand[] | null, options?: {
         allowReverse?: boolean;
     }): Path;

package/dist/mjs/shapes/Path.mjs

@@ -743,7 +743,7 @@ export class Path {
         return this.mapPoints((point) => affineTransfm.transformVec2(point));
     }
     /**
-     * @internal
+     * @internal -- TODO: This method may have incorrect output in some cases.
      */
     closedContainsPoint(point) {
         const bbox = this.getExactBBox();
@@ -753,7 +753,30 @@ export class Path {
         const pointOutside = point.plus(Vec2.of(bbox.width, 0));
         const asClosed = this.asClosed();
         const lineToOutside = new LineSegment2(point, pointOutside);
-        return asClosed.intersection(lineToOutside).length % 2 === 1;
+        const intersections = asClosed.intersection(lineToOutside);
+        const filteredIntersections = intersections.filter((intersection, index) => {
+            if (index === 0)
+                return true; // No previous
+            const previousIntersection = intersections[index - 1];
+            const isRepeatedIntersection = previousIntersection.parameterValue >= 1 && intersection.parameterValue <= 0;
+            return !isRepeatedIntersection;
+        });
+        return filteredIntersections.length % 2 === 1;
+    }
+    /**
+     * @returns `true` if this path (interpreted as a closed path) contains the given rectangle.
+     */
+    closedContainsRect(rect) {
+        if (!this.bbox.containsRect(rect))
+            return false;
+        if (!rect.corners.every((corner) => this.closedContainsPoint(corner)))
+            return false;
+        for (const edge of rect.getEdges()) {
+            if (this.intersection(edge).length) {
+                return false;
+            }
+        }
+        return true;
     }
     // Creates a new path by joining [other] to the end of this path
     union(other, 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@js-draw/math",
-	"version": "1.26.0",
+	"version": "1.27.1",
 	"description": "A math library for js-draw. ",
 	"types": "./dist/mjs/lib.d.ts",
 	"main": "./dist/cjs/lib.js",
@@ -27,7 +27,7 @@
 		"bezier-js": "6.1.3"
 	},
 	"devDependencies": {
-		"@js-draw/build-tool": "^1.26.0",
+		"@js-draw/build-tool": "^1.27.1",
 		"@types/bezier-js": "4.1.0",
 		"@types/jest": "29.5.5",
 		"@types/jsdom": "21.1.3"
@@ -44,5 +44,5 @@
 		"svg",
 		"math"
 	],
-	"gitHead": "6529cad584ca93a992f2576a43f25af48da3d707"
+	"gitHead": "e11574b7b329e7867358c400457a3d99b1d2c469"
 }

package/src/Color4.ts

@@ -224,6 +224,11 @@ export class Color4 {
 		);
 	}
 
+	/** Returns a new color with a different opacity. */
+	public withAlpha(a: number) {
+		return new Color4(this.r, this.g, this.b, a);
+	}
+
 	/**
 	 * Ignoring this color's alpha component, returns a vector with components,
 	 * $$

package/src/shapes/Path.test.ts

@@ -536,4 +536,21 @@ describe('Path', () => {
 			expect(path.tangentAt(at)).objEq(expected);
 		},
 	);
+
+	it.each([
+		// A rectangle completely contained
+		['m0,0 l10,0 l0,10 l-10,0', new Rect2(3, 3, 3, 3), true],
+		// A rectangle partially contained
+		['m0,0 l10,0 l0,10 l-10,0', new Rect2(3, 3, 33, 3), false],
+		// A rectangle not contained
+		['m0,0 l10,0 l0,10 l-10,0', new Rect2(13, 3, 1, 1), false],
+		// More complicated path containing a rectangle
+		['M0,0 Q10,15 10,5', new Rect2(5, 5, 1, 1), true],
+		['M0,0 Q10,15 10,5', new Rect2(15, 5, 1, 1), false],
+	])(
+		'.closedContainsRect should return whether a rectangle is contained within a path (case %#: path(%s), rect(%s))',
+		(pathString, rect, expected) => {
+			expect(Path.fromString(pathString).closedContainsRect(rect)).toBe(expected);
+		},
+	);
 });

package/src/shapes/Path.ts

@@ -969,7 +969,7 @@ export class Path {
 	}
 
 	/**
-	 * @internal
+	 * @internal -- TODO: This method may have incorrect output in some cases.
 	 */
 	public closedContainsPoint(point: Point2) {
 		const bbox = this.getExactBBox();
@@ -981,7 +981,32 @@ export class Path {
 		const asClosed = this.asClosed();
 
 		const lineToOutside = new LineSegment2(point, pointOutside);
-		return asClosed.intersection(lineToOutside).length % 2 === 1;
+
+		const intersections = asClosed.intersection(lineToOutside);
+		const filteredIntersections = intersections.filter((intersection, index) => {
+			if (index === 0) return true; // No previous
+			const previousIntersection = intersections[index - 1];
+			const isRepeatedIntersection =
+				previousIntersection.parameterValue >= 1 && intersection.parameterValue <= 0;
+			return !isRepeatedIntersection;
+		});
+		return filteredIntersections.length % 2 === 1;
+	}
+
+	/**
+	 * @returns `true` if this path (interpreted as a closed path) contains the given rectangle.
+	 */
+	public closedContainsRect(rect: Rect2) {
+		if (!this.bbox.containsRect(rect)) return false;
+		if (!rect.corners.every((corner) => this.closedContainsPoint(corner))) return false;
+
+		for (const edge of rect.getEdges()) {
+			if (this.intersection(edge).length) {
+				return false;
+			}
+		}
+
+		return true;
 	}
 
 	// Creates a new path by joining [other] to the end of this path