flo-mat 3.0.14 → 4.0.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/__tests__/cp-node/check-clone-eql-calc.spec.ts +58 -0
- package/__tests__/cp-node/compare-cp-nodes-by-value.ts +37 -0
- package/__tests__/cp-node/compare-loops-by-value.ts +40 -0
- package/__tests__/cp-node/compare-poss-by-value.ts +25 -0
- package/__tests__/cp-node/fs/clone.spec.ts +19 -3
- package/__tests__/cp-node/fs/find-first.spec.ts +13 -3
- package/__tests__/cp-node/fs/get-all-between.spec.ts +20 -3
- package/__tests__/cp-node/fs/get-all-on-circle.spec.ts +10 -10
- package/__tests__/cp-node/fs/get-all-on-loop.spec.ts +16 -3
- package/__tests__/cp-node/fs/get-all-vertices.spec.ts +14 -3
- package/__tests__/cp-node/fs/get-children.spec.ts +18 -3
- package/__tests__/cp-node/fs/get-non-terminating-on-circle.spec.ts +14 -3
- package/__tests__/cp-node/fs/get-prong-count.spec.ts +16 -3
- package/__tests__/cp-node/fs/get-real-prong-count.spec.ts +11 -3
- package/__tests__/cp-node/fs/get-terminating-on-circle.spec.ts +20 -3
- package/__tests__/cp-node/fs/is-fully-terminating.spec.ts +16 -3
- package/__tests__/cp-node/fs/is-on-same-circle.spec.ts +20 -3
- package/__tests__/cp-node/fs/is-one-prong.spec.ts +16 -3
- package/__tests__/cp-node/fs/is-sharp.spec.ts +10 -3
- package/__tests__/cp-node/fs/is-single-3-prong.spec.ts +13 -3
- package/__tests__/cp-node/fs/is-special.spec.ts +12 -3
- package/__tests__/cp-node/fs/is-terminating.spec.ts +15 -3
- package/__tests__/cp-node/fs/is-trivial.spec.ts +13 -3
- package/__tests__/cp-node/fs/is-two-prong.spec.ts +11 -3
- package/__tests__/cp-node/fs/is-vertex-special.spec.ts +13 -3
- package/__tests__/cp-node/fs/is-vertex.spec.ts +14 -3
- package/__tests__/cp-node/fs/iterate-all-on-loop.spec.ts +13 -3
- package/__tests__/cp-node/fs/traverse-all-forward.spec.ts +10 -3
- package/__tests__/cp-node/fs/traverse-cp.spec.ts +9 -3
- package/__tests__/cp-node/fs/traverse-edges.spec.ts +13 -3
- package/__tests__/cp-node/fs/traverse-vertices.spec.ts +12 -3
- package/__tests__/cp-node/random-walk.ts +33 -0
- package/__tests__/cp-node/stringification/from-stringifyable.spec.ts +3 -0
- package/__tests__/cp-node/stringification/loop-from-stringifyable.spec.ts +4 -0
- package/__tests__/cp-node/stringification/loop-to-stringifyable.spec.ts +19 -0
- package/__tests__/cp-node/stringification/to-stringifyable.spec.ts +34 -0
- package/__tests__/get-mats1.ts +122 -0
- package/__tests__/helpers/close-to.ts +71 -0
- package/__tests__/helpers/jest-extend-nearly.ts +39 -0
- package/__tests__/helpers/jest.setup.ts +6 -0
- package/__tests__/helpers/obj-or-array.ts +8 -0
- package/__tests__/jest-extensions.d.ts +26 -0
- package/__tests__/jsog/check-jsog-eql-calc.spec.ts +47 -67
- package/__tests__/jsog/decode-jsog.ts +88 -85
- package/__tests__/jsog/mat-dummy-1.ts +19 -0
- package/__tests__/jsog/mat-dummys.ts +6197 -6195
- package/__tests__/jsog/to-jsog-breath-first.ts +110 -107
- package/__tests__/jsog/to-jsog-depth-first.ts +58 -55
- package/__tests__/lib-load.spec.ts +1 -1
- package/browser/index.js +21168 -17746
- package/browser/index.min.js +1 -1
- package/jest.config.cjs +2 -0
- package/node/add-n-prong.ts/join-spokes.d.ts +2 -2
- package/node/add-n-prong.ts/join-spokes.js +5 -4
- package/node/add-n-prong.ts/join-spokes.js.map +1 -1
- package/node/closest-boundary-point/cull-bezier-pieces-1.d.ts +9 -0
- package/node/closest-boundary-point/{cull-bezier-pieces.js → cull-bezier-pieces-1.js} +6 -7
- package/node/closest-boundary-point/cull-bezier-pieces-1.js.map +1 -0
- package/node/closest-boundary-point/cull-by-loose-bounding-box.d.ts +7 -5
- package/node/closest-boundary-point/cull-by-loose-bounding-box.js +12 -10
- package/node/closest-boundary-point/cull-by-loose-bounding-box.js.map +1 -1
- package/node/closest-boundary-point/cull-by-tight-boundary-box.js +2 -2
- package/node/closest-boundary-point/foot-and-endpoint-info.d.ts +9 -9
- package/node/closest-boundary-point/get-best-distance-squared.d.ts +4 -3
- package/node/closest-boundary-point/get-best-distance-squared.js +11 -11
- package/node/closest-boundary-point/get-best-distance-squared.js.map +1 -1
- package/node/closest-boundary-point/get-close-boundary-points-certified.d.ts +6 -10
- package/node/closest-boundary-point/get-close-boundary-points-certified.js +22 -18
- package/node/closest-boundary-point/get-close-boundary-points-certified.js.map +1 -1
- package/node/closest-boundary-point/get-potential-closest-points-on-curve-certified.d.ts +6 -10
- package/node/closest-boundary-point/get-potential-closest-points-on-curve-certified.js +12 -79
- package/node/closest-boundary-point/get-potential-closest-points-on-curve-certified.js.map +1 -1
- package/node/closest-boundary-point/root-interval-to-distance-squared-interval.d.ts +1 -1
- package/node/closest-boundary-point/root-interval-to-distance-squared-interval.js +5 -5
- package/node/closest-boundary-point/root-interval-to-distance-squared-interval.js.map +1 -1
- package/node/corner/compare-curvatures-at-interface.d.ts +1 -1
- package/node/corner/compare-curvatures-at-interface.js +1 -1
- package/node/corner/corner.d.ts +7 -6
- package/node/corner/get-corner.d.ts +1 -6
- package/node/corner/get-corner.js +2 -9
- package/node/corner/get-corner.js.map +1 -1
- package/node/corner/get-interface-ccw.d.ts +2 -2
- package/node/corner/get-interface-ccw.js +4 -5
- package/node/corner/get-interface-ccw.js.map +1 -1
- package/node/cp-node/cp-node-fs.d.ts +0 -15
- package/node/cp-node/cp-node-fs.js +0 -4
- package/node/cp-node/cp-node-fs.js.map +1 -1
- package/node/cp-node/cp-node.d.ts +11 -11
- package/node/cp-node/fs/clone.js +3 -3
- package/node/cp-node/fs/clone.js.map +1 -1
- package/node/cp-node/fs/cp-node-comparator.js +2 -2
- package/node/cp-node/fs/cp-node-comparator.js.map +1 -1
- package/node/cp-node/fs/enhance-cp-node.d.ts +3 -3
- package/node/cp-node/fs/enhance-cp-node.js +5 -5
- package/node/cp-node/fs/enhance-cp-node.js.map +1 -1
- package/node/cp-node/fs/find-first.d.ts +9 -2
- package/node/cp-node/fs/find-first.js +12 -9
- package/node/cp-node/fs/find-first.js.map +1 -1
- package/node/cp-node/fs/get-all-on-loop.js +5 -6
- package/node/cp-node/fs/get-all-on-loop.js.map +1 -1
- package/node/cp-node/fs/get-boundary-bezier-parts-to-next.js +2 -2
- package/node/cp-node/fs/get-boundary-bezier-parts-to-next.js.map +1 -1
- package/node/cp-node/fs/get-cp-node-ordering.js +4 -4
- package/node/cp-node/fs/get-cp-node-ordering.js.map +1 -1
- package/node/cp-node/fs/get-edge-direction.d.ts +1 -1
- package/node/cp-node/fs/get-edge-direction.js +3 -3
- package/node/cp-node/fs/get-edge-direction.js.map +1 -1
- package/node/cp-node/fs/get-hole-closers.d.ts +1 -1
- package/node/cp-node/fs/get-implied-boundary-bezier-between.js +2 -2
- package/node/cp-node/fs/get-implied-boundary-bezier-between.js.map +1 -1
- package/node/cp-node/fs/get-mat-curve-between.d.ts +1 -1
- package/node/cp-node/fs/get-mat-curve-between.js +6 -5
- package/node/cp-node/fs/get-mat-curve-between.js.map +1 -1
- package/node/cp-node/fs/get-salience.d.ts +1 -1
- package/node/cp-node/fs/get-salience.js +3 -3
- package/node/cp-node/fs/get-salience.js.map +1 -1
- package/node/cp-node/fs/insert-cp-node.d.ts +3 -3
- package/node/cp-node/fs/insert-cp-node.js +3 -4
- package/node/cp-node/fs/insert-cp-node.js.map +1 -1
- package/node/cp-node/fs/is-on-same-circle.d.ts +1 -0
- package/node/cp-node/fs/is-on-same-circle.js +1 -0
- package/node/cp-node/fs/is-on-same-circle.js.map +1 -1
- package/node/cp-node/fs/is-one-prong.d.ts +1 -1
- package/node/cp-node/fs/is-one-prong.js +2 -9
- package/node/cp-node/fs/is-one-prong.js.map +1 -1
- package/node/cp-node/fs/is-order-correct.d.ts +2 -2
- package/node/cp-node/fs/is-order-correct.js +5 -8
- package/node/cp-node/fs/is-order-correct.js.map +1 -1
- package/node/cp-node/fs/is-sharp.js +1 -1
- package/node/cp-node/fs/is-sharp.js.map +1 -1
- package/node/cp-node/fs/remove-cp-node.js +1 -2
- package/node/cp-node/fs/remove-cp-node.js.map +1 -1
- package/node/debug/debug-elem-types.d.ts +1 -2
- package/node/debug/debug-elem-types.js +1 -2
- package/node/debug/debug-elem-types.js.map +1 -1
- package/node/debug/functions/draw-elem/draw-cp-node.js +2 -2
- package/node/debug/functions/draw-elem/draw-cp-node.js.map +1 -1
- package/node/debug/functions/draw-elem/draw-dull-corner.d.ts +1 -1
- package/node/debug/functions/draw-elem/draw-dull-corner.js +1 -1
- package/node/debug/functions/draw-elem/draw-dull-corner.js.map +1 -1
- package/node/debug/functions/draw-elem/draw-elem.js +1 -5
- package/node/debug/functions/draw-elem/draw-elem.js.map +1 -1
- package/node/debug/functions/draw-elem/draw-leaves.js +2 -2
- package/node/debug/functions/draw-elem/draw-leaves.js.map +1 -1
- package/node/debug/functions/draw-elem/draw-max-vertex.d.ts +1 -1
- package/node/debug/functions/draw-elem/draw-max-vertex.js +1 -1
- package/node/debug/functions/draw-elem/draw-max-vertex.js.map +1 -1
- package/node/debug/functions/draw-elem/draw-one-prong-at-dull-corner.js +12 -3
- package/node/debug/functions/draw-elem/draw-one-prong-at-dull-corner.js.map +1 -1
- package/node/debug/functions/draw-elem/draw-one-prong.d.ts +2 -2
- package/node/debug/functions/draw-elem/draw-one-prong.js +8 -7
- package/node/debug/functions/draw-elem/draw-one-prong.js.map +1 -1
- package/node/debug/functions/draw-elem/draw-sharp-corner.d.ts +1 -1
- package/node/debug/functions/draw-elem/draw-sharp-corner.js +2 -1
- package/node/debug/functions/draw-elem/draw-sharp-corner.js.map +1 -1
- package/node/debug/functions/draw-elem/draw-three-prong.js +2 -2
- package/node/debug/functions/draw-elem/draw-three-prong.js.map +1 -1
- package/node/debug/functions/draw-elem/draw-two-prong.js +4 -3
- package/node/debug/functions/draw-elem/draw-two-prong.js.map +1 -1
- package/node/debug/functions/draw-elem/draw-vertex.js +1 -1
- package/node/debug/functions/draw-elem/draw-vertex.js.map +1 -1
- package/node/debug/functions/general.js +1 -1
- package/node/debug/functions/general.js.map +1 -1
- package/node/find-2-prong/add-1-prong.d.ts +3 -3
- package/node/find-2-prong/add-1-prong.js +4 -4
- package/node/find-2-prong/add-1-prong.js.map +1 -1
- package/node/find-2-prong/add-2-prong.d.ts +10 -11
- package/node/find-2-prong/add-2-prong.js +42 -37
- package/node/find-2-prong/add-2-prong.js.map +1 -1
- package/node/find-2-prong/calc-seperation-tolerance.js +4 -7
- package/node/find-2-prong/calc-seperation-tolerance.js.map +1 -1
- package/node/find-2-prong/cull-bezier-pieces.d.ts +9 -7
- package/node/find-2-prong/cull-bezier-pieces.js +30 -15
- package/node/find-2-prong/cull-bezier-pieces.js.map +1 -1
- package/node/find-2-prong/find-2-prong.d.ts +12 -13
- package/node/find-2-prong/find-2-prong.js +73 -116
- package/node/find-2-prong/find-2-prong.js.map +1 -1
- package/node/find-2-prong/find-and-add-2-prongs-on-all-loops.d.ts +4 -4
- package/node/find-2-prong/find-and-add-2-prongs-on-all-loops.js.map +1 -1
- package/node/find-2-prong/find-and-add-2-prongs.d.ts +5 -4
- package/node/find-2-prong/find-and-add-2-prongs.js +28 -24
- package/node/find-2-prong/find-and-add-2-prongs.js.map +1 -1
- package/node/find-2-prong/find-and-add-hole-closing-2-prongs.d.ts +6 -8
- package/node/find-2-prong/find-and-add-hole-closing-2-prongs.js +11 -12
- package/node/find-2-prong/find-and-add-hole-closing-2-prongs.js.map +1 -1
- package/node/find-2-prong/get-initial-bezier-pieces.d.ts +5 -6
- package/node/find-2-prong/get-initial-bezier-pieces.js +8 -11
- package/node/find-2-prong/get-initial-bezier-pieces.js.map +1 -1
- package/node/find-2-prong/get-initial-x.d.ts +12 -0
- package/node/find-2-prong/get-initial-x.js +35 -0
- package/node/find-2-prong/get-initial-x.js.map +1 -0
- package/node/find-2-prong/get-medial/antipodal-point.d.ts +8 -0
- package/node/find-2-prong/get-medial/antipodal-point.js +2 -0
- package/node/find-2-prong/get-medial/antipodal-point.js.map +1 -0
- package/node/find-2-prong/get-medial/get-antipodal-points.d.ts +18 -0
- package/node/find-2-prong/get-medial/get-antipodal-points.js +41 -0
- package/node/find-2-prong/get-medial/get-antipodal-points.js.map +1 -0
- package/node/find-2-prong/get-medial/get-closest-points.d.ts +15 -0
- package/node/find-2-prong/get-medial/get-closest-points.js +163 -0
- package/node/find-2-prong/get-medial/get-closest-points.js.map +1 -0
- package/node/find-2-prong/reduce-radius.d.ts +4 -4
- package/node/find-2-prong/reduce-radius.js +30 -50
- package/node/find-2-prong/reduce-radius.js.map +1 -1
- package/node/find-3-prong/calc-better-x.d.ts +22 -0
- package/node/{find-3-prong.ts → find-3-prong}/calc-better-x.js +8 -5
- package/node/find-3-prong/calc-better-x.js.map +1 -0
- package/node/find-3-prong/calc-initial-3-prong-center.d.ts +15 -0
- package/node/find-3-prong/calc-initial-3-prong-center.js +26 -0
- package/node/find-3-prong/calc-initial-3-prong-center.js.map +1 -0
- package/node/find-3-prong/find-3-prong-for-delta3s.d.ts +19 -0
- package/node/{find-3-prong.ts → find-3-prong}/find-3-prong-for-delta3s.js +32 -34
- package/node/find-3-prong/find-3-prong-for-delta3s.js.map +1 -0
- package/node/find-3-prong/find-3-prong.d.ts +13 -0
- package/node/{find-3-prong.ts → find-3-prong}/find-3-prong.js +14 -9
- package/node/find-3-prong/find-3-prong.js.map +1 -0
- package/node/{find-3-prong.ts → find-3-prong}/find-and-add-3-prong.js +2 -2
- package/node/find-3-prong/find-and-add-3-prong.js.map +1 -0
- package/node/find-3-prong/find-and-add-3-prongs-on-loop.js.map +1 -0
- package/node/{find-3-prong.ts → find-3-prong}/find-and-add-3-prongs.js +1 -1
- package/node/find-3-prong/find-and-add-3-prongs.js.map +1 -0
- package/node/find-3-prong/get-closest-points.d.ts +10 -0
- package/node/{find-3-prong.ts → find-3-prong}/get-closest-points.js +5 -5
- package/node/find-3-prong/get-closest-points.js.map +1 -0
- package/node/find-3-prong/three-prong-info.d.ts +9 -0
- package/node/find-3-prong/three-prong-info.js +2 -0
- package/node/find-3-prong/three-prong-info.js.map +1 -0
- package/node/find-mat/clip-options.d.ts +2 -2
- package/node/find-mat/clip-options.js +7 -14
- package/node/find-mat/clip-options.js.map +1 -1
- package/node/find-mat/create-initial-cp-tree.d.ts +8 -7
- package/node/find-mat/create-initial-cp-tree.js +16 -19
- package/node/find-mat/create-initial-cp-tree.js.map +1 -1
- package/node/find-mat/find-mat.d.ts +1 -1
- package/node/find-mat/find-mat.js +6 -12
- package/node/find-mat/find-mat.js.map +1 -1
- package/node/find-mat/find-mats.js +8 -8
- package/node/find-mat/find-mats.js.map +1 -1
- package/node/find-mat/get-dull-corners-on-loop.d.ts +3 -3
- package/node/find-mat/get-dull-corners-on-loop.js +5 -4
- package/node/find-mat/get-dull-corners-on-loop.js.map +1 -1
- package/node/find-mat/get-for-1-prongs-on-loop.d.ts +7 -7
- package/node/find-mat/get-for-1-prongs-on-loop.js +9 -21
- package/node/find-mat/get-for-1-prongs-on-loop.js.map +1 -1
- package/node/find-mat/get-for-2-prongs-on-loop.d.ts +5 -4
- package/node/find-mat/get-for-2-prongs-on-loop.js +4 -6
- package/node/find-mat/get-for-2-prongs-on-loop.js.map +1 -1
- package/node/find-mat/get-meta.d.ts +5 -5
- package/node/find-mat/get-meta.js +12 -12
- package/node/find-mat/get-meta.js.map +1 -1
- package/node/find-mat/get-sharp-corners.d.ts +3 -3
- package/node/find-mat/get-sharp-corners.js +2 -3
- package/node/find-mat/get-sharp-corners.js.map +1 -1
- package/node/find-mat/mat-options.d.ts +15 -15
- package/node/find-mat/mat-options.js +7 -4
- package/node/find-mat/mat-options.js.map +1 -1
- package/node/floyd-warshall/floyd-warshall.js +1 -1
- package/node/floyd-warshall/floyd-warshall.js.map +1 -1
- package/node/floyd-warshall/get-graph.js +2 -2
- package/node/floyd-warshall/get-graph.js.map +1 -1
- package/node/floyd-warshall/get-hole-closer-pairs.js +6 -6
- package/node/floyd-warshall/get-hole-closer-pairs.js.map +1 -1
- package/node/geometry/circle.d.ts +5 -3
- package/node/geometry/circle.js +1 -7
- package/node/geometry/circle.js.map +1 -1
- package/node/geometry/get-closest-square-distance-to-rect.js +1 -4
- package/node/geometry/get-closest-square-distance-to-rect.js.map +1 -1
- package/node/geometry/get-closest-squared-distance-to-rotated-rect.js +2 -1
- package/node/geometry/get-closest-squared-distance-to-rotated-rect.js.map +1 -1
- package/node/index.d.ts +2 -9
- package/node/index.js +1 -5
- package/node/index.js.map +1 -1
- package/node/loop/get-max-coordinate.d.ts +2 -1
- package/node/loop/get-max-coordinate.js +6 -8
- package/node/loop/get-max-coordinate.js.map +1 -1
- package/node/mat/add-to-cp-tree.d.ts +3 -3
- package/node/mat/add-to-cp-tree.js +5 -5
- package/node/mat/add-to-cp-tree.js.map +1 -1
- package/node/mat/create-new-cp-trees.d.ts +10 -0
- package/node/mat/create-new-cp-trees.js +24 -0
- package/node/mat/create-new-cp-trees.js.map +1 -0
- package/node/mat/curve-piece.d.ts +4 -4
- package/node/mat/get-boundary-piece-beziers.d.ts +5 -5
- package/node/mat/get-boundary-piece-beziers.js +125 -20
- package/node/mat/get-boundary-piece-beziers.js.map +1 -1
- package/node/mat/get-branches.d.ts +1 -1
- package/node/mat/get-closeby-cp-if-exist.d.ts +5 -5
- package/node/mat/get-closeby-cp-if-exist.js +6 -5
- package/node/mat/get-closeby-cp-if-exist.js.map +1 -1
- package/node/mat/get-cp-node-to-left-or-same.d.ts +3 -3
- package/node/mat/get-cp-node-to-left-or-same.js +2 -2
- package/node/mat/get-cp-node-to-left-or-same.js.map +1 -1
- package/node/mat/get-largest-vertex.d.ts +1 -1
- package/node/mat/get-largest-vertex.js +1 -1
- package/node/mat/get-largest-vertex.js.map +1 -1
- package/node/mat/mat-meta.d.ts +5 -6
- package/node/mat/mat.d.ts +5 -5
- package/node/mat/simplify-mat.d.ts +10 -8
- package/node/mat/simplify-mat.js +17 -14
- package/node/mat/simplify-mat.js.map +1 -1
- package/node/mat/trim-mat.d.ts +3 -2
- package/node/mat/trim-mat.js +5 -3
- package/node/mat/trim-mat.js.map +1 -1
- package/node/point-on-shape/calc-pos-order.d.ts +8 -5
- package/node/point-on-shape/calc-pos-order.js +7 -7
- package/node/point-on-shape/calc-pos-order.js.map +1 -1
- package/node/point-on-shape/compare-poss.d.ts +4 -0
- package/node/point-on-shape/compare-poss.js +12 -0
- package/node/point-on-shape/compare-poss.js.map +1 -1
- package/node/point-on-shape/get-osculating-circle.d.ts +5 -6
- package/node/point-on-shape/get-osculating-circle.js +17 -20
- package/node/point-on-shape/get-osculating-circle.js.map +1 -1
- package/node/point-on-shape/get-pos-corner.d.ts +18 -4
- package/node/point-on-shape/get-pos-corner.js +6 -6
- package/node/point-on-shape/get-pos-corner.js.map +1 -1
- package/node/point-on-shape/is-pos-corner.d.ts +3 -2
- package/node/point-on-shape/is-pos-corner.js.map +1 -1
- package/node/point-on-shape/is-pos-sharp-corner.d.ts +1 -12
- package/node/point-on-shape/is-pos-sharp-corner.js +4 -5
- package/node/point-on-shape/is-pos-sharp-corner.js.map +1 -1
- package/node/point-on-shape/point-on-shape.d.ts +43 -10
- package/node/point-on-shape/pos-to-human-string.d.ts +1 -1
- package/node/point-on-shape/pos-to-human-string.js.map +1 -1
- package/node/point-on-shape/to-p.d.ts +9 -0
- package/node/point-on-shape/to-p.js +13 -0
- package/node/point-on-shape/to-p.js.map +1 -0
- package/node/sat/add-debug-info.d.ts +2 -1
- package/node/sat/add-debug-info.js +2 -1
- package/node/sat/add-debug-info.js.map +1 -1
- package/node/sat/cull-non-cycles.d.ts +2 -1
- package/node/sat/cull-non-cycles.js +5 -3
- package/node/sat/cull-non-cycles.js.map +1 -1
- package/node/sat/cull.js +3 -4
- package/node/sat/cull.js.map +1 -1
- package/node/sat/get-leaves.d.ts +1 -1
- package/node/sat/get-leaves.js +1 -2
- package/node/sat/get-leaves.js.map +1 -1
- package/node/sat/get-sat-culls.d.ts +2 -2
- package/node/sat/get-sat-culls.js +3 -3
- package/node/sat/get-sat-culls.js.map +1 -1
- package/node/sat/to-scale-axis.d.ts +1 -1
- package/node/sat/to-scale-axis.js +2 -2
- package/node/sat/to-scale-axis.js.map +1 -1
- package/node/svg/get-loop-bounds.d.ts +8 -8
- package/node/svg/get-loop-bounds.js +34 -71
- package/node/svg/get-loop-bounds.js.map +1 -1
- package/node/svg/get-min-y-pos.d.ts +2 -3
- package/node/svg/get-min-y-pos.js +2 -2
- package/node/svg/get-min-y-pos.js.map +1 -1
- package/node/svg/get-shape-bounds.d.ts +6 -6
- package/node/svg/get-shape-bounds.js +6 -6
- package/node/svg/get-shape-bounds.js.map +1 -1
- package/node/utils/mutable.d.ts +4 -0
- package/node/utils/mutable.js +2 -0
- package/node/utils/mutable.js.map +1 -0
- package/node/utils/sum.js.map +1 -1
- package/node/utils/time-function-call.d.ts +14 -0
- package/node/utils/time-function-call.js +32 -0
- package/node/utils/time-function-call.js.map +1 -0
- package/node/vertex/remove-vertex.d.ts +1 -0
- package/node/vertex/remove-vertex.js +1 -1
- package/node/vertex/remove-vertex.js.map +1 -1
- package/package.json +11 -13
- package/src/add-n-prong.ts/join-spokes.ts +8 -6
- package/src/closest-boundary-point/{cull-bezier-pieces.ts → cull-bezier-pieces-1.ts} +7 -7
- package/src/closest-boundary-point/cull-by-loose-bounding-box.ts +15 -14
- package/src/closest-boundary-point/cull-by-tight-boundary-box.ts +2 -2
- package/src/closest-boundary-point/foot-and-endpoint-info.ts +8 -10
- package/src/closest-boundary-point/get-best-distance-squared.ts +18 -15
- package/src/closest-boundary-point/get-close-boundary-points-certified.ts +29 -33
- package/src/closest-boundary-point/get-potential-closest-points-on-curve-certified.ts +15 -90
- package/src/closest-boundary-point/root-interval-to-distance-squared-interval.ts +5 -5
- package/src/corner/compare-curvatures-at-interface.ts +1 -1
- package/src/corner/corner.ts +7 -6
- package/src/corner/get-corner.ts +4 -11
- package/src/corner/get-interface-ccw.ts +5 -5
- package/src/cp-node/cp-node-fs.ts +0 -5
- package/src/cp-node/cp-node.ts +19 -12
- package/src/cp-node/fs/add-distance-from.ts +36 -37
- package/src/cp-node/fs/clone.ts +5 -4
- package/src/cp-node/fs/cp-node-comparator.ts +2 -2
- package/src/cp-node/fs/enhance-cp-node.ts +5 -5
- package/src/cp-node/fs/find-first.ts +14 -11
- package/src/cp-node/fs/get-all-on-loop.ts +5 -6
- package/src/cp-node/fs/get-boundary-bezier-parts-to-next.ts +3 -3
- package/src/cp-node/fs/get-cp-node-ordering.ts +4 -4
- package/src/cp-node/fs/get-edge-direction.ts +6 -8
- package/src/cp-node/fs/get-hole-closers.ts +1 -1
- package/src/cp-node/fs/get-implied-boundary-bezier-between.ts +2 -2
- package/src/cp-node/fs/get-mat-curve-between.ts +8 -6
- package/src/cp-node/fs/get-salience.ts +4 -4
- package/src/cp-node/fs/insert-cp-node.ts +10 -10
- package/src/cp-node/fs/is-on-same-circle.ts +1 -0
- package/src/cp-node/fs/is-one-prong.ts +3 -14
- package/src/cp-node/fs/is-order-correct.ts +6 -8
- package/src/cp-node/fs/is-sharp.ts +1 -1
- package/src/cp-node/fs/remove-cp-node.ts +4 -6
- package/src/cp-node/stringification/cp-node-stringifyable.ts +59 -0
- package/src/cp-node/stringification/from-stringifyable.ts +57 -0
- package/src/cp-node/stringification/loop-from-stringifyable.ts +15 -0
- package/src/cp-node/stringification/loop-stringifyable.ts +8 -0
- package/src/cp-node/stringification/loop-to-stringifyable.ts +14 -0
- package/src/cp-node/stringification/to-stringifyable.ts +67 -0
- package/src/debug/debug-elem-types.ts +2 -3
- package/src/{mat → debug}/elem-type-two-prong.ts +1 -1
- package/src/debug/functions/check-ordering.ts +13 -16
- package/src/debug/functions/cmp-cp-on-delta.ts +3 -3
- package/src/debug/functions/draw-elem/draw-cp-node.ts +2 -2
- package/src/debug/functions/draw-elem/draw-dull-corner.ts +2 -2
- package/src/debug/functions/draw-elem/draw-elem.ts +1 -5
- package/src/debug/functions/draw-elem/draw-leaves.ts +2 -2
- package/src/debug/functions/draw-elem/draw-max-vertex.ts +3 -3
- package/src/debug/functions/draw-elem/draw-one-prong-at-dull-corner.ts +17 -3
- package/src/debug/functions/draw-elem/draw-one-prong.ts +10 -8
- package/src/debug/functions/draw-elem/draw-sharp-corner.ts +4 -3
- package/src/debug/functions/draw-elem/draw-three-prong.ts +2 -2
- package/src/debug/functions/draw-elem/draw-two-prong.ts +4 -3
- package/src/debug/functions/draw-elem/draw-vertex.ts +1 -1
- package/src/debug/functions/draw-elem/one-prong-at-dull-corner.ts +2 -2
- package/src/debug/functions/general.ts +1 -1
- package/src/debug/functions/three-prong.ts +220 -220
- package/src/find-2-prong/add-1-prong.ts +8 -8
- package/src/find-2-prong/add-2-prong.ts +64 -58
- package/src/find-2-prong/calc-seperation-tolerance.ts +4 -8
- package/src/find-2-prong/cull-bezier-pieces.ts +41 -21
- package/src/find-2-prong/find-2-prong.ts +102 -151
- package/src/find-2-prong/find-and-add-2-prong.ts +23 -23
- package/src/find-2-prong/find-and-add-2-prongs-on-all-loops.ts +4 -6
- package/src/find-2-prong/find-and-add-2-prongs.ts +44 -29
- package/src/find-2-prong/find-and-add-hole-closing-2-prongs.ts +15 -15
- package/src/find-2-prong/get-initial-bezier-pieces.ts +21 -24
- package/src/find-2-prong/get-initial-x.ts +52 -0
- package/src/find-2-prong/get-medial/antipodal-point.ts +12 -0
- package/src/find-2-prong/get-medial/get-antipodal-points.ts +63 -0
- package/src/find-2-prong/get-medial/get-closest-points.ts +213 -0
- package/src/find-2-prong/reduce-radius.ts +38 -61
- package/src/find-2-prong/x-for-debugging.ts +9 -9
- package/src/{find-3-prong.ts → find-3-prong}/calc-better-x.ts +18 -11
- package/src/{find-3-prong.ts → find-3-prong}/calc-initial-3-prong-center.ts +12 -14
- package/src/{find-3-prong.ts → find-3-prong}/find-3-prong-for-delta3s.ts +46 -51
- package/src/find-3-prong/find-3-prong.ts +52 -0
- package/src/{find-3-prong.ts → find-3-prong}/find-and-add-3-prong.ts +2 -2
- package/src/{find-3-prong.ts → find-3-prong}/find-and-add-3-prongs.ts +1 -1
- package/src/{find-3-prong.ts → find-3-prong}/get-closest-points.ts +8 -5
- package/src/find-3-prong/three-prong-info.ts +13 -0
- package/src/find-mat/clip-options.ts +11 -16
- package/src/find-mat/create-initial-cp-tree.ts +28 -33
- package/src/find-mat/find-mat.ts +10 -17
- package/src/find-mat/find-mats.ts +11 -9
- package/src/find-mat/fix-ordering.ts +58 -58
- package/src/find-mat/get-dull-corners-on-loop.ts +12 -10
- package/src/find-mat/get-for-1-prongs-on-loop.ts +11 -33
- package/src/find-mat/get-for-2-prongs-on-loop.ts +9 -12
- package/src/find-mat/get-meta.ts +22 -19
- package/src/find-mat/get-sharp-corners.ts +7 -8
- package/src/find-mat/mat-options.ts +22 -19
- package/src/floyd-warshall/floyd-warshall.ts +1 -1
- package/src/floyd-warshall/get-graph.ts +2 -2
- package/src/floyd-warshall/get-hole-closer-pairs.ts +6 -6
- package/src/geometry/circle.ts +6 -12
- package/src/geometry/get-closest-square-distance-to-rect.ts +3 -8
- package/src/geometry/get-closest-squared-distance-to-rotated-rect.ts +3 -2
- package/src/index.ts +3 -11
- package/src/loop/get-max-coordinate.ts +8 -9
- package/src/mat/add-to-cp-tree.ts +10 -11
- package/src/mat/clone-mat.ts +8 -4
- package/src/mat/clone-meta.ts +22 -10
- package/src/mat/create-new-cp-trees.ts +35 -0
- package/src/mat/curve-piece.ts +4 -4
- package/src/mat/get-boundary-piece-beziers.ts +156 -40
- package/src/mat/get-branches.ts +1 -1
- package/src/mat/get-closeby-cp-if-exist.ts +11 -12
- package/src/mat/get-cp-node-to-left-or-same.ts +5 -5
- package/src/mat/get-largest-3-prong.ts +2 -2
- package/src/mat/get-largest-vertex.ts +2 -2
- package/src/mat/mat-meta.ts +7 -6
- package/src/mat/mat.ts +5 -5
- package/src/mat/simplify-mat.ts +20 -17
- package/src/mat/trim-mat.ts +6 -4
- package/src/point-on-shape/calc-pos-order.ts +10 -11
- package/src/point-on-shape/compare-poss.ts +11 -1
- package/src/point-on-shape/get-osculating-circle.ts +25 -28
- package/src/point-on-shape/get-pos-corner.ts +14 -12
- package/src/point-on-shape/is-pos-corner.ts +1 -4
- package/src/point-on-shape/is-pos-dull-corner.ts +9 -9
- package/src/point-on-shape/is-pos-quite-dull-corner.ts +7 -6
- package/src/point-on-shape/is-pos-quite-sharp-corner.ts +7 -6
- package/src/point-on-shape/is-pos-sharp-corner.ts +6 -5
- package/src/point-on-shape/point-on-shape.ts +48 -10
- package/src/point-on-shape/pos-to-human-string.ts +4 -2
- package/src/point-on-shape/to-p.ts +19 -0
- package/src/sat/add-debug-info.ts +3 -3
- package/src/sat/cull-non-cycles.ts +8 -6
- package/src/sat/cull.ts +7 -8
- package/src/sat/get-leaves.ts +2 -4
- package/src/sat/get-sat-culls.ts +6 -5
- package/src/sat/to-scale-axis.ts +4 -5
- package/src/svg/get-loop-bounds.ts +63 -89
- package/src/svg/get-min-y-pos.ts +3 -4
- package/src/svg/get-shape-bounds.ts +12 -12
- package/src/sweep-line/are-boxes-intersecting.ts +3 -2
- package/src/utils/mutable.ts +7 -0
- package/src/utils/rad-to-deg.ts +1 -1
- package/src/utils/smart-log.ts +20 -0
- package/src/utils/sum.ts +3 -1
- package/src/utils/time-function-call.ts +53 -0
- package/src/vertex/remove-vertex.ts +1 -3
- package/.eslintrc.cjs +0 -69
- package/__tests__/cp-node/fs/add-distance-from.spec.ts +0 -7
- package/__tests__/cp-node/fs/cp-nodes-to-boundary-beziers.spec.ts +0 -7
- package/__tests__/cp-node/fs/create-cp-node.spec.ts +0 -7
- package/__tests__/cp-node/fs/enhance-cp-node.spec.ts +0 -7
- package/__tests__/cp-node/fs/get-avg-speed.spec.ts +0 -7
- package/__tests__/cp-node/fs/get-smoothed-speed.spec.ts +0 -7
- package/__tests__/cp-node/fs/get-smoothed.spec.ts +0 -7
- package/__tests__/cp-node/fs/get-speed.spec.ts +0 -7
- package/__tests__/cp-node/fs/is-order-correct.spec.ts +0 -7
- package/__tests__/jsog/get-mats1.ts +0 -41
- package/node/bezier/fit-quads-to-cubic.d.ts +0 -19
- package/node/bezier/fit-quads-to-cubic.js +0 -83
- package/node/bezier/fit-quads-to-cubic.js.map +0 -1
- package/node/bezier/total-curvature.d.ts +0 -14
- package/node/bezier/total-curvature.js +0 -5
- package/node/bezier/total-curvature.js.map +0 -1
- package/node/bezier/total-length.d.ts +0 -14
- package/node/bezier/total-length.js +0 -5
- package/node/bezier/total-length.js.map +0 -1
- package/node/closest-boundary-point/cull-bezier-pieces.d.ts +0 -10
- package/node/closest-boundary-point/cull-bezier-pieces.js.map +0 -1
- package/node/closest-boundary-point/dd-deflate-with-running-error.d.ts +0 -25
- package/node/closest-boundary-point/dd-deflate-with-running-error.js +0 -68
- package/node/closest-boundary-point/dd-deflate-with-running-error.js.map +0 -1
- package/node/contact-point/contact-point.d.ts +0 -26
- package/node/contact-point/contact-point.js +0 -22
- package/node/contact-point/contact-point.js.map +0 -1
- package/node/cp-node/fs/get-smoothed-speed.d.ts +0 -14
- package/node/cp-node/fs/get-smoothed-speed.js +0 -75
- package/node/cp-node/fs/get-smoothed-speed.js.map +0 -1
- package/node/cp-node/fs/get-speed.d.ts +0 -15
- package/node/cp-node/fs/get-speed.js +0 -39
- package/node/cp-node/fs/get-speed.js.map +0 -1
- package/node/curve/curve.d.ts +0 -33
- package/node/curve/curve.js +0 -2
- package/node/curve/curve.js.map +0 -1
- package/node/debug/cp-node-for-debugging.d.ts +0 -11
- package/node/debug/cp-node-for-debugging.js +0 -2
- package/node/debug/cp-node-for-debugging.js.map +0 -1
- package/node/debug/functions/draw-elem/draw-speed.d.ts +0 -4
- package/node/debug/functions/draw-elem/draw-speed.js +0 -21
- package/node/debug/functions/draw-elem/draw-speed.js.map +0 -1
- package/node/error-analysis/gamma.d.ts +0 -26
- package/node/error-analysis/gamma.js +0 -35
- package/node/error-analysis/gamma.js.map +0 -1
- package/node/find-2-prong/find-and-add-2-prong.d.ts +0 -11
- package/node/find-2-prong/find-and-add-2-prong.js +0 -19
- package/node/find-2-prong/find-and-add-2-prong.js.map +0 -1
- package/node/find-2-prong/find-equidistant-point-on-line-dd.d.ts +0 -10
- package/node/find-2-prong/find-equidistant-point-on-line-dd.js +0 -56
- package/node/find-2-prong/find-equidistant-point-on-line-dd.js.map +0 -1
- package/node/find-3-prong.ts/calc-better-x.d.ts +0 -19
- package/node/find-3-prong.ts/calc-better-x.js.map +0 -1
- package/node/find-3-prong.ts/calc-initial-3-prong-center.d.ts +0 -13
- package/node/find-3-prong.ts/calc-initial-3-prong-center.js +0 -27
- package/node/find-3-prong.ts/calc-initial-3-prong-center.js.map +0 -1
- package/node/find-3-prong.ts/find-3-prong-for-delta3s.d.ts +0 -22
- package/node/find-3-prong.ts/find-3-prong-for-delta3s.js.map +0 -1
- package/node/find-3-prong.ts/find-3-prong.d.ts +0 -16
- package/node/find-3-prong.ts/find-3-prong.js.map +0 -1
- package/node/find-3-prong.ts/find-and-add-3-prong.js.map +0 -1
- package/node/find-3-prong.ts/find-and-add-3-prongs-on-loop.js.map +0 -1
- package/node/find-3-prong.ts/find-and-add-3-prongs.js.map +0 -1
- package/node/find-3-prong.ts/get-closest-points.d.ts +0 -9
- package/node/find-3-prong.ts/get-closest-points.js.map +0 -1
- package/node/mat/connect-hole-closers.d.ts +0 -3
- package/node/mat/connect-hole-closers.js +0 -5
- package/node/mat/connect-hole-closers.js.map +0 -1
- package/node/mat/create-new-cp-tree.d.ts +0 -9
- package/node/mat/create-new-cp-tree.js +0 -23
- package/node/mat/create-new-cp-tree.js.map +0 -1
- package/node/memoize-primitive.d.ts +0 -11
- package/node/memoize-primitive.js +0 -25
- package/node/memoize-primitive.js.map +0 -1
- package/node/point-on-shape/create-pos.d.ts +0 -4
- package/node/point-on-shape/create-pos.js +0 -11
- package/node/point-on-shape/create-pos.js.map +0 -1
- package/node/point-on-shape/is-pos-quite-sharp-corner.d.ts +0 -17
- package/node/point-on-shape/is-pos-quite-sharp-corner.js +0 -14
- package/node/point-on-shape/is-pos-quite-sharp-corner.js.map +0 -1
- package/src/bezier/fit-quads-to-cubic.ts +0 -103
- package/src/bezier/total-curvature.ts +0 -8
- package/src/bezier/total-length.ts +0 -8
- package/src/closest-boundary-point/closest-points-on-curve-precise.ts +0 -75
- package/src/closest-boundary-point/closest-points-on-curve.ts +0 -72
- package/src/closest-boundary-point/dd-deflate-with-running-error.ts +0 -88
- package/src/contact-point/contact-point.ts +0 -42
- package/src/cp-node/fs/get-avg-speed.ts +0 -31
- package/src/cp-node/fs/get-smoothed-speed.ts +0 -97
- package/src/cp-node/fs/get-smoothed.ts +0 -62
- package/src/cp-node/fs/get-speed.ts +0 -56
- package/src/curve/curve.ts +0 -37
- package/src/dbscan/dbscan.ts +0 -91
- package/src/debug/cp-node-for-debugging.ts +0 -15
- package/src/debug/functions/draw-elem/draw-speed.ts +0 -35
- package/src/debug/three-prong-for-debugging.ts +0 -58
- package/src/debug/two-prong-for-debugging.ts +0 -30
- package/src/dijkstra/dijkstra.ts +0 -418
- package/src/find-2-prong/find-and-add-2-prongs-on-all-paths.ts +0 -38
- package/src/find-2-prong/find-equidistant-point-on-line-dd.ts +0 -77
- package/src/find-2-prong/find-equidistant-point-on-line.ts +0 -40
- package/src/find-2-prong/pyth-trips.ts +0 -146
- package/src/find-3-prong.ts/add-3-prong.ts +0 -113
- package/src/find-3-prong.ts/array-set.ts +0 -47
- package/src/find-3-prong.ts/find-3-prong.ts +0 -48
- package/src/find-3-prong.ts/find-and-add-all-3-prongs.ts +0 -109
- package/src/find-mat/add-2-prongs-by-error.ts +0 -122
- package/src/find-mat/add-debug-info.ts +0 -93
- package/src/find-mat/cp-node-for-insertion.ts +0 -13
- package/src/find-mat/get-dull-corners.ts +0 -34
- package/src/find-mat/get-half-angles.ts +0 -95
- package/src/find-mat/get-size-params.ts +0 -34
- package/src/find-mat/get-total-by.ts +0 -27
- package/src/get-curve/get-curve-between.ts +0 -80
- package/src/get-curve/get-edge-direction.ts +0 -70
- package/src/mat/add-to-cp-graph.ts +0 -60
- package/src/mat/cmp-cp-on-delta.ts +0 -56
- package/src/mat/connect-hole-closers.ts +0 -9
- package/src/mat/create-new-cp-tree.ts +0 -32
- package/src/mat/get-edges-as-array.ts +0 -18
- package/src/mat/get-largest-three-prong.ts +0 -14
- package/src/mat/get-neighboring-cps.ts +0 -49
- package/src/mat/is-another-cp-closeby.ts +0 -69
- package/src/mat/simplify-mat-map-only.ts +0 -110
- package/src/memoize-primitive.ts +0 -31
- package/src/point-on-shape/create-pos.ts +0 -20
- package/src/sat/cull-by-salience.ts +0 -115
- package/src/svg/get-extreme.ts +0 -23
- package/src/utils/bezier-piece-to-bezier.ts +0 -13
- package/src/utils/sleep.ts +0 -7
- /package/node/{find-3-prong.ts → find-3-prong}/find-and-add-3-prong.d.ts +0 -0
- /package/node/{find-3-prong.ts → find-3-prong}/find-and-add-3-prongs-on-loop.d.ts +0 -0
- /package/node/{find-3-prong.ts → find-3-prong}/find-and-add-3-prongs-on-loop.js +0 -0
- /package/node/{find-3-prong.ts → find-3-prong}/find-and-add-3-prongs.d.ts +0 -0
- /package/src/{find-3-prong.ts → find-3-prong}/find-and-add-3-prongs-on-loop.ts +0 -0
|
@@ -0,0 +1,163 @@
|
|
|
1
|
+
import { lengthSquared } from "flo-vector2d";
|
|
2
|
+
import { roots, deflate, Horner } from 'flo-poly';
|
|
3
|
+
import { evalDeCasteljau, getMedialPointCoeffs, getMedialPointCoeffsBez0 } from 'flo-bezier3';
|
|
4
|
+
const { sqrt, abs, max } = Math;
|
|
5
|
+
/**
|
|
6
|
+
* @param maxCoordPowerOf2
|
|
7
|
+
* @param nnorm
|
|
8
|
+
* @param yPos The point on the shape
|
|
9
|
+
* @param for1Prong defaults to `false`;
|
|
10
|
+
* @param angle defaults to `0`;
|
|
11
|
+
* @param curvePiece The curve piece
|
|
12
|
+
*
|
|
13
|
+
* @internal
|
|
14
|
+
*/
|
|
15
|
+
function getClosestPoint(maxCoordPowerOf2, nnorm, yPos, for1Prong, angle, curvePiece) {
|
|
16
|
+
const { curve, ts: [tS, tE] } = curvePiece;
|
|
17
|
+
const { ps } = curve;
|
|
18
|
+
const { curve: touchedCurve, t, p: y } = yPos;
|
|
19
|
+
const shouldDeflate = angle === 0 && curve === touchedCurve;
|
|
20
|
+
const infos = [];
|
|
21
|
+
// let onePushed = false;
|
|
22
|
+
let startPushed = false;
|
|
23
|
+
let endPushed = false;
|
|
24
|
+
let ss;
|
|
25
|
+
if (tS !== tE) {
|
|
26
|
+
const { A, B, C, D, H } = getMedialPointCoeffs(y, nnorm, ps);
|
|
27
|
+
const def = shouldDeflate ? deflate(H, t) : undefined;
|
|
28
|
+
const def2 = for1Prong && shouldDeflate
|
|
29
|
+
? deflate(def, t)
|
|
30
|
+
: undefined;
|
|
31
|
+
const def3 = for1Prong && shouldDeflate
|
|
32
|
+
? deflate(def2, t)
|
|
33
|
+
: undefined;
|
|
34
|
+
const pDd = def3 ?? def ?? H;
|
|
35
|
+
ss = roots(pDd, tS, tE) || [];
|
|
36
|
+
//-----------------------
|
|
37
|
+
for (let i = 0; i < ss.length; i++) {
|
|
38
|
+
const ri = ss[i];
|
|
39
|
+
const { tS: sS, tE: sE, t: _s } = ri;
|
|
40
|
+
if (ri.multiplicity > 1) {
|
|
41
|
+
continue;
|
|
42
|
+
}
|
|
43
|
+
if (sE < tS || sS > tE) {
|
|
44
|
+
continue;
|
|
45
|
+
} // outside curve piece
|
|
46
|
+
const s = _s < 0 ? 0 : _s > 1 ? 1 : _s; // clip to [0,1]
|
|
47
|
+
//-----------------------
|
|
48
|
+
const AS = Horner(A, s);
|
|
49
|
+
const BS = Horner(B, s);
|
|
50
|
+
const CS = Horner(C, s);
|
|
51
|
+
const DS = Horner(D, s);
|
|
52
|
+
const _AS = abs(AS);
|
|
53
|
+
const _CS = abs(CS);
|
|
54
|
+
if (max(_AS, _CS) < 2 ** -40) {
|
|
55
|
+
continue;
|
|
56
|
+
}
|
|
57
|
+
const w = _AS > _CS
|
|
58
|
+
? -BS / AS
|
|
59
|
+
: -DS / CS; // alternative
|
|
60
|
+
if (w <= 0) {
|
|
61
|
+
// If `w` is negative the circle radius is negative -> discard
|
|
62
|
+
continue;
|
|
63
|
+
}
|
|
64
|
+
const V = [w * nnorm[0], w * nnorm[1]];
|
|
65
|
+
const d = sqrt(lengthSquared(V));
|
|
66
|
+
if (d <= 2 ** (maxCoordPowerOf2 - 40)) {
|
|
67
|
+
// If `w` <= 2**-40 -> discard
|
|
68
|
+
continue;
|
|
69
|
+
}
|
|
70
|
+
const x = [y[0] + V[0], y[1] + V[1]];
|
|
71
|
+
//-----------------------
|
|
72
|
+
if (ri.tS <= tS && ri.tE >= tS) {
|
|
73
|
+
startPushed = true;
|
|
74
|
+
}
|
|
75
|
+
if (ri.tS <= tE && ri.tE >= tE) {
|
|
76
|
+
endPushed = true;
|
|
77
|
+
}
|
|
78
|
+
// If the point is the first control point of the curve then we
|
|
79
|
+
// ensure the point becomes the last control point of the prior
|
|
80
|
+
// curve to induce some symmetery and simplify the algorithm.
|
|
81
|
+
const s_ = s === 0 ? 1 : s;
|
|
82
|
+
const curve_ = s === 0 ? curve.prev : curve;
|
|
83
|
+
const info = {
|
|
84
|
+
curve: curve_,
|
|
85
|
+
s: s_,
|
|
86
|
+
d, x
|
|
87
|
+
};
|
|
88
|
+
infos.push(info);
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
//------------------------------------------
|
|
92
|
+
const pLast = ps[ps.length - 1];
|
|
93
|
+
let dontPush1 = ((t === 0 && curve === touchedCurve.prev) ||
|
|
94
|
+
(t === 1 && curve === touchedCurve));
|
|
95
|
+
//--------------------------------------
|
|
96
|
+
// Also check curve start control point
|
|
97
|
+
//--------------------------------------
|
|
98
|
+
const PS = [];
|
|
99
|
+
if (tS === 0) {
|
|
100
|
+
// We never check points at `t === 0` since they are covered by the previous curve's endpoint
|
|
101
|
+
// which cannot be culled if this curve`s `t === 0` is included
|
|
102
|
+
}
|
|
103
|
+
else if (tS === 1) {
|
|
104
|
+
if (!dontPush1 && !startPushed) {
|
|
105
|
+
PS.push({ P: pLast, t: 1 });
|
|
106
|
+
}
|
|
107
|
+
}
|
|
108
|
+
else {
|
|
109
|
+
if (!startPushed) {
|
|
110
|
+
const pp = evalDeCasteljau(ps, tS);
|
|
111
|
+
PS.push({ P: pp, t: tS });
|
|
112
|
+
}
|
|
113
|
+
}
|
|
114
|
+
//--------------------------------------
|
|
115
|
+
// Also check curve end control point
|
|
116
|
+
//--------------------------------------
|
|
117
|
+
if (tS !== tE) {
|
|
118
|
+
if (tE === 0) {
|
|
119
|
+
// We never check points at `t === 0` since they are covered by the previous curve's endpoint
|
|
120
|
+
// which cannot be culled if this curve`s `t === 0` is included
|
|
121
|
+
}
|
|
122
|
+
else if (tE === 1) {
|
|
123
|
+
if (!dontPush1 && !endPushed) {
|
|
124
|
+
PS.push({ P: pLast, t: 1 });
|
|
125
|
+
dontPush1 = true;
|
|
126
|
+
}
|
|
127
|
+
}
|
|
128
|
+
else {
|
|
129
|
+
if (!endPushed) {
|
|
130
|
+
const pp = evalDeCasteljau(ps, tE);
|
|
131
|
+
PS.push({ P: pp, t: tE });
|
|
132
|
+
}
|
|
133
|
+
}
|
|
134
|
+
}
|
|
135
|
+
//------------------------------------------
|
|
136
|
+
for (let i = 0; i < PS.length; i++) {
|
|
137
|
+
//-----------------------
|
|
138
|
+
const { P, t: s } = PS[i];
|
|
139
|
+
const { a0, b0 } = getMedialPointCoeffsBez0(y, nnorm, P);
|
|
140
|
+
if (abs(a0) <= 2 ** -40 || abs(b0) <= 2 ** -40) {
|
|
141
|
+
continue;
|
|
142
|
+
}
|
|
143
|
+
const w = -b0 / a0;
|
|
144
|
+
// too close to point of origin *or* negative;
|
|
145
|
+
if (w < 2 ** -40) {
|
|
146
|
+
continue;
|
|
147
|
+
}
|
|
148
|
+
const V = [w * nnorm[0], w * nnorm[1]];
|
|
149
|
+
const d = sqrt(lengthSquared(V));
|
|
150
|
+
const x = [y[0] + V[0], y[1] + V[1]];
|
|
151
|
+
const s_ = s === 0 ? 1 : s;
|
|
152
|
+
const curve_ = s === 0 ? curve.prev : curve;
|
|
153
|
+
const info = {
|
|
154
|
+
curve: curve_,
|
|
155
|
+
s: s_,
|
|
156
|
+
d, x
|
|
157
|
+
};
|
|
158
|
+
infos.push(info);
|
|
159
|
+
}
|
|
160
|
+
return infos;
|
|
161
|
+
}
|
|
162
|
+
export { getClosestPoint };
|
|
163
|
+
//# sourceMappingURL=get-closest-points.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"get-closest-points.js","sourceRoot":"","sources":["../../../src/find-2-prong/get-medial/get-closest-points.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,oBAAoB,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAC;AAE9F,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;AAGhC;;;;;;;;;GASG;AACH,SAAS,eAAe,CAChB,gBAAwB,EACxB,KAAe,EACf,IAAqB,EACrB,SAAkB,EAClB,KAAa,EACb,UAAsB;IAE1B,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,EAAE,EAAC,EAAE,CAAC,EAAE,GAAG,UAAU,CAAC;IAC1C,MAAM,EAAE,EAAE,EAAE,GAAG,KAAK,CAAC;IACrB,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,IAAI,CAAC;IAE9C,MAAM,aAAa,GAAG,KAAK,KAAK,CAAC,IAAI,KAAK,KAAK,YAAY,CAAC;IAE5D,MAAM,KAAK,GAAqB,EAAE,CAAC;IACnC,yBAAyB;IACzB,IAAI,WAAW,GAAG,KAAK,CAAC;IACxB,IAAI,SAAS,GAAG,KAAK,CAAC;IAEtB,IAAI,EAAkB,CAAC;IACvB,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;QACZ,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,oBAAoB,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;QAE7D,MAAM,GAAG,GAAG,aAAa,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,CAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAEvD,MAAM,IAAI,GAAG,SAAS,IAAI,aAAa;YACnC,CAAC,CAAC,OAAO,CAAC,GAAI,EAAE,CAAE,CAAC;YACnB,CAAC,CAAC,SAAS,CAAC;QAEhB,MAAM,IAAI,GAAG,SAAS,IAAI,aAAa;YACnC,CAAC,CAAC,OAAO,CAAC,IAAK,EAAE,CAAE,CAAC;YACpB,CAAC,CAAC,SAAS,CAAC;QAEhB,MAAM,GAAG,GAAG,IAAI,IAAI,GAAG,IAAI,CAAC,CAAC;QAE7B,EAAE,GAAG,KAAK,CAAC,GAAG,EAAE,EAAE,EAAE,EAAE,CAAC,IAAI,EAAE,CAAC;QAC9B,yBAAyB;QAEzB,KAAK,IAAI,CAAC,GAAC,CAAC,EAAE,CAAC,GAAC,EAAE,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAC7B,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC;YACjB,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,CAAC;YACrC,IAAI,EAAE,CAAC,YAAY,GAAG,CAAC,EAAE,CAAC;gBACtB,SAAS;YACb,CAAC;YAED,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,CAAC;gBAAC,SAAS;YAAC,CAAC,CAAE,sBAAsB;YAE7D,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAE,gBAAgB;YAEzD,yBAAyB;YACzB,MAAM,EAAE,GAAG,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YACxB,MAAM,EAAE,GAAG,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YACxB,MAAM,EAAE,GAAG,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YACxB,MAAM,EAAE,GAAG,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YAExB,MAAM,GAAG,GAAG,GAAG,CAAC,EAAE,CAAC,CAAC;YACpB,MAAM,GAAG,GAAG,GAAG,CAAC,EAAE,CAAC,CAAC;YAEpB,IAAI,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,CAAC,IAAE,CAAC,EAAE,EAAE,CAAC;gBAAC,SAAS;YAAC,CAAC;YAEzC,MAAM,CAAC,GAAG,GAAG,GAAG,GAAG;gBACf,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE;gBACV,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,CAAE,cAAc;YAE/B,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;gBACT,8DAA8D;gBAC9D,SAAS;YACb,CAAC;YAED,MAAM,CAAC,GAAG,CAAC,CAAC,GAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,GAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;YACnC,MAAM,CAAC,GAAG,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;YAEjC,IAAI,CAAC,IAAI,CAAC,IAAE,CAAC,gBAAgB,GAAG,EAAE,CAAC,EAAE,CAAC;gBAClC,8BAA8B;gBAC9B,SAAS;YACb,CAAC;YAED,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACrC,yBAAyB;YAEzB,IAAI,EAAE,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,CAAC;gBAC7B,WAAW,GAAG,IAAI,CAAC;YACvB,CAAC;YACD,IAAI,EAAE,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,CAAC;gBAC7B,SAAS,GAAG,IAAI,CAAC;YACrB,CAAC;YAGD,+DAA+D;YAC/D,+DAA+D;YAC/D,6DAA6D;YAC7D,MAAM,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAC3B,MAAM,MAAM,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC;YAE5C,MAAM,IAAI,GAAmB;gBACzB,KAAK,EAAE,MAAM;gBACb,CAAC,EAAE,EAAE;gBACL,CAAC,EAAE,CAAC;aACP,CAAC;YAEF,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACrB,CAAC;IACL,CAAC;IAID,4CAA4C;IAC5C,MAAM,KAAK,GAAG,EAAE,CAAC,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAEhC,IAAI,SAAS,GAAG,CACZ,CAAC,CAAC,KAAK,CAAC,IAAI,KAAK,KAAK,YAAa,CAAC,IAAI,CAAC;QACzC,CAAC,CAAC,KAAK,CAAC,IAAI,KAAK,KAAK,YAAY,CAAC,CACtC,CAAC;IAGF,wCAAwC;IACxC,uCAAuC;IACvC,wCAAwC;IACxC,MAAM,EAAE,GAAiC,EAAE,CAAC;IAC5C,IAAI,EAAE,KAAK,CAAC,EAAE,CAAC;QACX,6FAA6F;QAC7F,+DAA+D;IACnE,CAAC;SAAM,IAAI,EAAE,KAAK,CAAC,EAAE,CAAC;QAClB,IAAI,CAAC,SAAS,IAAI,CAAC,WAAW,EAAE,CAAC;YAC7B,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;QAChC,CAAC;IACL,CAAC;SAAM,CAAC;QACJ,IAAI,CAAC,WAAW,EAAE,CAAC;YACf,MAAM,EAAE,GAAG,eAAe,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;YACnC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;QAC9B,CAAC;IACL,CAAC;IAED,wCAAwC;IACxC,qCAAqC;IACrC,wCAAwC;IACxC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;QACZ,IAAI,EAAE,KAAK,CAAC,EAAE,CAAC;YACX,6FAA6F;YAC7F,+DAA+D;QACnE,CAAC;aAAM,IAAI,EAAE,KAAK,CAAC,EAAE,CAAC;YAClB,IAAI,CAAC,SAAS,IAAI,CAAC,SAAS,EAAE,CAAC;gBAC3B,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;gBAAC,SAAS,GAAG,IAAI,CAAC;YAClD,CAAC;QACL,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,SAAS,EAAE,CAAC;gBACb,MAAM,EAAE,GAAG,eAAe,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;gBACnC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;YAC9B,CAAC;QACL,CAAC;IACL,CAAC;IACD,4CAA4C;IAG5C,KAAK,IAAI,CAAC,GAAC,CAAC,EAAE,CAAC,GAAC,EAAE,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAC7B,yBAAyB;QACzB,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC;QAC1B,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,wBAAwB,CAAC,CAAC,EAAC,KAAK,EAAC,CAAC,CAAC,CAAC;QAEvD,IAAI,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,IAAE,CAAC,EAAE,IAAI,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,IAAE,CAAC,EAAE,EAAE,CAAC;YACzC,SAAS;QACb,CAAC;QAED,MAAM,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,CAAC;QAEnB,8CAA8C;QAC9C,IAAI,CAAC,GAAG,CAAC,IAAE,CAAC,EAAE,EAAE,CAAC;YACb,SAAS;QACb,CAAC;QAED,MAAM,CAAC,GAAG,CAAC,CAAC,GAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,GAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QACnC,MAAM,CAAC,GAAG,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;QAEjC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAErC,MAAM,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC3B,MAAM,MAAM,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC;QAE5C,MAAM,IAAI,GAAmB;YACzB,KAAK,EAAE,MAAM;YACb,CAAC,EAAE,EAAE;YACL,CAAC,EAAE,CAAC;SACP,CAAC;QAEF,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACrB,CAAC;IAED,OAAO,KAAK,CAAC;AACjB,CAAC;AAGD,OAAO,EAAE,eAAe,EAAE,CAAA"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { CurvePiece } from '../mat/curve-piece.js';
|
|
1
|
+
import type { CurvePiece } from '../mat/curve-piece.js';
|
|
2
2
|
/**
|
|
3
|
-
* @internal
|
|
4
|
-
*
|
|
5
3
|
* Reduces the circle radius initially as an optimization step.
|
|
4
|
+
*
|
|
5
|
+
* @internal
|
|
6
6
|
*/
|
|
7
|
-
declare function reduceRadius(
|
|
7
|
+
declare function reduceRadius(maxCoordPowerOf2: number, curvePieces: CurvePiece[], y: number[], nnorm: number[]): number;
|
|
8
8
|
export { reduceRadius };
|
|
@@ -1,63 +1,43 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
1
|
+
import { getMedialPointCoeffsBez0 } from "flo-bezier3";
|
|
2
|
+
import { lengthSquared, squaredDistanceBetween } from "flo-vector2d";
|
|
3
|
+
const { abs } = Math;
|
|
4
|
+
const TOLERANCE = 1 + 2 ** -20;
|
|
3
5
|
/**
|
|
4
|
-
* @internal
|
|
5
|
-
*
|
|
6
6
|
* Reduces the circle radius initially as an optimization step.
|
|
7
|
+
*
|
|
8
|
+
* @internal
|
|
7
9
|
*/
|
|
8
|
-
function reduceRadius(
|
|
9
|
-
|
|
10
|
-
let
|
|
10
|
+
function reduceRadius(maxCoordPowerOf2, curvePieces, y, nnorm) {
|
|
11
|
+
let minRadius = Infinity;
|
|
12
|
+
let x = [y[0] + nnorm[0], y[1] + nnorm[1]];
|
|
11
13
|
for (let i = 0; i < curvePieces.length; i++) {
|
|
12
14
|
const curvePiece = curvePieces[i];
|
|
13
|
-
const ps = curvePiece.curve
|
|
14
|
-
|
|
15
|
-
const
|
|
16
|
-
for (
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
15
|
+
const { ps } = curvePiece.curve;
|
|
16
|
+
const pS = ps[0];
|
|
17
|
+
const pE = ps[ps.length - 1];
|
|
18
|
+
for (const P of [pS, pE]) {
|
|
19
|
+
if (squaredDistanceBetween(x, P) > minRadius) {
|
|
20
|
+
continue; // short-circuit
|
|
21
|
+
}
|
|
22
|
+
const { a0, b0 } = getMedialPointCoeffsBez0(y, nnorm, P);
|
|
23
|
+
if (abs(a0) <= 2 ** -40 || abs(b0) <= 2 ** -40) {
|
|
24
|
+
continue;
|
|
25
|
+
}
|
|
26
|
+
const w = -b0 / a0;
|
|
27
|
+
// too close to point of origin *or* negative;
|
|
28
|
+
if (w < 2 ** -40) {
|
|
29
|
+
continue;
|
|
30
|
+
}
|
|
31
|
+
const N = [w * nnorm[0], w * nnorm[1]];
|
|
32
|
+
const r = lengthSquared(N);
|
|
33
|
+
if (r < minRadius) {
|
|
34
|
+
minRadius = r;
|
|
35
|
+
x = [y[0] + N[0], y[1] + N[1]];
|
|
24
36
|
}
|
|
25
37
|
}
|
|
26
38
|
}
|
|
27
39
|
// The extra bit is to account for floating point precision.
|
|
28
40
|
return TOLERANCE * minRadius;
|
|
29
41
|
}
|
|
30
|
-
/**
|
|
31
|
-
* @internal
|
|
32
|
-
* @param p A point on the circle with normal pointing to x towards the center
|
|
33
|
-
* of the circle.
|
|
34
|
-
* @param x
|
|
35
|
-
* @param p1 Another point on the circle.
|
|
36
|
-
*/
|
|
37
|
-
function getCircleCenterFrom2PointsAndNormal(extreme, p, x, p1) {
|
|
38
|
-
const TOLERANCE = (2 ** -14 * extreme) ** 2;
|
|
39
|
-
// Ignore if p and p1 are too close together
|
|
40
|
-
if (squaredDistanceBetween(p, p1) < TOLERANCE) {
|
|
41
|
-
return undefined;
|
|
42
|
-
}
|
|
43
|
-
/** The perpindicular bisector between the two given points on the circle */
|
|
44
|
-
const pb = [
|
|
45
|
-
(p[0] + p1[0]) / 2,
|
|
46
|
-
(p[1] + p1[1]) / 2,
|
|
47
|
-
];
|
|
48
|
-
const tan = [p1[0] - p[0], p1[1] - p[1]];
|
|
49
|
-
const norm = [-tan[1], tan[0]]; // Rotate by 90 degrees
|
|
50
|
-
const pb2 = [pb[0] + norm[0], pb[1] + norm[1]];
|
|
51
|
-
const res = lineLineIntersection([p, x], [pb, pb2]);
|
|
52
|
-
if (!res) {
|
|
53
|
-
return undefined;
|
|
54
|
-
}
|
|
55
|
-
const resO = [res[0] - p[0], res[1] - p[1]];
|
|
56
|
-
const xO = [x[0] - p[0], x[1] - p[1]];
|
|
57
|
-
if (dot(resO, xO) < 0) {
|
|
58
|
-
return undefined;
|
|
59
|
-
}
|
|
60
|
-
return res;
|
|
61
|
-
}
|
|
62
42
|
export { reduceRadius };
|
|
63
43
|
//# sourceMappingURL=reduce-radius.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reduce-radius.js","sourceRoot":"","sources":["../../src/find-2-prong/reduce-radius.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"reduce-radius.js","sourceRoot":"","sources":["../../src/find-2-prong/reduce-radius.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AAErE,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;AAGrB,MAAM,SAAS,GAAG,CAAC,GAAG,CAAC,IAAE,CAAC,EAAE,CAAC;AAG7B;;;;GAIG;AACH,SAAS,YAAY,CACb,gBAAwB,EACxB,WAAyB,EACzB,CAAW,EACX,KAAe;IAEnB,IAAI,SAAS,GAAG,QAAQ,CAAC;IACzB,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IAE3C,KAAK,IAAI,CAAC,GAAC,CAAC,EAAE,CAAC,GAAC,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACtC,MAAM,UAAU,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;QAElC,MAAM,EAAE,EAAE,EAAE,GAAG,UAAU,CAAC,KAAK,CAAC;QAEhC,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC;QACjB,MAAM,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QAE7B,KAAK,MAAM,CAAC,IAAI,CAAC,EAAE,EAAC,EAAE,CAAC,EAAE,CAAC;YACtB,IAAI,sBAAsB,CAAC,CAAC,EAAC,CAAC,CAAC,GAAG,SAAS,EAAE,CAAC;gBAC1C,SAAS,CAAE,gBAAgB;YAC/B,CAAC;YAED,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,wBAAwB,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;YAEzD,IAAI,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,IAAE,CAAC,EAAE,IAAI,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,IAAE,CAAC,EAAE,EAAE,CAAC;gBACzC,SAAS;YACb,CAAC;YAED,MAAM,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,CAAC;YAEnB,8CAA8C;YAC9C,IAAI,CAAC,GAAG,CAAC,IAAE,CAAC,EAAE,EAAE,CAAC;gBAAC,SAAS;YAAC,CAAC;YAE7B,MAAM,CAAC,GAAG,CAAC,CAAC,GAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,GAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;YACnC,MAAM,CAAC,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC;YAE3B,IAAI,CAAC,GAAG,SAAS,EAAE,CAAC;gBAChB,SAAS,GAAG,CAAC,CAAC;gBACd,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACnC,CAAC;QACL,CAAC;IACL,CAAC;IAED,4DAA4D;IAC5D,OAAO,SAAS,GAAC,SAAS,CAAC;AAC/B,CAAC;AAGD,OAAO,EAAE,YAAY,EAAE,CAAA"}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
import type { PrePointOnShape } from '../point-on-shape/point-on-shape.js';
|
|
2
|
+
import type { CurvePiece } from '../mat/curve-piece.js';
|
|
3
|
+
/**
|
|
4
|
+
* Find new `x` and `ps` that are better estimates of the 3-prong circle.
|
|
5
|
+
*
|
|
6
|
+
* The potential function, V, is defined as the distance to the actual 3 prong
|
|
7
|
+
* circle center.
|
|
8
|
+
*
|
|
9
|
+
* @param maxCoordPowerOf2
|
|
10
|
+
* @param curvePiece3s The three boundary pieces, each of which should contain
|
|
11
|
+
* a point of the 3-prong to be found.
|
|
12
|
+
* @param x The currently best guess at the center of the 3-prong circle.
|
|
13
|
+
* @param vectorToZeroV
|
|
14
|
+
*
|
|
15
|
+
* @internal
|
|
16
|
+
*/
|
|
17
|
+
declare function calcBetterX(maxCoordPowerOf2: number, curvePiece3s: CurvePiece[][], x: number[], vectorToZeroV: number[]): {
|
|
18
|
+
newX: number[];
|
|
19
|
+
newV: number;
|
|
20
|
+
newPoss: PrePointOnShape[];
|
|
21
|
+
};
|
|
22
|
+
export { calcBetterX };
|
|
@@ -1,17 +1,20 @@
|
|
|
1
1
|
import { fromTo, circumCenter, len, scale, translate } from 'flo-vector2d';
|
|
2
2
|
import { getClosestPoints } from './get-closest-points.js';
|
|
3
3
|
/**
|
|
4
|
-
*
|
|
5
|
-
*
|
|
4
|
+
* Find new `x` and `ps` that are better estimates of the 3-prong circle.
|
|
5
|
+
*
|
|
6
6
|
* The potential function, V, is defined as the distance to the actual 3 prong
|
|
7
7
|
* circle center.
|
|
8
|
+
*
|
|
9
|
+
* @param maxCoordPowerOf2
|
|
8
10
|
* @param curvePiece3s The three boundary pieces, each of which should contain
|
|
9
11
|
* a point of the 3-prong to be found.
|
|
10
12
|
* @param x The currently best guess at the center of the 3-prong circle.
|
|
11
13
|
* @param vectorToZeroV
|
|
12
|
-
*
|
|
14
|
+
*
|
|
15
|
+
* @internal
|
|
13
16
|
*/
|
|
14
|
-
function calcBetterX(curvePiece3s, x, vectorToZeroV) {
|
|
17
|
+
function calcBetterX(maxCoordPowerOf2, curvePiece3s, x, vectorToZeroV) {
|
|
15
18
|
const V = len(vectorToZeroV);
|
|
16
19
|
let nu = 1;
|
|
17
20
|
let better;
|
|
@@ -22,7 +25,7 @@ function calcBetterX(curvePiece3s, x, vectorToZeroV) {
|
|
|
22
25
|
do {
|
|
23
26
|
const shift = scale(vectorToZeroV, nu);
|
|
24
27
|
newX = translate(shift, x);
|
|
25
|
-
newPoss = getClosestPoints(newX, curvePiece3s);
|
|
28
|
+
newPoss = getClosestPoints(maxCoordPowerOf2, newX, curvePiece3s);
|
|
26
29
|
// Point of zero V
|
|
27
30
|
const newCircleCenter = circumCenter(newPoss.map(pos => pos.p));
|
|
28
31
|
const newVectorToZeroV = fromTo(newX, newCircleCenter);
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"calc-better-x.js","sourceRoot":"","sources":["../../src/find-3-prong/calc-better-x.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC3E,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAG3D;;;;;;;;;;;;;GAaG;AACH,SAAS,WAAW,CACZ,gBAAwB,EACxB,YAA4B,EAC5B,CAAW,EACX,aAAuB;IAM3B,MAAM,CAAC,GAAG,GAAG,CAAC,aAAa,CAAC,CAAC;IAE7B,IAAI,EAAE,GAAG,CAAC,CAAC;IACX,IAAI,MAAM,CAAC;IACX,IAAI,IAAI,CAAC;IACT,IAAI,OAA0B,CAAC;IAC/B,IAAI,IAAI,CAAC;IACT,IAAI,CAAC,GAAG,CAAC,CAAC,CAAE,YAAY;IACxB,GAAG,CAAC;QACA,MAAM,KAAK,GAAG,KAAK,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC;QACvC,IAAI,GAAG,SAAS,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QAE3B,OAAO,GAAG,gBAAgB,CAAC,gBAAgB,EAAE,IAAI,EAAE,YAAY,CAAC,CAAC;QAEjE,kBAAkB;QAClB,MAAM,eAAe,GAAG,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAI,CAAC,CAAC,CAAC,CAAC,CAAC;QACjE,MAAM,gBAAgB,GAAG,MAAM,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;QACvD,IAAI,GAAG,GAAG,CAAC,gBAAgB,CAAC,CAAC;QAE7B,MAAM,GAAG,IAAI,GAAG,CAAC,CAAC;QAElB,EAAE,GAAG,EAAE,GAAC,CAAC,CAAC;QAEV,CAAC,EAAE,CAAC;IACR,CAAC,QAAQ,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,EAAE;IAE3B,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,CAAA;AAClC,CAAC;AAGD,OAAO,EAAE,WAAW,EAAE,CAAA"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import type { CpNode } from '../cp-node/cp-node.js';
|
|
2
|
+
import type { CurvePiece } from '../mat/curve-piece.js';
|
|
3
|
+
/**
|
|
4
|
+
* Finds an initial 3-prong circle center point from which to iterate. The point
|
|
5
|
+
* must be within the shape.
|
|
6
|
+
*
|
|
7
|
+
* @param maxCoordPowerOf2
|
|
8
|
+
* @param δ3s the three boundary pieces of which we need to find the three
|
|
9
|
+
* 3-prong points.
|
|
10
|
+
* @param curvePiece3s
|
|
11
|
+
*
|
|
12
|
+
* @internal
|
|
13
|
+
*/
|
|
14
|
+
declare function calcInitial3ProngCenter(maxCoordPowerOf2: number, δ3s: CpNode[][], curvePiece3s: CurvePiece[][]): number[];
|
|
15
|
+
export { calcInitial3ProngCenter };
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
import { circumCenter } from 'flo-vector2d';
|
|
2
|
+
import { getCloseBoundaryPointsCertified } from '../closest-boundary-point/get-close-boundary-points-certified.js';
|
|
3
|
+
/**
|
|
4
|
+
* Finds an initial 3-prong circle center point from which to iterate. The point
|
|
5
|
+
* must be within the shape.
|
|
6
|
+
*
|
|
7
|
+
* @param maxCoordPowerOf2
|
|
8
|
+
* @param δ3s the three boundary pieces of which we need to find the three
|
|
9
|
+
* 3-prong points.
|
|
10
|
+
* @param curvePiece3s
|
|
11
|
+
*
|
|
12
|
+
* @internal
|
|
13
|
+
*/
|
|
14
|
+
function calcInitial3ProngCenter(maxCoordPowerOf2, δ3s, curvePiece3s) {
|
|
15
|
+
const circle = δ3s[0][0].pointOnShape.circle;
|
|
16
|
+
const twoProngCircleCenter = circle.center;
|
|
17
|
+
const pos = getCloseBoundaryPointsCertified(maxCoordPowerOf2, curvePiece3s[1], twoProngCircleCenter)[0];
|
|
18
|
+
const meanPoints = [
|
|
19
|
+
δ3s[0][0].pointOnShape.p,
|
|
20
|
+
pos.p,
|
|
21
|
+
δ3s[2][1].pointOnShape.p,
|
|
22
|
+
];
|
|
23
|
+
return circumCenter(meanPoints);
|
|
24
|
+
}
|
|
25
|
+
export { calcInitial3ProngCenter };
|
|
26
|
+
//# sourceMappingURL=calc-initial-3-prong-center.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"calc-initial-3-prong-center.js","sourceRoot":"","sources":["../../src/find-3-prong/calc-initial-3-prong-center.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,EAAE,+BAA+B,EAAE,MAAM,kEAAkE,CAAC;AAGnH;;;;;;;;;;GAUG;AACH,SAAS,uBAAuB,CACxB,gBAAwB,EACxB,GAAe,EACf,YAA4B;IAEhC,MAAM,MAAM,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,MAAM,CAAC;IAC7C,MAAM,oBAAoB,GAAG,MAAM,CAAC,MAAM,CAAC;IAE3C,MAAM,GAAG,GAAG,+BAA+B,CACvC,gBAAgB,EAChB,YAAY,CAAC,CAAC,CAAC,EACf,oBAAoB,CACvB,CAAC,CAAC,CAAC,CAAC;IAEL,MAAM,UAAU,GAAG;QACf,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC;QACxB,GAAG,CAAC,CAAC;QACL,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC;KAC3B,CAAC;IAEF,OAAO,YAAY,CAAC,UAAU,CAAC,CAAC;AACpC,CAAC;AAGD,OAAO,EAAE,uBAAuB,EAAE,CAAA"}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import type { CpNode } from '../cp-node/cp-node.js';
|
|
2
|
+
import type { CurvePiece } from '../mat/curve-piece.js';
|
|
3
|
+
import type { ThreeProngInfo } from './three-prong-info.js';
|
|
4
|
+
/**
|
|
5
|
+
* Finds a 3-prong using only the 3 given δs.
|
|
6
|
+
*
|
|
7
|
+
* @param δs the boundary pieces
|
|
8
|
+
* @param idx δ identifier
|
|
9
|
+
* @param k δs identifier
|
|
10
|
+
* @param curvePiecess
|
|
11
|
+
* @param maxCoordPowerOf2
|
|
12
|
+
*
|
|
13
|
+
* @internal
|
|
14
|
+
*/
|
|
15
|
+
declare function find3ProngForDelta3s(δs: CpNode[][], idx: number, k: number, curvePiecess: CurvePiece[][], maxCoordPowerOf2: number): {
|
|
16
|
+
error: number;
|
|
17
|
+
threeProngInfo: ThreeProngInfo;
|
|
18
|
+
} | undefined;
|
|
19
|
+
export { find3ProngForDelta3s };
|
|
@@ -1,27 +1,27 @@
|
|
|
1
|
-
import { fromTo, circumCenter, len, distanceBetween, toUnitVector, rotate90Degrees, cross } from 'flo-vector2d';
|
|
1
|
+
import { fromTo, circumCenter as getCircumCenter, len, distanceBetween, toUnitVector, rotate90Degrees, cross } from 'flo-vector2d';
|
|
2
2
|
import { tangent } from 'flo-bezier3';
|
|
3
|
-
import { CpNodeFs } from '../cp-node/cp-node-fs.js';
|
|
4
3
|
import { calcInitial3ProngCenter } from './calc-initial-3-prong-center.js';
|
|
5
4
|
import { getClosestPoints } from './get-closest-points.js';
|
|
6
5
|
import { calcBetterX } from './calc-better-x.js';
|
|
7
6
|
import { getCloseBoundaryPointsCertified } from '../closest-boundary-point/get-close-boundary-points-certified.js';
|
|
8
7
|
import { getCorner } from '../corner/get-corner.js';
|
|
9
8
|
import { isPosCorner } from '../point-on-shape/is-pos-corner.js';
|
|
10
|
-
import { getPosCorner } from '../point-on-shape/get-pos-corner.js';
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
const calcVectorToZeroV_StraightToIt = fromTo;
|
|
9
|
+
import { getPosCorner$ } from '../point-on-shape/get-pos-corner.js';
|
|
10
|
+
import { isSharp } from '../cp-node/fs/is-sharp.js';
|
|
11
|
+
const { min, abs, asin } = Math;
|
|
14
12
|
/**
|
|
15
|
-
* @internal
|
|
16
13
|
* Finds a 3-prong using only the 3 given δs.
|
|
17
|
-
*
|
|
14
|
+
*
|
|
15
|
+
* @param δs the boundary pieces
|
|
18
16
|
* @param idx δ identifier
|
|
17
|
+
* @param k δs identifier
|
|
19
18
|
* @param curvePiecess
|
|
20
|
-
* @param
|
|
21
|
-
*
|
|
19
|
+
* @param maxCoordPowerOf2
|
|
20
|
+
*
|
|
21
|
+
* @internal
|
|
22
22
|
*/
|
|
23
|
-
function find3ProngForDelta3s(δs, idx, k, curvePiecess,
|
|
24
|
-
const TOLERANCE = 2 ** -32
|
|
23
|
+
function find3ProngForDelta3s(δs, idx, k, curvePiecess, maxCoordPowerOf2) {
|
|
24
|
+
const TOLERANCE = 2 ** (maxCoordPowerOf2 - 32);
|
|
25
25
|
const MAX_ITERATIONS = 10;
|
|
26
26
|
const δs_ = [
|
|
27
27
|
δs[0],
|
|
@@ -49,34 +49,33 @@ function find3ProngForDelta3s(δs, idx, k, curvePiecess, maxCoordinate) {
|
|
|
49
49
|
return undefined;
|
|
50
50
|
}
|
|
51
51
|
let poss = undefined;
|
|
52
|
-
let circumCenter_;
|
|
53
52
|
let j = 0; // Safeguard for slow convergence
|
|
54
|
-
let x = calcInitial3ProngCenter(
|
|
55
|
-
let tolerance =
|
|
53
|
+
let x = calcInitial3ProngCenter(maxCoordPowerOf2, δ3s, curvePiece3s);
|
|
54
|
+
let tolerance = Infinity;
|
|
56
55
|
while (tolerance > TOLERANCE && j < MAX_ITERATIONS) {
|
|
57
56
|
j++;
|
|
58
|
-
poss = getClosestPoints(x, curvePiece3s);
|
|
57
|
+
poss = getClosestPoints(maxCoordPowerOf2, x, curvePiece3s);
|
|
59
58
|
if (!Number.isFinite(x[0]) || !Number.isFinite(x[1])) {
|
|
60
|
-
//
|
|
59
|
+
// FUTURE - the code can be cleaned up and sped up a lot if we don't
|
|
61
60
|
// use this function as is but instead use δs[0] and δs[2] as is
|
|
62
61
|
// and make δs[1] include all the rest of the beziers around the
|
|
63
62
|
// loop. This check, for instance, would be eliminated completely.
|
|
64
63
|
return undefined;
|
|
65
64
|
}
|
|
66
|
-
|
|
67
|
-
const vectorToZeroV =
|
|
65
|
+
const circumCenter = getCircumCenter(poss.map(x => x.p));
|
|
66
|
+
const vectorToZeroV = fromTo(x, circumCenter);
|
|
68
67
|
if (!Number.isFinite(vectorToZeroV[0]) || !Number.isFinite(vectorToZeroV[1])) {
|
|
69
|
-
//
|
|
68
|
+
// FUTURE - the code can be cleaned up and sped up a lot if we don't
|
|
70
69
|
// use this function as is but instead use δs[0] and δs[2] as is
|
|
71
70
|
// and make δs[1] include all the rest of the beziers around the
|
|
72
71
|
// loop. This check, for instance, would be eliminated completely.
|
|
73
72
|
return undefined;
|
|
74
73
|
}
|
|
75
|
-
const upds = calcBetterX(curvePiece3s, x, vectorToZeroV);
|
|
74
|
+
const upds = calcBetterX(maxCoordPowerOf2, curvePiece3s, x, vectorToZeroV);
|
|
76
75
|
x = upds.newX;
|
|
77
76
|
poss = upds.newPoss;
|
|
78
77
|
const V = len(vectorToZeroV); // The 'potential'
|
|
79
|
-
tolerance =
|
|
78
|
+
tolerance = abs(V - upds.newV);
|
|
80
79
|
}
|
|
81
80
|
const radius = (distanceBetween(x, poss[0].p) +
|
|
82
81
|
distanceBetween(x, poss[1].p) +
|
|
@@ -85,7 +84,7 @@ function find3ProngForDelta3s(δs, idx, k, curvePiecess, maxCoordinate) {
|
|
|
85
84
|
//-------------------------------------------------------------------------
|
|
86
85
|
// Calculate the unit tangent vector at 3-prong circle points - they should
|
|
87
86
|
// be very close to tangent to the boundary piece tangents at those points
|
|
88
|
-
// (up to sign).
|
|
87
|
+
// (up to sign). Dull corners is a common special case.
|
|
89
88
|
//-------------------------------------------------------------------------
|
|
90
89
|
let totalAngleError = 0;
|
|
91
90
|
for (let i = 0; i < 3; i++) {
|
|
@@ -98,12 +97,12 @@ function find3ProngForDelta3s(δs, idx, k, curvePiecess, maxCoordinate) {
|
|
|
98
97
|
//-----------------------------------
|
|
99
98
|
// Check if point is on dull crorner
|
|
100
99
|
//-----------------------------------
|
|
101
|
-
if (isPosCorner(pos) && getPosCorner(pos).isDull) {
|
|
100
|
+
if (isPosCorner(pos) && getPosCorner$(pos).isDull) {
|
|
102
101
|
const corner = getCorner(pos.curve.ps, pos.curve.next.ps);
|
|
103
102
|
const tans = corner.tangents;
|
|
104
103
|
const perps = tans.map(rotate90Degrees);
|
|
105
|
-
const angleError1 =
|
|
106
|
-
const angleError2 =
|
|
104
|
+
const angleError1 = asin(cross(perps[0], v));
|
|
105
|
+
const angleError2 = asin(cross(v, perps[1]));
|
|
107
106
|
let angleError = 0;
|
|
108
107
|
if (angleError1 > 0) {
|
|
109
108
|
angleError += angleError1;
|
|
@@ -119,11 +118,11 @@ function find3ProngForDelta3s(δs, idx, k, curvePiecess, maxCoordinate) {
|
|
|
119
118
|
//---------------------------
|
|
120
119
|
const v2 = toUnitVector(tangent(pos.curve.ps, pos.t));
|
|
121
120
|
// Cross is more numerically stable than Vector.dot at angles a
|
|
122
|
-
// multiple of Math.PI **and** is close to the actual angle value
|
|
121
|
+
// multiple of `Math.PI` **and** is close to the actual angle value
|
|
123
122
|
// and can thus just be added to cone method of looking at
|
|
124
123
|
// tolerance.
|
|
125
124
|
// Should be close to zero and is close to the actual angle.
|
|
126
|
-
const cross_ =
|
|
125
|
+
const cross_ = abs(asin(cross(v1, v2)));
|
|
127
126
|
totalAngleError += cross_;
|
|
128
127
|
}
|
|
129
128
|
}
|
|
@@ -134,17 +133,16 @@ function find3ProngForDelta3s(δs, idx, k, curvePiecess, maxCoordinate) {
|
|
|
134
133
|
//-------------------------------------------------------------------------
|
|
135
134
|
const closestDs = [];
|
|
136
135
|
for (let i = 0; i < curvePiecess.length; i++) {
|
|
137
|
-
const
|
|
138
|
-
|
|
139
|
-
closestDs.push(distanceBetween(p.p, x));
|
|
136
|
+
const pos = getCloseBoundaryPointsCertified(maxCoordPowerOf2, curvePiecess[i], x)[0];
|
|
137
|
+
closestDs.push(distanceBetween(pos.p, x));
|
|
140
138
|
}
|
|
141
|
-
const closestD =
|
|
142
|
-
const radiusDelta =
|
|
139
|
+
const closestD = min(...closestDs);
|
|
140
|
+
const radiusDelta = abs(radius - closestD);
|
|
143
141
|
// Weights below still need to be optimized.
|
|
144
142
|
const W1 = 1;
|
|
145
143
|
const W2 = 1;
|
|
146
144
|
const error = W1 * radiusDelta + W2 * totalAngleError;
|
|
147
|
-
return {
|
|
145
|
+
return { threeProngInfo: { poss, circle, δ3s }, error };
|
|
148
146
|
}
|
|
149
147
|
export { find3ProngForDelta3s };
|
|
150
148
|
//# sourceMappingURL=find-3-prong-for-delta3s.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"find-3-prong-for-delta3s.js","sourceRoot":"","sources":["../../src/find-3-prong/find-3-prong-for-delta3s.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import type { CpNode } from '../cp-node/cp-node.js';
|
|
2
|
+
import type { ThreeProngInfo } from './three-prong-info.js';
|
|
3
|
+
/**
|
|
4
|
+
* Find and return a 3-prong from the given boundary piece.
|
|
5
|
+
*
|
|
6
|
+
* @param δs A boundary piece
|
|
7
|
+
* @param maxCoordPowerOf2 The maximum coordinate power of 2 value used to
|
|
8
|
+
* calculate floating point tolerances.
|
|
9
|
+
*
|
|
10
|
+
* @internal
|
|
11
|
+
*/
|
|
12
|
+
declare function find3Prong(δs: CpNode[][], maxCoordPowerOf2: number): ThreeProngInfo;
|
|
13
|
+
export { find3Prong };
|