js-draw 0.20.0 → 0.21.0

package/dist/mjs/src/math/Path.mjs

@@ -4,6 +4,7 @@ import  LineSegment2  from './LineSegment2.mjs';
 import  Mat33  from './Mat33.mjs';
 import  Rect2  from './Rect2.mjs';
 import  { Vec2 }  from './Vec2.mjs';
+import  Vec3  from './Vec3.mjs';
 export var PathCommandType;
 (function (PathCommandType) {
     PathCommandType[PathCommandType["LineTo"] = 0] = "LineTo";
@@ -11,6 +12,23 @@ export var PathCommandType;
     PathCommandType[PathCommandType["CubicBezierTo"] = 2] = "CubicBezierTo";
     PathCommandType[PathCommandType["QuadraticBezierTo"] = 3] = "QuadraticBezierTo";
 })(PathCommandType || (PathCommandType = {}));
+// Returns the bounding box of one path segment.
+const getPartBBox = (part) => {
+    let partBBox;
+    if (part instanceof LineSegment2) {
+        partBBox = part.bbox;
+    }
+    else if (part instanceof Bezier) {
+        const bbox = part.bbox();
+        const width = bbox.x.max - bbox.x.min;
+        const height = bbox.y.max - bbox.y.min;
+        partBBox = new Rect2(bbox.x.min, bbox.y.min, width, height);
+    }
+    else {
+        partBBox = new Rect2(part.x, part.y, 0, 0);
+    }
+    return partBBox;
+};
 export default class Path {
     constructor(startPoint, parts) {
         this.startPoint = startPoint;
@@ -26,6 +44,13 @@ export default class Path {
             this.bbox = this.bbox.union(Path.computeBBoxForSegment(startPoint, part));
         }
     }
+    getExactBBox() {
+        const bboxes = [];
+        for (const part of this.geometry) {
+            bboxes.push(getPartBBox(part));
+        }
+        return Rect2.union(...bboxes);
+    }
     // Lazy-loads and returns this path's geometry
     get geometry() {
         if (this.cachedGeometry) {
@@ -48,6 +73,7 @@ export default class Path {
                     startPoint = part.point;
                     break;
                 case PathCommandType.MoveTo:
+                    geometry.push(part.point);
                     startPoint = part.point;
                     break;
             }
@@ -103,11 +129,197 @@ export default class Path {
         }
         return Rect2.bboxOf(points);
     }
-    intersection(line) {
-        if (!line.bbox.intersects(this.bbox)) {
+    /**
+     * Let `S` be a closed path a distance `strokeRadius` from this path.
+     *
+     * @returns Approximate intersections of `line` with `S` using ray marching, starting from
+     * 	        both end points of `line` and each point in `additionalRaymarchStartPoints`.
+     */
+    raymarchIntersectionWith(line, strokeRadius, additionalRaymarchStartPoints = []) {
+        var _a, _b;
+        // No intersection between bounding boxes: No possible intersection
+        // of the interior.
+        if (!line.bbox.intersects(this.bbox.grownBy(strokeRadius))) {
+            return [];
+        }
+        const lineLength = line.length;
+        const partDistFunctionRecords = [];
+        // Determine distance functions for all parts that the given line could possibly intersect with
+        for (const part of this.geometry) {
+            const bbox = getPartBBox(part).grownBy(strokeRadius);
+            if (!bbox.intersects(line.bbox)) {
+                continue;
+            }
+            // Signed distance function
+            let partDist;
+            if (part instanceof LineSegment2) {
+                partDist = (point) => part.distance(point);
+            }
+            else if (part instanceof Vec3) {
+                partDist = (point) => part.minus(point).magnitude();
+            }
+            else {
+                partDist = (point) => {
+                    return part.project(point).d;
+                };
+            }
+            // Part signed distance function (negative result implies `point` is
+            // inside the shape).
+            const partSdf = (point) => partDist(point) - strokeRadius;
+            // If the line can't possibly intersect the part,
+            if (partSdf(line.p1) > lineLength && partSdf(line.p2) > lineLength) {
+                continue;
+            }
+            partDistFunctionRecords.push({
+                part,
+                distFn: partDist,
+                bbox,
+            });
+        }
+        // If no distance functions, there are no intersections.
+        if (partDistFunctionRecords.length === 0) {
             return [];
         }
+        // Returns the minimum distance to a part in this stroke, where only parts that the given
+        // line could intersect are considered.
+        const sdf = (point) => {
+            let minDist = Infinity;
+            let minDistPart = null;
+            const uncheckedDistFunctions = [];
+            // First pass: only curves for which the current point is inside
+            // the bounding box.
+            for (const distFnRecord of partDistFunctionRecords) {
+                const { part, distFn, bbox } = distFnRecord;
+                // Check later if the current point isn't in the bounding box.
+                if (!bbox.containsPoint(point)) {
+                    uncheckedDistFunctions.push(distFnRecord);
+                    continue;
+                }
+                const currentDist = distFn(point);
+                if (currentDist <= minDist) {
+                    minDist = currentDist;
+                    minDistPart = part;
+                }
+            }
+            // Second pass: Everything else
+            for (const { part, distFn, bbox } of uncheckedDistFunctions) {
+                // Skip if impossible for the distance to the target to be lesser than
+                // the current minimum.
+                if (!bbox.grownBy(minDist).containsPoint(point)) {
+                    continue;
+                }
+                const currentDist = distFn(point);
+                if (currentDist <= minDist) {
+                    minDist = currentDist;
+                    minDistPart = part;
+                }
+            }
+            return [minDistPart, minDist - strokeRadius];
+        };
+        // Raymarch:
+        const maxRaymarchSteps = 7;
+        // Start raymarching from each of these points. This allows detection of multiple
+        // intersections.
+        const startPoints = [
+            line.p1, ...additionalRaymarchStartPoints, line.p2
+        ];
+        // Converts a point ON THE LINE to a parameter
+        const pointToParameter = (point) => {
+            // Because line.direction is a unit vector, this computes the length
+            // of the projection of the vector(line.p1->point) onto line.direction.
+            //
+            // Note that this can be negative if the given point is outside of the given
+            // line segment.
+            return point.minus(line.p1).dot(line.direction);
+        };
+        // Sort start points by parameter on the line.
+        // This allows us to determine whether the current value of a parameter
+        // drops down to a value already tested.
+        startPoints.sort((a, b) => {
+            const t_a = pointToParameter(a);
+            const t_b = pointToParameter(b);
+            // Sort in increasing order
+            return t_a - t_b;
+        });
         const result = [];
+        const stoppingThreshold = strokeRadius / 1000;
+        // Returns the maximum x value explored
+        const raymarchFrom = (startPoint, 
+        // Direction to march in (multiplies line.direction)
+        directionMultiplier, 
+        // Terminate if the current point corresponds to a parameter
+        // below this.
+        minimumLineParameter) => {
+            let currentPoint = startPoint;
+            let [lastPart, lastDist] = sdf(currentPoint);
+            let lastParameter = pointToParameter(currentPoint);
+            if (lastDist > lineLength) {
+                return lastParameter;
+            }
+            const direction = line.direction.times(directionMultiplier);
+            for (let i = 0; i < maxRaymarchSteps; i++) {
+                // Step in the direction of the edge of the shape.
+                const step = lastDist;
+                currentPoint = currentPoint.plus(direction.times(step));
+                lastParameter = pointToParameter(currentPoint);
+                // If we're below the minimum parameter, stop. We've already tried
+                // this.
+                if (lastParameter <= minimumLineParameter) {
+                    return lastParameter;
+                }
+                const [currentPart, signedDist] = sdf(currentPoint);
+                // Ensure we're stepping in the correct direction.
+                // Note that because we could start with a negative distance and work towards a
+                // positive distance, we need absolute values here.
+                if (Math.abs(signedDist) > Math.abs(lastDist)) {
+                    // If not, stop.
+                    return null;
+                }
+                lastDist = signedDist;
+                lastPart = currentPart;
+                // Is the distance close enough that we can stop early?
+                if (Math.abs(lastDist) < stoppingThreshold) {
+                    break;
+                }
+            }
+            // Ensure that the point we ended with is on the line.
+            const isOnLineSegment = lastParameter >= 0 && lastParameter <= lineLength;
+            if (lastPart && isOnLineSegment && Math.abs(lastDist) < stoppingThreshold) {
+                result.push({
+                    point: currentPoint,
+                    parameterValue: NaN,
+                    curve: lastPart,
+                });
+            }
+            return lastParameter;
+        };
+        // The maximum value of the line's parameter explored so far (0 corresponds to
+        // line.p1)
+        let maxLineT = 0;
+        // Raymarch for each start point.
+        //
+        // Use a for (i from 0 to length) loop because startPoints may be added
+        // during iteration.
+        for (let i = 0; i < startPoints.length; i++) {
+            const startPoint = startPoints[i];
+            // Try raymarching in both directions.
+            maxLineT = Math.max(maxLineT, (_a = raymarchFrom(startPoint, 1, maxLineT)) !== null && _a !== void 0 ? _a : maxLineT);
+            maxLineT = Math.max(maxLineT, (_b = raymarchFrom(startPoint, -1, maxLineT)) !== null && _b !== void 0 ? _b : maxLineT);
+        }
+        return result;
+    }
+    /**
+     * Returns a list of intersections with this path. If `strokeRadius` is given,
+     * intersections are approximated with the surface `strokeRadius` away from this.
+     *
+     * If `strokeRadius > 0`, the resultant `parameterValue` has no defined value.
+     */
+    intersection(line, strokeRadius) {
+        let result = [];
+        // Is any intersection between shapes within the bounding boxes impossible?
+        if (!line.bbox.intersects(this.bbox.grownBy(strokeRadius !== null && strokeRadius !== void 0 ? strokeRadius : 0))) {
+            return [];
+        }
         for (const part of this.geometry) {
             if (part instanceof LineSegment2) {
                 const intersection = part.intersection(line);
@@ -119,7 +331,7 @@ export default class Path {
                     });
                 }
             }
-            else {
+            else if (part instanceof Bezier) {
                 const intersectionPoints = part.intersects(line).map(t => {
                     // We're using the .intersects(line) function, which is documented
                     // to always return numbers. However, to satisfy the type checker (and
@@ -142,6 +354,15 @@ export default class Path {
                 result.push(...intersectionPoints);
             }
         }
+        // If given a non-zero strokeWidth, attempt to raymarch.
+        // Even if raymarching, we need to collect starting points.
+        // We use the above-calculated intersections for this.
+        const doRaymarching = strokeRadius && strokeRadius > 1e-8;
+        if (doRaymarching) {
+            // Starting points for raymarching (in addition to the end points of the line).
+            const startPoints = result.map(intersection => intersection.point);
+            result = this.raymarchIntersectionWith(line, strokeRadius, startPoints);
+        }
         return result;
     }
     static mapPathCommand(part, mapping) {

package/dist/mjs/src/math/Rect2.mjs

@@ -68,9 +68,7 @@ export default class Rect2 {
     }
     // Returns a new rectangle containing both [this] and [other].
     union(other) {
-        const topLeft = this.topLeft.zip(other.topLeft, Math.min);
-        const bottomRight = this.bottomRight.zip(other.bottomRight, Math.max);
-        return Rect2.fromCorners(topLeft, bottomRight);
+        return Rect2.union(this, other);
     }
     // Returns a the subdivision of this into [columns] columns
     // and [rows] rows. For example,
@@ -108,6 +106,9 @@ export default class Rect2 {
     }
     // Returns this grown by [margin] in both the x and y directions.
     grownBy(margin) {
+        if (margin === 0) {
+            return this;
+        }
         return new Rect2(this.x - margin, this.y - margin, this.w + margin * 2, this.h + margin * 2);
     }
     getClosestPointOnBoundaryTo(target) {

package/dist/mjs/src/math/polynomial/QuadraticBezier.d.ts

@@ -21,7 +21,7 @@ export default class QuadraticBezier {
      */
     approximateDistance(point: Point2): number;
     /**
-     * @returns the exact distance from `point` to this.
+     * @returns the (more) exact distance from `point` to this.
      */
     distance(point: Point2): number;
     normal(t: number): Vec2;

package/dist/mjs/src/math/polynomial/QuadraticBezier.mjs

@@ -92,15 +92,14 @@ export default class QuadraticBezier {
         return Math.sqrt(Math.min(sqrDist1, sqrDist2, sqrDist3, sqrDist4));
     }
     /**
-     * @returns the exact distance from `point` to this.
+     * @returns the (more) exact distance from `point` to this.
      */
     distance(point) {
         if (!this.bezierJs) {
             this.bezierJs = new Bezier([this.p0.xy, this.p1.xy, this.p2.xy]);
         }
-        const proj = Vec2.ofXY(this.bezierJs.project(point.xy));
-        const dist = proj.minus(point).magnitude();
-        return dist;
+        // .d: Distance
+        return this.bezierJs.project(point.xy).d;
     }
     normal(t) {
         const tangent = this.derivativeAt(t);

package/dist/mjs/src/toolbar/HTMLToolbar.mjs

@@ -1,5 +1,5 @@
 import  { EditorEventType }  from '../types.mjs';
-import { coloris, init as colorisInit } from '@melloware/coloris';
+import { coloris, close as closeColoris, init as colorisInit } from '@melloware/coloris';
 import  Color4  from '../Color4.mjs';
 import  { defaultToolbarLocalization }  from './localization.mjs';
 import  SelectionTool  from '../tools/SelectionTool/SelectionTool.mjs';
@@ -60,6 +60,13 @@ export default class HTMLToolbar {
         const closePickerOverlay = document.createElement('div');
         closePickerOverlay.className = `${toolbarCSSPrefix}closeColorPickerOverlay`;
         this.editor.createHTMLOverlay(closePickerOverlay);
+        // Hide the color picker when attempting to draw on the overlay.
+        this.listeners.push(this.editor.handlePointerEventsFrom(closePickerOverlay, (eventName) => {
+            if (eventName === 'pointerdown') {
+                closeColoris();
+            }
+            return true;
+        }));
         const maxSwatchLen = 12;
         const swatches = [
             Color4.red.toHexString(),

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "js-draw",
-	"version": "0.20.0",
+	"version": "0.21.0",
 	"description": "Draw pictures using a pen, touchscreen, or mouse! JS-draw is a drawing library for JavaScript and TypeScript. ",
 	"types": "./dist/mjs/src/lib.d.ts",
 	"main": "./dist/cjs/src/lib.js",

package/src/Coloris.css

@@ -0,0 +1,52 @@
+
+/* Imports Coloris' CSS and makes additional changes to the color picker */
+
+#clr-picker {
+    --clr-slider-size: 30px;
+}
+
+/* Coloris: Try to avoid scrolling instead of updating the color input. */
+#clr-picker #clr-color-area, #clr-picker .clr_hue {
+	touch-action: none;
+}
+
+/* Increase space between inputs */
+#clr-picker .clr-alpha {
+	margin-top: 15px;
+	margin-bottom: 15px;
+}
+
+/* Increase size of input thumb to make it easier to select colors. */
+#clr-picker.clr-picker input[type="range"]::-moz-range-thumb {
+	width: var(--clr-slider-size);
+	height: var(--clr-slider-size);
+}
+
+/* Also apply to Chrome/iOS */
+#clr-picker.clr-picker input[type="range"]::-webkit-slider-thumb {
+    /*
+     Note: This doesn't seem to take effect in iOS if it's combined with the
+           ::-moz-range-thumb rule above
+     */
+	width: var(--clr-slider-size);
+	height: var(--clr-slider-size);
+}
+
+#clr-picker.clr-picker input[type="range"]::-webkit-slider-runnable-track {
+	height: var(--clr-slider-size);
+}
+
+#clr-picker.clr-picker input[type="range"]::-moz-range-track {
+	height: var(--clr-slider-size);
+}
+
+/*
+Debugging: Uncommenting this rule makes Coloris' sliders more
+visible.
+
+#clr-picker.clr-picker input[type="range"] {
+    opacity: 0.5;
+    -webkit-appearance: auto;
+    appearance: auto;
+}
+*/

package/src/Editor.css

@@ -1,6 +1,7 @@
 
 @import url('./toolbar/toolbar.css');
 @import url('./tools/tools.css');
+@import url('./Coloris.css');
 
 .imageEditorContainer {
 	/* Deafult colors for the editor */
@@ -84,3 +85,14 @@
 	overflow: visible;
 	z-index: 5;
 }
+
+@media print {
+	.imageEditorContainer .loadingMessage {
+		display: none;
+	}
+
+	.imageEditorContainer .imageEditorRenderArea canvas {
+		width: 100%;
+		height: initial;
+	}
+}

package/src/toolbar/toolbar.css

@@ -160,6 +160,8 @@
 	bottom: 0;
 	right: 0;
 
+	touch-action: none;
+
 	background-color: var(--primary-background-color);
 	opacity: 0.3;
 }
@@ -210,4 +212,11 @@
 .toolbar-spacedList > * {
 	padding-bottom: 5px;
 	padding-top: 5px;
+}
+
+@media print {
+	/* Hide the toolbar on print. */
+	.toolbar-root {
+		display: none;
+	}
 }