flo-mat 2.0.0 → 2.0.2
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/.eslintrc.cjs +69 -0
- package/README.md +9 -27
- package/browser/index.js +29720 -7345
- package/browser/index.min.js +1 -2
- package/node/circle.js +3 -3
- package/node/circle.js.map +1 -1
- package/node/compare-curvatures-at-interface.js +36 -36
- package/node/compare-curvatures-at-interface.js.map +1 -1
- package/node/cp-node/clone.js +6 -6
- package/node/cp-node/clone.js.map +1 -1
- package/node/cp-node/remove.js +4 -4
- package/node/cp-node/remove.js.map +1 -1
- package/node/cp-node.js +18 -18
- package/node/cp-node.js.map +1 -1
- package/node/curve.d.ts +1 -1
- package/node/curve.js +19 -19
- package/node/curve.js.map +1 -1
- package/node/debug/debug.d.ts +1 -1
- package/node/debug/functions/draw-elem/bounding-hull.js +1 -1
- package/node/debug/functions/draw-elem/bounding-hull.js.map +1 -1
- package/node/debug/functions/draw-elem/branch.js +4 -4
- package/node/debug/functions/draw-elem/branch.js.map +1 -1
- package/node/debug/functions/draw-elem/culls.js +4 -4
- package/node/debug/functions/draw-elem/culls.js.map +1 -1
- package/node/debug/functions/draw-elem/draw-circle-percent.js +1 -1
- package/node/debug/functions/draw-elem/draw-circle-percent.js.map +1 -1
- package/node/debug/functions/draw-elem/draw-elem.d.ts +2 -2
- package/node/debug/functions/draw-elem/draw-elem.js +1 -1
- package/node/debug/functions/draw-elem/draw-elem.js.map +1 -1
- package/node/debug/functions/draw-elem/dull-corner.js +3 -3
- package/node/debug/functions/draw-elem/dull-corner.js.map +1 -1
- package/node/debug/functions/draw-elem/leaves.js +4 -4
- package/node/debug/functions/draw-elem/leaves.js.map +1 -1
- package/node/debug/functions/draw-elem/loose-bounding-box.js +2 -2
- package/node/debug/functions/draw-elem/loose-bounding-box.js.map +1 -1
- package/node/debug/functions/draw-elem/mat.js +4 -4
- package/node/debug/functions/draw-elem/mat.js.map +1 -1
- package/node/debug/functions/draw-elem/max-vertex.js +2 -2
- package/node/debug/functions/draw-elem/max-vertex.js.map +1 -1
- package/node/debug/functions/draw-elem/min-y.js +3 -3
- package/node/debug/functions/draw-elem/min-y.js.map +1 -1
- package/node/debug/functions/draw-elem/one-prong-at-dull-corner.js +4 -4
- package/node/debug/functions/draw-elem/one-prong-at-dull-corner.js.map +1 -1
- package/node/debug/functions/draw-elem/one-prong.js +4 -4
- package/node/debug/functions/draw-elem/one-prong.js.map +1 -1
- package/node/debug/functions/draw-elem/sharp-corner.js +2 -2
- package/node/debug/functions/draw-elem/sharp-corner.js.map +1 -1
- package/node/debug/functions/draw-elem/three-prong.js +7 -7
- package/node/debug/functions/draw-elem/three-prong.js.map +1 -1
- package/node/debug/functions/draw-elem/tight-bounding-box.js +1 -1
- package/node/debug/functions/draw-elem/tight-bounding-box.js.map +1 -1
- package/node/debug/functions/draw-elem/two-prong.js +1 -1
- package/node/debug/functions/draw-elem/two-prong.js.map +1 -1
- package/node/debug/functions/draw-elem/vertex.js +13 -13
- package/node/debug/functions/draw-elem/vertex.js.map +1 -1
- package/node/debug/functions/general.d.ts +1 -1
- package/node/debug/functions/general.js +1 -1
- package/node/debug/functions/general.js.map +1 -1
- package/node/debug/functions/three-prong.d.ts +1 -1
- package/node/debug/functions/three-prong.js +37 -37
- package/node/debug/functions/three-prong.js.map +1 -1
- package/node/debug/functions/two-prong.d.ts +1 -1
- package/node/debug/functions/two-prong.js +15 -15
- package/node/debug/functions/two-prong.js.map +1 -1
- package/node/find-mats.js +16 -19
- package/node/find-mats.js.map +1 -1
- package/node/get-boundary-bezier-parts-to-next.js +8 -8
- package/node/get-boundary-bezier-parts-to-next.js.map +1 -1
- package/node/get-boundary-beziers-to-next.js +8 -8
- package/node/get-boundary-beziers-to-next.js.map +1 -1
- package/node/get-branches.js +7 -7
- package/node/get-branches.js.map +1 -1
- package/node/get-curve/get-curve-between.js +21 -21
- package/node/get-curve/get-curve-between.js.map +1 -1
- package/node/get-curve/get-edge-direction.js +13 -13
- package/node/get-curve/get-edge-direction.js.map +1 -1
- package/node/get-interface-ccw.js +12 -12
- package/node/get-interface-ccw.js.map +1 -1
- package/node/loop/get-max-coordinate.js +9 -9
- package/node/loop/get-max-coordinate.js.map +1 -1
- package/node/loop.js +4 -4
- package/node/loop.js.map +1 -1
- package/node/mat/add-to-cp-graph.js +8 -8
- package/node/mat/add-to-cp-graph.js.map +1 -1
- package/node/mat/closest-boundary-point/closest-points-on-curve.js +5 -6
- package/node/mat/closest-boundary-point/closest-points-on-curve.js.map +1 -1
- package/node/mat/closest-boundary-point/cull-bezier-pieces.js +1 -1
- package/node/mat/closest-boundary-point/cull-bezier-pieces.js.map +1 -1
- package/node/mat/closest-boundary-point/cull-by-loose-bounding-box.js +5 -5
- package/node/mat/closest-boundary-point/cull-by-loose-bounding-box.js.map +1 -1
- package/node/mat/closest-boundary-point/cull-by-tight-boundary-box.js +5 -5
- package/node/mat/closest-boundary-point/cull-by-tight-boundary-box.js.map +1 -1
- package/node/mat/closest-boundary-point/get-best-distance-squared.js +5 -5
- package/node/mat/closest-boundary-point/get-best-distance-squared.js.map +1 -1
- package/node/mat/closest-boundary-point/get-close-boundary-points.js +15 -15
- package/node/mat/closest-boundary-point/get-close-boundary-points.js.map +1 -1
- package/node/mat/closest-boundary-point/get-closest-boundary-point.js +4 -4
- package/node/mat/closest-boundary-point/get-closest-boundary-point.js.map +1 -1
- package/node/mat/create-new-cp-tree.js +3 -3
- package/node/mat/create-new-cp-tree.js.map +1 -1
- package/node/mat/elem-type-two-prong.d.ts +1 -1
- package/node/mat/find-mat/add-1-prong.js +3 -3
- package/node/mat/find-mat/add-1-prong.js.map +1 -1
- package/node/mat/find-mat/add-2-prong.js +40 -40
- package/node/mat/find-mat/add-2-prong.js.map +1 -1
- package/node/mat/find-mat/add-3-prong.js +1 -1
- package/node/mat/find-mat/add-3-prong.js.map +1 -1
- package/node/mat/find-mat/add-debug-info.js +16 -18
- package/node/mat/find-mat/add-debug-info.js.map +1 -1
- package/node/mat/find-mat/create-get-interesting-points-on-loop.js +4 -4
- package/node/mat/find-mat/create-get-interesting-points-on-loop.js.map +1 -1
- package/node/mat/find-mat/create-initial-cp-graph.js +11 -11
- package/node/mat/find-mat/create-initial-cp-graph.js.map +1 -1
- package/node/mat/find-mat/find-2-prong/add-debug-info.js +2 -2
- package/node/mat/find-mat/find-2-prong/add-debug-info.js.map +1 -1
- package/node/mat/find-mat/find-2-prong/cull-bezier-pieces.js +5 -5
- package/node/mat/find-mat/find-2-prong/cull-bezier-pieces.js.map +1 -1
- package/node/mat/find-mat/find-2-prong/find-2-prong.js +25 -25
- package/node/mat/find-mat/find-2-prong/find-2-prong.js.map +1 -1
- package/node/mat/find-mat/find-2-prong/find-equidistant-point-on-line.js +7 -7
- package/node/mat/find-mat/find-2-prong/find-equidistant-point-on-line.js.map +1 -1
- package/node/mat/find-mat/find-2-prong/get-initial-bezier-pieces.js +4 -4
- package/node/mat/find-mat/find-2-prong/get-initial-bezier-pieces.js.map +1 -1
- package/node/mat/find-mat/find-2-prong/x-for-debugging.d.ts +1 -1
- package/node/mat/find-mat/find-3-prong/calc-better-x.js +4 -4
- package/node/mat/find-mat/find-3-prong/calc-better-x.js.map +1 -1
- package/node/mat/find-mat/find-3-prong/calc-initial-3-prong-center.js +3 -3
- package/node/mat/find-mat/find-3-prong/calc-initial-3-prong-center.js.map +1 -1
- package/node/mat/find-mat/find-3-prong/find-3-prong-for-delta3s.js +35 -35
- package/node/mat/find-mat/find-3-prong/find-3-prong-for-delta3s.js.map +1 -1
- package/node/mat/find-mat/find-3-prong/find-3-prong.js +14 -14
- package/node/mat/find-mat/find-3-prong/find-3-prong.js.map +1 -1
- package/node/mat/find-mat/find-3-prong/get-closest-points.js +1 -1
- package/node/mat/find-mat/find-3-prong/get-closest-points.js.map +1 -1
- package/node/mat/find-mat/find-and-add-2-prongs-on-all-paths.js +2 -2
- package/node/mat/find-mat/find-and-add-2-prongs-on-all-paths.js.map +1 -1
- package/node/mat/find-mat/find-and-add-2-prongs.js +12 -13
- package/node/mat/find-mat/find-and-add-2-prongs.js.map +1 -1
- package/node/mat/find-mat/find-and-add-3-prongs.js +16 -17
- package/node/mat/find-mat/find-and-add-3-prongs.js.map +1 -1
- package/node/mat/find-mat/find-and-add-hole-closing-2-prongs.js +6 -6
- package/node/mat/find-mat/find-and-add-hole-closing-2-prongs.js.map +1 -1
- package/node/mat/find-mat/get-potential-2-prongs.js +4 -4
- package/node/mat/find-mat/get-potential-2-prongs.js.map +1 -1
- package/node/mat/find-mat/get-sharp-corners.js +4 -4
- package/node/mat/find-mat/get-sharp-corners.js.map +1 -1
- package/node/mat/geometry/get-closest-squared-distance-to-rotated-rect.js +3 -3
- package/node/mat/geometry/get-closest-squared-distance-to-rotated-rect.js.map +1 -1
- package/node/mat/get-boundary-piece-beziers.js +5 -5
- package/node/mat/get-boundary-piece-beziers.js.map +1 -1
- package/node/mat/get-contact-circles-at-interface.js +1 -1
- package/node/mat/get-contact-circles-at-interface.js.map +1 -1
- package/node/mat/get-leaves.js +2 -2
- package/node/mat/get-leaves.js.map +1 -1
- package/node/mat/get-neighboring-cps.js +1 -1
- package/node/mat/get-neighboring-cps.js.map +1 -1
- package/node/mat/is-another-cp-closeby.js +9 -9
- package/node/mat/is-another-cp-closeby.js.map +1 -1
- package/node/mat/simplify-mat-map-only.js +15 -15
- package/node/mat/simplify-mat-map-only.js.map +1 -1
- package/node/mat/to-scale-axis/add-debug-info.js +1 -1
- package/node/mat/to-scale-axis/add-debug-info.js.map +1 -1
- package/node/mat/to-scale-axis/cull-non-cycles.js +5 -5
- package/node/mat/to-scale-axis/cull-non-cycles.js.map +1 -1
- package/node/mat/to-scale-axis/cull.js +5 -5
- package/node/mat/to-scale-axis/cull.js.map +1 -1
- package/node/mat/trim-mat.js +1 -1
- package/node/mat/trim-mat.js.map +1 -1
- package/node/point-on-shape.d.ts +4 -4
- package/node/point-on-shape.js +16 -16
- package/node/point-on-shape.js.map +1 -1
- package/node/simplify-mat.js +10 -10
- package/node/simplify-mat.js.map +1 -1
- package/node/svg/get-loop-bounds.d.ts +1 -1
- package/node/svg/get-loop-bounds.js +13 -13
- package/node/svg/get-loop-bounds.js.map +1 -1
- package/node/svg/get-shape-bounds.d.ts +2 -2
- package/node/svg/get-shape-bounds.js +4 -4
- package/node/svg/get-shape-bounds.js.map +1 -1
- package/node/sweep-line/sweep-line.js +8 -8
- package/node/sweep-line/sweep-line.js.map +1 -1
- package/node/to-scale-axis.js +16 -15
- package/node/to-scale-axis.js.map +1 -1
- package/node/traverse-edges.js +2 -2
- package/node/traverse-edges.js.map +1 -1
- package/node/traverse-vertices.js +2 -2
- package/node/traverse-vertices.js.map +1 -1
- package/package.json +30 -25
- package/src/circle.ts +3 -3
- package/src/compare-curvatures-at-interface.ts +36 -36
- package/src/cp-node/clone.ts +6 -6
- package/src/cp-node/remove.ts +4 -4
- package/src/cp-node.ts +20 -20
- package/src/curve.ts +19 -19
- package/src/debug/functions/draw-elem/bounding-hull.ts +2 -2
- package/src/debug/functions/draw-elem/branch.ts +4 -4
- package/src/debug/functions/draw-elem/culls.ts +4 -4
- package/src/debug/functions/draw-elem/draw-circle-percent.ts +2 -2
- package/src/debug/functions/draw-elem/draw-elem.ts +1 -1
- package/src/debug/functions/draw-elem/dull-corner.ts +3 -3
- package/src/debug/functions/draw-elem/leaves.ts +4 -4
- package/src/debug/functions/draw-elem/loose-bounding-box.ts +2 -2
- package/src/debug/functions/draw-elem/mat.ts +4 -4
- package/src/debug/functions/draw-elem/max-vertex.ts +2 -2
- package/src/debug/functions/draw-elem/min-y.ts +3 -3
- package/src/debug/functions/draw-elem/one-prong-at-dull-corner.ts +4 -4
- package/src/debug/functions/draw-elem/one-prong.ts +4 -4
- package/src/debug/functions/draw-elem/sharp-corner.ts +2 -2
- package/src/debug/functions/draw-elem/three-prong.ts +7 -7
- package/src/debug/functions/draw-elem/tight-bounding-box.ts +1 -1
- package/src/debug/functions/draw-elem/two-prong.ts +1 -1
- package/src/debug/functions/draw-elem/vertex.ts +20 -14
- package/src/debug/functions/general.ts +3 -3
- package/src/debug/functions/three-prong.ts +37 -37
- package/src/debug/functions/two-prong.ts +15 -15
- package/src/find-mats.ts +19 -19
- package/src/get-boundary-bezier-parts-to-next.ts +8 -8
- package/src/get-boundary-beziers-to-next.ts +8 -8
- package/src/get-branches.ts +7 -7
- package/src/get-curve/get-curve-between.ts +21 -21
- package/src/get-curve/get-edge-direction.ts +13 -14
- package/src/get-interface-ccw.ts +12 -12
- package/src/loop/get-max-coordinate.ts +7 -7
- package/src/loop.ts +4 -4
- package/src/mat/add-to-cp-graph.ts +8 -8
- package/src/mat/closest-boundary-point/closest-points-on-curve.ts +5 -6
- package/src/mat/closest-boundary-point/cull-bezier-pieces.ts +1 -1
- package/src/mat/closest-boundary-point/cull-by-loose-bounding-box.ts +5 -5
- package/src/mat/closest-boundary-point/cull-by-tight-boundary-box.ts +5 -5
- package/src/mat/closest-boundary-point/get-best-distance-squared.ts +5 -5
- package/src/mat/closest-boundary-point/get-close-boundary-points.ts +15 -15
- package/src/mat/closest-boundary-point/get-closest-boundary-point.ts +4 -4
- package/src/mat/cmp-cp-on-delta.ts +5 -5
- package/src/mat/create-new-cp-tree.ts +3 -3
- package/src/mat/find-mat/add-1-prong.ts +5 -5
- package/src/mat/find-mat/add-2-prong.ts +42 -42
- package/src/mat/find-mat/add-3-prong.ts +1 -1
- package/src/mat/find-mat/add-debug-info.ts +18 -20
- package/src/mat/find-mat/create-get-interesting-points-on-loop.ts +4 -4
- package/src/mat/find-mat/create-initial-cp-graph.ts +11 -11
- package/src/mat/find-mat/find-2-prong/add-debug-info.ts +4 -4
- package/src/mat/find-mat/find-2-prong/cull-bezier-pieces.ts +5 -5
- package/src/mat/find-mat/find-2-prong/find-2-prong.ts +27 -27
- package/src/mat/find-mat/find-2-prong/find-equidistant-point-on-line.ts +7 -7
- package/src/mat/find-mat/find-2-prong/get-initial-bezier-pieces.ts +4 -4
- package/src/mat/find-mat/find-3-prong/calc-better-x.ts +4 -4
- package/src/mat/find-mat/find-3-prong/calc-initial-3-prong-center.ts +3 -3
- package/src/mat/find-mat/find-3-prong/find-3-prong-for-delta3s.ts +37 -37
- package/src/mat/find-mat/find-3-prong/find-3-prong.ts +16 -16
- package/src/mat/find-mat/find-3-prong/get-closest-points.ts +1 -1
- package/src/mat/find-mat/find-and-add-2-prongs-on-all-paths.ts +2 -2
- package/src/mat/find-mat/find-and-add-2-prongs.ts +14 -16
- package/src/mat/find-mat/find-and-add-3-prongs.ts +19 -19
- package/src/mat/find-mat/find-and-add-hole-closing-2-prongs.ts +6 -6
- package/src/mat/find-mat/get-potential-2-prongs.ts +4 -4
- package/src/mat/find-mat/get-sharp-corners.ts +4 -4
- package/src/mat/find-mat/get-total-abs-curvature.ts +1 -1
- package/src/mat/geometry/get-closest-squared-distance-to-rotated-rect.ts +3 -3
- package/src/mat/get-boundary-piece-beziers.ts +5 -5
- package/src/mat/get-contact-circles-at-interface.ts +1 -1
- package/src/mat/get-edges-as-array.ts +2 -2
- package/src/mat/get-leaves.ts +2 -2
- package/src/mat/get-neighboring-cps.ts +1 -1
- package/src/mat/is-another-cp-closeby.ts +9 -9
- package/src/mat/simplify-mat-map-only.ts +15 -15
- package/src/mat/to-scale-axis/add-debug-info.ts +6 -3
- package/src/mat/to-scale-axis/add-to-tree.ts +10 -10
- package/src/mat/to-scale-axis/calc-groups.ts +19 -19
- package/src/mat/to-scale-axis/create-spacial-tree.ts +4 -4
- package/src/mat/to-scale-axis/cull-non-cycles.ts +5 -5
- package/src/mat/to-scale-axis/cull.ts +5 -5
- package/src/mat/to-scale-axis/get-engulfed-vertices.ts +18 -18
- package/src/mat/trim-mat.ts +1 -1
- package/src/point-on-shape.ts +16 -16
- package/src/simplify-mat.ts +10 -10
- package/src/svg/get-curvature-at-interface.ts +6 -8
- package/src/svg/get-extreme.ts +1 -1
- package/src/svg/get-loop-bounds.ts +13 -13
- package/src/svg/get-shape-bounds.ts +4 -4
- package/src/sweep-line/are-boxes-intersecting.ts +4 -4
- package/src/sweep-line/sweep-line.ts +8 -8
- package/src/to-scale-axis.ts +18 -17
- package/src/traverse-edges.ts +2 -2
- package/src/traverse-vertices.ts +2 -2
- package/webpack.config.cjs +12 -63
- package/browser/index.min.js.LICENSE.txt +0 -2907
- package/browser/index.module.js +0 -7369
- package/browser/index.module.min.js +0 -2
- package/browser/index.module.min.js.LICENSE.txt +0 -2907
|
@@ -10,16 +10,16 @@ import { getBoundaryPieceBeziers } from '../../get-boundary-piece-beziers.js';
|
|
|
10
10
|
* tolerances.
|
|
11
11
|
*/
|
|
12
12
|
function find3Prong(δs, extreme) {
|
|
13
|
-
|
|
13
|
+
const bezierPiecess = δs.map(getBoundaryPieceBeziers);
|
|
14
14
|
if (typeof _debug_ !== 'undefined') {
|
|
15
|
-
|
|
15
|
+
const threeProngs = _debug_.generated.elems.threeProng;
|
|
16
16
|
threeProngs.push(createEmptyThreeProngForDebugging());
|
|
17
|
-
|
|
17
|
+
const d = threeProngs[threeProngs.length - 1];
|
|
18
18
|
d.boundaries = [];
|
|
19
|
-
for (
|
|
20
|
-
|
|
19
|
+
for (const bezierPieces of bezierPiecess) {
|
|
20
|
+
const boundary = [];
|
|
21
21
|
d.boundaries.push(boundary);
|
|
22
|
-
for (
|
|
22
|
+
for (const bezierPiece of bezierPieces) {
|
|
23
23
|
/* qqq
|
|
24
24
|
let bezier = fromTo(bezierPiece.curve.ps)(
|
|
25
25
|
bezierPiece.ts[0], bezierPiece.ts[1]
|
|
@@ -31,7 +31,7 @@ function find3Prong(δs, extreme) {
|
|
|
31
31
|
}
|
|
32
32
|
d.traces = [];
|
|
33
33
|
}
|
|
34
|
-
|
|
34
|
+
const candidateThreeProngs = [];
|
|
35
35
|
// The best candidate amongst the different 'permutations' of the given δs.
|
|
36
36
|
let threeProng;
|
|
37
37
|
let bestIndx = undefined;
|
|
@@ -39,16 +39,16 @@ function find3Prong(δs, extreme) {
|
|
|
39
39
|
for (let i = 1; i < δs.length - 1; i++) {
|
|
40
40
|
for (let k = 0; k < 3; k++) {
|
|
41
41
|
if (typeof _debug_ !== 'undefined') {
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
42
|
+
const threeProngs = _debug_.generated.elems.threeProng;
|
|
43
|
+
const d = threeProngs[threeProngs.length - 1];
|
|
44
|
+
const trace = [];
|
|
45
45
|
d.traces.push(trace);
|
|
46
46
|
}
|
|
47
|
-
|
|
47
|
+
const threeProngInfo = find3ProngForDelta3s(δs, i, k, bezierPiecess, extreme);
|
|
48
48
|
if (!threeProngInfo) {
|
|
49
49
|
continue;
|
|
50
50
|
}
|
|
51
|
-
|
|
51
|
+
const { circle, ps, error, δ3s } = threeProngInfo;
|
|
52
52
|
if (typeof _debug_ !== 'undefined') {
|
|
53
53
|
candidateThreeProngs.push({ circle, ps });
|
|
54
54
|
}
|
|
@@ -61,8 +61,8 @@ function find3Prong(δs, extreme) {
|
|
|
61
61
|
}
|
|
62
62
|
//threeProng.δ3s = [δs[0], δs[bestIndx+1], δs[δs.length-1]];
|
|
63
63
|
if (typeof _debug_ !== 'undefined') {
|
|
64
|
-
|
|
65
|
-
|
|
64
|
+
const threeProngs = _debug_.generated.elems.threeProng;
|
|
65
|
+
const d = threeProngs[threeProngs.length - 1];
|
|
66
66
|
d.generated = _debug_.generated;
|
|
67
67
|
d.circle = threeProng.circle;
|
|
68
68
|
d.poss = threeProng.ps;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"find-3-prong.js","sourceRoot":"","sources":["../../../../src/mat/find-mat/find-3-prong/find-3-prong.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAKrC,OAAO,EAAE,iCAAiC,EAAE,MAAM,6CAA6C,CAAC;AAChG,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,EAAE,uBAAuB,EAAE,MAAM,qCAAqC,CAAC;AAG9E;;;;;;GAMG;AACH,SAAS,UAAU,CAAC,EAAc,EAAE,OAAe;IAClD,
|
|
1
|
+
{"version":3,"file":"find-3-prong.js","sourceRoot":"","sources":["../../../../src/mat/find-mat/find-3-prong/find-3-prong.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,7 @@ import { getClosestBoundaryPoint } from '../../closest-boundary-point/get-closes
|
|
|
7
7
|
*/
|
|
8
8
|
function getClosestPoints(x, bezierPiece3s) {
|
|
9
9
|
return bezierPiece3s.map(bezierPieces => {
|
|
10
|
-
|
|
10
|
+
const posInfo = getClosestBoundaryPoint(bezierPieces, x, undefined, // curve
|
|
11
11
|
undefined // t
|
|
12
12
|
);
|
|
13
13
|
return posInfo ? posInfo.pos : undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-closest-points.js","sourceRoot":"","sources":["../../../../src/mat/find-mat/find-3-prong/get-closest-points.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,uBAAuB,EAAE,MAAM,4DAA4D,CAAC;AAGrG;;;;;GAKG;AACH,SAAS,gBAAgB,CACjB,CAAW,EACX,aAA8B;IAElC,OAAO,aAAa,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE;QACpC,
|
|
1
|
+
{"version":3,"file":"get-closest-points.js","sourceRoot":"","sources":["../../../../src/mat/find-mat/find-3-prong/get-closest-points.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,uBAAuB,EAAE,MAAM,4DAA4D,CAAC;AAGrG;;;;;GAKG;AACH,SAAS,gBAAgB,CACjB,CAAW,EACX,aAA8B;IAElC,OAAO,aAAa,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE;QACpC,MAAM,OAAO,GAAG,uBAAuB,CAC/B,YAAY,EACZ,CAAC,EACD,SAAS,EAAE,QAAQ;QACnB,SAAS,CAAE,IAAI;SACtB,CAAC;QAEF,OAAO,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC;IAC7C,CAAC,CAAC,CAAC;AACP,CAAC;AAGD,OAAO,EAAE,gBAAgB,EAAE,CAAA"}
|
|
@@ -11,8 +11,8 @@ import { findAndAdd2Prongs } from './find-and-add-2-prongs.js';
|
|
|
11
11
|
function findAndAdd2ProngsOnAllPaths(loops, cpGraphs, for2Prongss, extreme) {
|
|
12
12
|
let cpNode;
|
|
13
13
|
for (let k = 0; k < for2Prongss.length; k++) {
|
|
14
|
-
|
|
15
|
-
|
|
14
|
+
const for2Prongs = for2Prongss[k];
|
|
15
|
+
const _cpNode = findAndAdd2Prongs(loops, cpGraphs, k, for2Prongs, extreme);
|
|
16
16
|
cpNode = cpNode || _cpNode;
|
|
17
17
|
}
|
|
18
18
|
return cpNode;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"find-and-add-2-prongs-on-all-paths.js","sourceRoot":"","sources":["../../../src/mat/find-mat/find-and-add-2-prongs-on-all-paths.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAG/D;;;;;;;;GAQG;AACH,SAAS,2BAA2B,CAC5B,KAAa,EACb,QAAoC,EACpC,WAA8B,EAC9B,OAAe;IAEnB,IAAI,MAAM,CAAC;IAEX,KAAK,IAAI,CAAC,GAAC,CAAC,EAAE,CAAC,GAAC,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACrC,
|
|
1
|
+
{"version":3,"file":"find-and-add-2-prongs-on-all-paths.js","sourceRoot":"","sources":["../../../src/mat/find-mat/find-and-add-2-prongs-on-all-paths.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAG/D;;;;;;;;GAQG;AACH,SAAS,2BAA2B,CAC5B,KAAa,EACb,QAAoC,EACpC,WAA8B,EAC9B,OAAe;IAEnB,IAAI,MAAM,CAAC;IAEX,KAAK,IAAI,CAAC,GAAC,CAAC,EAAE,CAAC,GAAC,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACrC,MAAM,UAAU,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;QAClC,MAAM,OAAO,GAAG,iBAAiB,CAAC,KAAK,EAAE,QAAQ,EAAE,CAAC,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;QAC3E,MAAM,GAAG,MAAM,IAAI,OAAO,CAAC;KAC9B;IAED,OAAO,MAAM,CAAC;AAClB,CAAC;AAGD,OAAO,EAAE,2BAA2B,EAAE,CAAA"}
|
|
@@ -12,20 +12,19 @@ import { add2Prong } from './add-2-prong.js';
|
|
|
12
12
|
* tolerances.
|
|
13
13
|
*/
|
|
14
14
|
function findAndAdd2Prongs(loops, cpGraphs, k, for2Prongs, extreme) {
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
//
|
|
15
|
+
const len = for2Prongs.length;
|
|
16
|
+
const index = indexLinear(len);
|
|
17
|
+
//const index = indexInterlaced(len); // Keep for possible future use.
|
|
18
18
|
let cpNode_;
|
|
19
|
-
|
|
20
|
-
|
|
19
|
+
const bounds = getShapeBounds(loops);
|
|
20
|
+
const squaredDiagonalLength = (bounds.maxX.p[0] - bounds.minX.p[0]) ** 2 +
|
|
21
21
|
(bounds.maxY.p[1] - bounds.minY.p[1]) ** 2;
|
|
22
22
|
for (let i = 0; i < len; i++) {
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
twoProngInfo = find2Prong(loops, extreme, squaredDiagonalLength, cpGraphs, pos, false, k);
|
|
23
|
+
const pos = for2Prongs[index[i]];
|
|
24
|
+
const twoProngInfo = find2Prong(loops, extreme, squaredDiagonalLength, cpGraphs, pos, false, k);
|
|
26
25
|
if (twoProngInfo) {
|
|
27
|
-
|
|
28
|
-
|
|
26
|
+
const { circle, zs } = twoProngInfo;
|
|
27
|
+
const cpNode = add2Prong(cpGraphs, circle, pos, zs, false, extreme);
|
|
29
28
|
cpNode_ = cpNode_ || cpNode;
|
|
30
29
|
}
|
|
31
30
|
if (typeof _debug_ !== 'undefined') {
|
|
@@ -42,7 +41,7 @@ function findAndAdd2Prongs(loops, cpGraphs, k, for2Prongs, extreme) {
|
|
|
42
41
|
* @param n
|
|
43
42
|
*/
|
|
44
43
|
function indexLinear(n) {
|
|
45
|
-
|
|
44
|
+
const arr = [];
|
|
46
45
|
for (let i = 0; i < n; i++) {
|
|
47
46
|
arr.push(i);
|
|
48
47
|
}
|
|
@@ -54,8 +53,8 @@ function indexLinear(n) {
|
|
|
54
53
|
* @param n
|
|
55
54
|
*/
|
|
56
55
|
function indexInterlaced(n) {
|
|
57
|
-
|
|
58
|
-
|
|
56
|
+
const source = {};
|
|
57
|
+
const arr = [];
|
|
59
58
|
// l is the lowest power of 2 so that 2^l > n
|
|
60
59
|
let l = Math.pow(2, Math.floor(Math.log2(n)));
|
|
61
60
|
while (l >= 1) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"find-and-add-2-prongs.js","sourceRoot":"","sources":["../../../src/mat/find-mat/find-and-add-2-prongs.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAE/D,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAG7C;;;;;;;;;GASG;AACH,SAAS,iBAAiB,CAClB,KAAa,EACb,QAAoC,EACpC,CAAS,EACT,UAA2B,EAC3B,OAAe;IAEnB,
|
|
1
|
+
{"version":3,"file":"find-and-add-2-prongs.js","sourceRoot":"","sources":["../../../src/mat/find-mat/find-and-add-2-prongs.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,18 +12,17 @@ import { add3Prong } from '../find-mat/add-3-prong.js';
|
|
|
12
12
|
function findAndAddAll3Prongs(cpGraphs, cpStart, extreme) {
|
|
13
13
|
// Don't change this function to be recursive, the call stack may overflow
|
|
14
14
|
// if there are too many two-prongs.
|
|
15
|
-
|
|
16
|
-
|
|
15
|
+
const visitedEdges = new Map();
|
|
16
|
+
const edgesToCheck = [{ fromCpNode: undefined, cpStart }];
|
|
17
17
|
while (edgesToCheck.length) {
|
|
18
|
-
|
|
18
|
+
const { fromCpNode, cpStart } = edgesToCheck.shift();
|
|
19
19
|
markEdgeAsTaken(visitedEdges, fromCpNode, cpStart);
|
|
20
|
-
for (
|
|
20
|
+
for (const cpNode of cpStart.getCpNodesOnCircle()) {
|
|
21
21
|
//if (!PointOnShape.isSharpCorner(cpNode.cp.pointOnShape)) {
|
|
22
22
|
if (!isPosSharpCorner(cpNode.cp.pointOnShape)) {
|
|
23
23
|
if (findAndAdd3Prongs(cpGraphs, cpNode, extreme) === undefined) {
|
|
24
24
|
return; // only for debugging purposes
|
|
25
25
|
}
|
|
26
|
-
;
|
|
27
26
|
}
|
|
28
27
|
if (hasEdgeBeenTaken(visitedEdges, cpNode, cpNode.next)) {
|
|
29
28
|
continue; // We already visited this edge
|
|
@@ -55,9 +54,9 @@ function markEdgeAsTaken(visitedEdges, cp1, cp2) {
|
|
|
55
54
|
function hasEdgeBeenTaken(visitedEdges, cp1, cp2) {
|
|
56
55
|
let cps;
|
|
57
56
|
cps = visitedEdges.get(cp1);
|
|
58
|
-
|
|
57
|
+
const takenForward = cps && cps.has(cp2);
|
|
59
58
|
cps = visitedEdges.get(cp2);
|
|
60
|
-
|
|
59
|
+
const takenBackwards = cps && cps.has(cp1);
|
|
61
60
|
return takenForward || takenBackwards;
|
|
62
61
|
}
|
|
63
62
|
/**
|
|
@@ -72,10 +71,10 @@ function traverseShape(cpStart) {
|
|
|
72
71
|
if (cpNode === cpNode.next.prevOnCircle) {
|
|
73
72
|
return [cpNode];
|
|
74
73
|
}
|
|
75
|
-
|
|
74
|
+
const visitedCps = [];
|
|
76
75
|
do {
|
|
77
76
|
visitedCps.push(cpNode);
|
|
78
|
-
|
|
77
|
+
const next = cpNode.next.prevOnCircle;
|
|
79
78
|
cpNode = cpNode === next
|
|
80
79
|
? cpNode = cpNode.next.next // Terminal vertex
|
|
81
80
|
: cpNode = next; // Take last exit
|
|
@@ -120,27 +119,27 @@ function findAndAdd3Prongs(cpGraphs, cpStart, extreme) {
|
|
|
120
119
|
* tolerances.
|
|
121
120
|
*/
|
|
122
121
|
function findAndAdd3Prong(cpGraphs, visitedCps, extreme) {
|
|
123
|
-
|
|
124
|
-
for (
|
|
122
|
+
const δs = [];
|
|
123
|
+
for (const visitedCp of visitedCps) {
|
|
125
124
|
δs.push([visitedCp, visitedCp.next]);
|
|
126
125
|
}
|
|
127
|
-
|
|
128
|
-
|
|
126
|
+
const threeProng = find3Prong(δs, extreme);
|
|
127
|
+
const orders = [];
|
|
129
128
|
for (let i = 0; i < 3; i++) {
|
|
130
129
|
orders.push(
|
|
131
130
|
//PointOnShape.calcOrder(threeProng.circle, threeProng.ps[i])
|
|
132
131
|
calcPosOrder(threeProng.circle, threeProng.ps[i]));
|
|
133
132
|
}
|
|
134
|
-
|
|
133
|
+
const circle = add3Prong(cpGraphs, orders, threeProng);
|
|
135
134
|
if (typeof _debug_ !== 'undefined') {
|
|
136
135
|
add3ProngDebugInfo(circle, visitedCps);
|
|
137
136
|
}
|
|
138
137
|
}
|
|
139
138
|
/** @hidden */
|
|
140
139
|
function add3ProngDebugInfo(circle, visitedCps) {
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
140
|
+
const threeProngs = _debug_.generated.elems.threeProng;
|
|
141
|
+
const len = threeProngs.length;
|
|
142
|
+
const data = threeProngs[len - 1];
|
|
144
143
|
data.visitedCps = visitedCps;
|
|
145
144
|
data.circle = circle;
|
|
146
145
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"find-and-add-3-prongs.js","sourceRoot":"","sources":["../../../src/mat/find-mat/find-and-add-3-prongs.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AACzE,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,EAAE,SAAS,EAAG,MAAM,4BAA4B,CAAC;AAGxD;;;;;;;GAOG;AACH,SAAS,oBAAoB,CAC3B,QAAqC,EACrC,OAAiB,EACjB,OAAiB;IAElB,2EAA2E;IAC3E,oCAAoC;IAEpC,
|
|
1
|
+
{"version":3,"file":"find-and-add-3-prongs.js","sourceRoot":"","sources":["../../../src/mat/find-mat/find-and-add-3-prongs.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,21 +12,21 @@ import { add2Prong } from './add-2-prong.js';
|
|
|
12
12
|
* tolerances.
|
|
13
13
|
*/
|
|
14
14
|
function findAndAddHoleClosing2Prongs(loops, cpTrees, extreme) {
|
|
15
|
-
|
|
16
|
-
|
|
15
|
+
const bounds = getShapeBounds(loops);
|
|
16
|
+
const squaredDiagonalLength = (bounds.maxX.p[0] - bounds.minX.p[0]) ** 2 +
|
|
17
17
|
(bounds.maxY.p[1] - bounds.minY.p[1]) ** 2;
|
|
18
18
|
// Find the topmost points on each loop.
|
|
19
|
-
|
|
19
|
+
const minYs = loops.map(getMinYPos);
|
|
20
20
|
// We start at 1 since 0 is the outer (root) loop
|
|
21
21
|
for (let k = 1; k < minYs.length; k++) {
|
|
22
|
-
|
|
23
|
-
|
|
22
|
+
const posSource = minYs[k];
|
|
23
|
+
const holeClosingTwoProng = find2Prong(loops, extreme, squaredDiagonalLength, cpTrees, posSource, true, k);
|
|
24
24
|
if (!holeClosingTwoProng) {
|
|
25
25
|
throw new Error(`Unable to find hole-closing 2-prong`);
|
|
26
26
|
}
|
|
27
27
|
// TODO important - handle case of n-prong, i.e. more than one antipode
|
|
28
28
|
// - currently we only handle case of single antipode (the general case)
|
|
29
|
-
|
|
29
|
+
const { circle, zs: posAntipodes } = holeClosingTwoProng;
|
|
30
30
|
add2Prong(cpTrees, circle, posSource, [posAntipodes[0]], true, extreme);
|
|
31
31
|
}
|
|
32
32
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"find-and-add-hole-closing-2-prongs.js","sourceRoot":"","sources":["../../../src/mat/find-mat/find-and-add-hole-closing-2-prongs.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AACxD,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAG7C;;;;;;;;GAQG;AACH,SAAS,4BAA4B,CAC7B,KAAa,EACb,OAAmC,EACnC,OAAe;IAEnB,
|
|
1
|
+
{"version":3,"file":"find-and-add-hole-closing-2-prongs.js","sourceRoot":"","sources":["../../../src/mat/find-mat/find-and-add-hole-closing-2-prongs.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AACxD,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAG7C;;;;;;;;GAQG;AACH,SAAS,4BAA4B,CAC7B,KAAa,EACb,OAAmC,EACnC,OAAe;IAEnB,MAAM,MAAM,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC;IACrC,MAAM,qBAAqB,GACvB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAE,CAAC;QACxC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAE,CAAC,CAAC;IAE7C,wCAAwC;IACxC,MAAM,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IAEpC,iDAAiD;IACjD,KAAK,IAAI,CAAC,GAAC,CAAC,EAAE,CAAC,GAAC,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QAC/B,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;QAE3B,MAAM,mBAAmB,GAAG,UAAU,CAClC,KAAK,EAAE,OAAO,EAAE,qBAAqB,EAAE,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CACrE,CAAC;QAEF,IAAI,CAAC,mBAAmB,EAAE;YACtB,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC;SAC1D;QAED,uEAAuE;QACvE,wEAAwE;QACxE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,YAAY,EAAE,GAAG,mBAAmB,CAAC;QAEzD,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;KAC3E;AACL,CAAC;AAGD,OAAO,EAAE,4BAA4B,EAAE,CAAA"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { isPosQuiteSharpCorner } from '../../point-on-shape.js';
|
|
2
2
|
/** @hidden */
|
|
3
3
|
function getPotential2Prongs(possPerLoop) {
|
|
4
|
-
|
|
5
|
-
for (
|
|
6
|
-
|
|
7
|
-
for (
|
|
4
|
+
const for2ProngsArray = [];
|
|
5
|
+
for (const poss of possPerLoop) {
|
|
6
|
+
const for2Prongs = [];
|
|
7
|
+
for (const pos of poss) {
|
|
8
8
|
if (!isPosQuiteSharpCorner(pos)) {
|
|
9
9
|
for2Prongs.push(pos);
|
|
10
10
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-potential-2-prongs.js","sourceRoot":"","sources":["../../../src/mat/find-mat/get-potential-2-prongs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAG/E,cAAc;AACd,SAAS,mBAAmB,CAAC,WAA8B;IACvD,
|
|
1
|
+
{"version":3,"file":"get-potential-2-prongs.js","sourceRoot":"","sources":["../../../src/mat/find-mat/get-potential-2-prongs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAG/E,cAAc;AACd,SAAS,mBAAmB,CAAC,WAA8B;IACvD,MAAM,eAAe,GAAG,EAAE,CAAC;IAE3B,KAAK,MAAM,IAAI,IAAI,WAAW,EAAE;QAC5B,MAAM,UAAU,GAAG,EAAE,CAAC;QAEtB,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;YACpB,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,EAAE;gBAC7B,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;aACxB;SACJ;QAED,eAAe,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;KACpC;IAED,OAAO,eAAe,CAAC;AAC3B,CAAC;AAGD,OAAO,EAAE,mBAAmB,EAAE,CAAA"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { isPosQuiteSharpCorner } from '../../point-on-shape.js';
|
|
2
2
|
/** @hidden */
|
|
3
3
|
function getSharpCorners(possPerLoop) {
|
|
4
|
-
|
|
5
|
-
for (
|
|
6
|
-
|
|
7
|
-
for (
|
|
4
|
+
const sharpCornersPerLoop = [];
|
|
5
|
+
for (const poss of possPerLoop) {
|
|
6
|
+
const sharpCorners = [];
|
|
7
|
+
for (const pos of poss) {
|
|
8
8
|
//if (PointOnShape.isQuiteSharpCorner(pos)) {
|
|
9
9
|
if (isPosQuiteSharpCorner(pos)) {
|
|
10
10
|
sharpCorners.push(pos);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-sharp-corners.js","sourceRoot":"","sources":["../../../src/mat/find-mat/get-sharp-corners.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAG/E,cAAc;AACd,SAAS,eAAe,CAAC,WAA8B;IACnD,
|
|
1
|
+
{"version":3,"file":"get-sharp-corners.js","sourceRoot":"","sources":["../../../src/mat/find-mat/get-sharp-corners.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAG/E,cAAc;AACd,SAAS,eAAe,CAAC,WAA8B;IACnD,MAAM,mBAAmB,GAAG,EAAE,CAAC;IAE/B,KAAK,MAAM,IAAI,IAAI,WAAW,EAAE;QAC5B,MAAM,YAAY,GAAG,EAAE,CAAC;QAExB,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;YACpB,6CAA6C;YAC7C,IAAI,qBAAqB,CAAC,GAAG,CAAC,EAAE;gBAC5B,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;aAC1B;SACJ;QAED,mBAAmB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;KAC1C;IAED,OAAO,mBAAmB,CAAC;AAC/B,CAAC;AAGD,OAAO,EAAE,eAAe,EAAE,CAAA"}
|
|
@@ -3,9 +3,9 @@ import { squaredDistanceBetweenPointAndLineSegment, squaredDistanceBetween } fro
|
|
|
3
3
|
* @hidden
|
|
4
4
|
*/
|
|
5
5
|
function getClosestSquaredDistanceToRotatedRect(ps, p) {
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
6
|
+
const ds = [0, 1, 2, 3].map(i => squaredDistanceBetweenPointAndLineSegment(p, [ps[i], ps[(i + 1) % 4]]));
|
|
7
|
+
const width = squaredDistanceBetween(ps[0], ps[1]);
|
|
8
|
+
const height = squaredDistanceBetween(ps[0], ps[3]);
|
|
9
9
|
if (ds[0] <= height && ds[2] <= height &&
|
|
10
10
|
ds[1] <= width && ds[3] <= width) {
|
|
11
11
|
return 0; // Inside rotated rect
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-closest-squared-distance-to-rotated-rect.js","sourceRoot":"","sources":["../../../src/mat/geometry/get-closest-squared-distance-to-rotated-rect.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,yCAAyC,EAAE,sBAAsB,EACjE,MAAM,cAAc,CAAC;AAGtB;;GAEG;AACH,SAAS,sCAAsC,CAAC,EAAc,EAAE,CAAW;IAC1E,
|
|
1
|
+
{"version":3,"file":"get-closest-squared-distance-to-rotated-rect.js","sourceRoot":"","sources":["../../../src/mat/geometry/get-closest-squared-distance-to-rotated-rect.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,yCAAyC,EAAE,sBAAsB,EACjE,MAAM,cAAc,CAAC;AAGtB;;GAEG;AACH,SAAS,sCAAsC,CAAC,EAAc,EAAE,CAAW;IAC1E,MAAM,EAAE,GAAG,CAAC,CAAC,EAAC,CAAC,EAAC,CAAC,EAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,yCAAyC,CACrE,CAAC,EACD,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CACtB,CACD,CAAC;IAEF,MAAM,KAAK,GAAI,sBAAsB,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IACpD,MAAM,MAAM,GAAG,sBAAsB,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IAEpD,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,MAAM,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,MAAM;QACrC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAK,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,EAAE;QAEnC,OAAO,CAAC,CAAC,CAAC,sBAAsB;KAChC;IAED,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC;AACxB,CAAC;AAGD,OAAO,EAAE,sCAAsC,EAAE,CAAA"}
|
|
@@ -9,8 +9,8 @@ import { compareCps } from '../contact-point.js';
|
|
|
9
9
|
*/
|
|
10
10
|
function getBoundaryPieceBeziers(cpNodes) {
|
|
11
11
|
let cpThis = cpNodes[0];
|
|
12
|
-
|
|
13
|
-
|
|
12
|
+
const cpEnd = cpNodes[1];
|
|
13
|
+
const bezierPieces = [];
|
|
14
14
|
// As opposed to going around the circle and taking the last exit
|
|
15
15
|
let goStraight = true;
|
|
16
16
|
do {
|
|
@@ -20,8 +20,8 @@ function getBoundaryPieceBeziers(cpNodes) {
|
|
|
20
20
|
continue;
|
|
21
21
|
}
|
|
22
22
|
goStraight = false;
|
|
23
|
-
|
|
24
|
-
|
|
23
|
+
const posThis = cpThis.cp.pointOnShape;
|
|
24
|
+
const posNext = cpThis.next.cp.pointOnShape;
|
|
25
25
|
if (posNext.curve === posThis.curve &&
|
|
26
26
|
//PointOnShape.isQuiteSharpCorner(posThis) &&
|
|
27
27
|
//PointOnShape.isQuiteSharpCorner(posNext)) {
|
|
@@ -51,7 +51,7 @@ function addSkippedBeziers(bezierPieces, curveStart, curveEnd, t1) {
|
|
|
51
51
|
let curveThis = curveStart;
|
|
52
52
|
do {
|
|
53
53
|
curveThis = curveThis.next;
|
|
54
|
-
|
|
54
|
+
const tEnd = curveThis === curveEnd ? t1 : 1;
|
|
55
55
|
bezierPieces.push({ curve: curveThis, ts: [0, tEnd] });
|
|
56
56
|
} while (curveThis !== curveEnd);
|
|
57
57
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-boundary-piece-beziers.js","sourceRoot":"","sources":["../../src/mat/get-boundary-piece-beziers.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAGjD;;;;;;GAMG;AACH,SAAS,uBAAuB,CAAC,OAAiB;IAC9C,IAAI,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IACxB,
|
|
1
|
+
{"version":3,"file":"get-boundary-piece-beziers.js","sourceRoot":"","sources":["../../src/mat/get-boundary-piece-beziers.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAGjD;;;;;;GAMG;AACH,SAAS,uBAAuB,CAAC,OAAiB;IAC9C,IAAI,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IACxB,MAAM,KAAK,GAAI,OAAO,CAAC,CAAC,CAAC,CAAC;IAE1B,MAAM,YAAY,GAAG,EAAE,CAAC;IAExB,iEAAiE;IACjE,IAAI,UAAU,GAAG,IAAI,CAAC;IACtB,GAAG;QACC,IAAI,CAAC,UAAU,EAAE;YACb,UAAU,GAAG,IAAI,CAAC;YAClB,MAAM,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC,iBAAiB;YAC/C,SAAS;SACZ;QAED,UAAU,GAAG,KAAK,CAAC;QAEnB,MAAM,OAAO,GAAG,MAAM,CAAM,EAAE,CAAC,YAAY,CAAC;QAC5C,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,YAAY,CAAC;QAE5C,IAAI,OAAO,CAAC,KAAK,KAAK,OAAO,CAAC,KAAK;YAC/B,8CAA8C;YAC9C,6CAA6C;YAC7C,qBAAqB,CAAC,OAAO,CAAC;YAC9B,qBAAqB,CAAC,OAAO,CAAC,EAAE;YAEhC,aAAa;SAChB;aAAM,IAAI,OAAO,CAAC,KAAK,KAAK,OAAO,CAAC,KAAK;YAC/B,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,EAAE,MAAM,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE;YAElD,YAAY,CAAC,IAAI,CACb,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,CACvD,CAAC;SACL;aAAM;YACH,YAAY,CAAC,IAAI,CACb,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAC/C,CAAC;YAEF,IAAI,MAAM,CAAC,EAAE,CAAC,YAAY,CAAC,KAAK,CAAC,IAAI,KAAK,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,YAAY,CAAC,KAAK,CAAC,IAAI,EAAE;gBAC9E,iBAAiB,CACT,YAAY,EACZ,OAAO,CAAC,KAAK,EACb,OAAO,CAAC,KAAK,EACb,OAAO,CAAC,CAAC,CAChB,CAAC;aACL;SACJ;QAED,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC;KACxB,QAAQ,MAAM,KAAK,KAAK,EAAE;IAG3B,OAAO,YAAY,CAAC;AACxB,CAAC;AAGD;;;GAGG;AACH,SAAS,iBAAiB,CAClB,YAA4B,EAC5B,UAAoB,EACpB,QAAoB,EACpB,EAAqB;IAEzB,IAAI,SAAS,GAAG,UAAU,CAAC;IAC3B,GAAG;QACC,SAAS,GAAG,SAAS,CAAC,IAAI,CAAC;QAC3B,MAAM,IAAI,GAAG,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QAC7C,YAAY,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;KAC1D,QAAQ,SAAS,KAAK,QAAQ,EAAE;AACrC,CAAC;AAGD,OAAO,EAAE,uBAAuB,EAAE,CAAA"}
|
|
@@ -5,7 +5,7 @@ import { PointOnShape } from '../point-on-shape.js';
|
|
|
5
5
|
* @param curve
|
|
6
6
|
*/
|
|
7
7
|
function getContactCirclesAtInterface(curve) {
|
|
8
|
-
|
|
8
|
+
const { isQuiteSharp, isQuiteDull } = getCornerAtEnd(curve);
|
|
9
9
|
if (isQuiteSharp) {
|
|
10
10
|
return [new PointOnShape(curve, 1)];
|
|
11
11
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-contact-circles-at-interface.js","sourceRoot":"","sources":["../../src/mat/get-contact-circles-at-interface.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,cAAc,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAIpD;;;GAGG;AACH,SAAS,4BAA4B,CAAC,KAAY;IACjD,
|
|
1
|
+
{"version":3,"file":"get-contact-circles-at-interface.js","sourceRoot":"","sources":["../../src/mat/get-contact-circles-at-interface.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,cAAc,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAIpD;;;GAGG;AACH,SAAS,4BAA4B,CAAC,KAAY;IACjD,MAAM,EAAE,YAAY,EAAE,WAAW,EAAE,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC;IAE5D,IAAI,YAAY,EAAE;QACjB,OAAO,CAAC,IAAI,YAAY,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC;KACpC;SAAM,IAAI,WAAW,EAAE;QACvB,OAAO;YACN,IAAI,YAAY,CAAC,KAAK,EAAE,CAAC,CAAC;YAC1B,IAAI,YAAY,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;SAC/B,CAAC;KACF;IAED,OAAO,EAAE,CAAC;AACX,CAAC;AAGD,OAAO,EAAE,4BAA4B,EAAE,CAAA"}
|
package/node/mat/get-leaves.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-leaves.js","sourceRoot":"","sources":["../../src/mat/get-leaves.ts"],"names":[],"mappings":"AAGA,cAAc;AACd,SAAS,SAAS,CAAC,MAAc;IAC7B,
|
|
1
|
+
{"version":3,"file":"get-leaves.js","sourceRoot":"","sources":["../../src/mat/get-leaves.ts"],"names":[],"mappings":"AAGA,cAAc;AACd,SAAS,SAAS,CAAC,MAAc;IAC7B,MAAM,MAAM,GAAa,EAAE,CAAC;IAE5B,MAAM,GAAG,GAAG,MAAM,CAAC,YAAY,EAAE,CAAC;IAClC,GAAG,CAAC,OAAO,CAAC,UAAS,EAAE;QACnB,IAAI,EAAE,CAAC,aAAa,EAAE,EAAE;YACpB,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;SACnB;IACL,CAAC,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC;AAClB,CAAC;AAGD,OAAO,EAAE,SAAS,EAAE,CAAA"}
|
|
@@ -9,7 +9,7 @@ import { CpNode } from '../cp-node.js';
|
|
|
9
9
|
* @param order2
|
|
10
10
|
*/
|
|
11
11
|
function getNeighbouringPoints(cpTree, pos, order, order2) {
|
|
12
|
-
|
|
12
|
+
const cps = cpTree.findBounds(new CpNode({ pointOnShape: pos, circle: undefined, order, order2 }, false, false));
|
|
13
13
|
if (!cps[0] && !cps[1]) {
|
|
14
14
|
// The tree is still empty
|
|
15
15
|
return [undefined, undefined];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-neighboring-cps.js","sourceRoot":"","sources":["../../src/mat/get-neighboring-cps.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAGvC;;;;;;;;GAQG;AACH,SAAS,qBAAqB,CACtB,MAAwB,EACxB,GAAkB,EAClB,KAAa,EACb,MAAc;IAElB,
|
|
1
|
+
{"version":3,"file":"get-neighboring-cps.js","sourceRoot":"","sources":["../../src/mat/get-neighboring-cps.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAGvC;;;;;;;;GAQG;AACH,SAAS,qBAAqB,CACtB,MAAwB,EACxB,GAAkB,EAClB,KAAa,EACb,MAAc;IAElB,MAAM,GAAG,GAAG,MAAM,CAAC,UAAU,CACzB,IAAI,MAAM,CAAC,EAAE,YAAY,EAAE,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,CACpF,CAAC;IAEF,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;QACpB,0BAA0B;QAC1B,OAAO,CAAC,SAAS,EAAE,SAAS,CAAa,CAAC;KAC7C;IAED,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;QACpB,sDAAsD;QACtD,mDAAmD;QACnD,OAAO;YACH,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC;YACvB,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC;SACd,CAAC;KACjB;IAED,OAAO;QACH,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK;QACZ,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK;KACH,CAAC;AAClB,CAAC;AAGD,OAAO,EAAE,qBAAqB,EAAE,CAAA"}
|
|
@@ -30,21 +30,21 @@ function isAnotherCpCloseby(cpTrees, pos, circle, order, order2, extreme, color)
|
|
|
30
30
|
//const DISTANCE_THRESHOLD = extreme * 1e-12;
|
|
31
31
|
// It seems this can be zero else the ordering should be correct
|
|
32
32
|
//const DISTANCE_THRESHOLD = 0;
|
|
33
|
-
|
|
34
|
-
|
|
33
|
+
const cpTree = cpTrees.get(pos.curve.loop);
|
|
34
|
+
const cpNodes = getNeighbouringPoints(cpTree, pos, order, order2);
|
|
35
35
|
if (!cpNodes[0]) {
|
|
36
36
|
return false;
|
|
37
37
|
}
|
|
38
|
-
for (
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
38
|
+
for (const cpNode of cpNodes) {
|
|
39
|
+
const pos2 = cpNode.cp.pointOnShape;
|
|
40
|
+
const p1 = pos.p;
|
|
41
|
+
const p2 = pos2.p;
|
|
42
42
|
if (distanceBetween(p1, p2) > DISTANCE_THRESHOLD) {
|
|
43
43
|
continue;
|
|
44
44
|
}
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
45
|
+
const v1 = toUnitVector(fromTo(cpNode.cp.pointOnShape.p, cpNode.cp.circle.center));
|
|
46
|
+
const v2 = toUnitVector(fromTo(p1, circle.center));
|
|
47
|
+
const cosTheta = dot(v1, v2);
|
|
48
48
|
if (cosTheta > ANGLE_THRESHOLD) {
|
|
49
49
|
//console.log(`%c${cosTheta} - ${distanceBetween(p1,p2)}`, `color: ${color}`);
|
|
50
50
|
return true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"is-another-cp-closeby.js","sourceRoot":"","sources":["../../src/mat/is-another-cp-closeby.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AAK1E,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AAGjE,cAAc;AACd,qEAAqE;AACrE,MAAM,eAAe,GAAG,kBAAkB,CAAC,CAAC,2BAA2B;AACvE,yEAAyE;AACzE,wEAAwE;AACxE,6EAA6E;AAC7E,8EAA8E;AAG9E;;;;;;;;;;;;GAYG;AACH,SAAS,kBAAkB,CACnB,OAAmC,EACnC,GAAkB,EAClB,MAAc,EACd,KAAa,EACb,MAAc,EACd,OAAe,EACf,KAAa;IAEjB,sBAAsB;IACtB,6CAA6C;IAC7C,4CAA4C;IAC5C,MAAM,kBAAkB,GAAG,OAAO,GAAG,IAAI,CAAC;IAC1C,uDAAuD;IACvD,4CAA4C;IAC5C,6CAA6C;IAC7C,gEAAgE;IAChE,+BAA+B;IAE/B,
|
|
1
|
+
{"version":3,"file":"is-another-cp-closeby.js","sourceRoot":"","sources":["../../src/mat/is-another-cp-closeby.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AAK1E,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AAGjE,cAAc;AACd,qEAAqE;AACrE,MAAM,eAAe,GAAG,kBAAkB,CAAC,CAAC,2BAA2B;AACvE,yEAAyE;AACzE,wEAAwE;AACxE,6EAA6E;AAC7E,8EAA8E;AAG9E;;;;;;;;;;;;GAYG;AACH,SAAS,kBAAkB,CACnB,OAAmC,EACnC,GAAkB,EAClB,MAAc,EACd,KAAa,EACb,MAAc,EACd,OAAe,EACf,KAAa;IAEjB,sBAAsB;IACtB,6CAA6C;IAC7C,4CAA4C;IAC5C,MAAM,kBAAkB,GAAG,OAAO,GAAG,IAAI,CAAC;IAC1C,uDAAuD;IACvD,4CAA4C;IAC5C,6CAA6C;IAC7C,gEAAgE;IAChE,+BAA+B;IAE/B,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC3C,MAAM,OAAO,GAAG,qBAAqB,CAAC,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;IAClE,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;QAAE,OAAO,KAAK,CAAA;KAAE;IAEjC,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;QAC1B,MAAM,IAAI,GAAG,MAAM,CAAC,EAAE,CAAC,YAAY,CAAC;QACpC,MAAM,EAAE,GAAG,GAAG,CAAC,CAAC,CAAC;QACjB,MAAM,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC;QAElB,IAAI,eAAe,CAAC,EAAE,EAAC,EAAE,CAAC,GAAG,kBAAkB,EAAE;YAC7C,SAAS;SACZ;QAED,MAAM,EAAE,GAAG,YAAY,CAAC,MAAM,CAC1B,MAAM,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,EACxB,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,MAAM,CAC1B,CAAC,CAAC;QACH,MAAM,EAAE,GAAG,YAAY,CAAC,MAAM,CAC1B,EAAE,EACF,MAAM,CAAC,MAAM,CAChB,CAAC,CAAC;QACH,MAAM,QAAQ,GAAG,GAAG,CAAC,EAAE,EAAC,EAAE,CAAC,CAAC;QAE5B,IAAI,QAAQ,GAAG,eAAe,EAAE;YAC5B,8EAA8E;YAC9E,OAAO,IAAI,CAAC;SACf;KACJ;IAED,OAAO,KAAK,CAAC;AACjB,CAAC;AAGD,OAAO,EAAE,kBAAkB,EAAE,CAAA"}
|
|
@@ -17,25 +17,25 @@ import { getCurveBetween } from '../get-curve/get-curve-between.js';
|
|
|
17
17
|
* Distance - defaults to 1
|
|
18
18
|
*/
|
|
19
19
|
function simplifyMatMapOnly(cpNode, anlgeTolerance = 15, hausdorffTolerance = 1e-1, hausdorffSpacing = 1e0) {
|
|
20
|
-
|
|
20
|
+
const simpleMap = new Map();
|
|
21
21
|
// Start from a leaf
|
|
22
22
|
while (!cpNode.isTerminating()) {
|
|
23
23
|
cpNode = cpNode.next;
|
|
24
24
|
}
|
|
25
|
-
|
|
26
|
-
|
|
25
|
+
const branches = getBranches(cpNode, anlgeTolerance);
|
|
26
|
+
const canDeletes = [];
|
|
27
27
|
for (let k = 0; k < branches.length; k++) {
|
|
28
|
-
|
|
28
|
+
const branch = branches[k];
|
|
29
29
|
// Try to remove some
|
|
30
30
|
let j = 0;
|
|
31
31
|
while (j < branch.length) {
|
|
32
|
-
|
|
32
|
+
const i = j;
|
|
33
33
|
while (true) {
|
|
34
34
|
j++;
|
|
35
35
|
if (j === branch.length) {
|
|
36
36
|
break;
|
|
37
37
|
}
|
|
38
|
-
|
|
38
|
+
const hd = getTotalHausdorffDistance(i, j, branch, hausdorffSpacing);
|
|
39
39
|
if (hd > hausdorffTolerance) {
|
|
40
40
|
break;
|
|
41
41
|
}
|
|
@@ -47,22 +47,22 @@ function simplifyMatMapOnly(cpNode, anlgeTolerance = 15, hausdorffTolerance = 1e
|
|
|
47
47
|
// no simplification occured
|
|
48
48
|
}
|
|
49
49
|
else {
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
50
|
+
const branStart = branch[i];
|
|
51
|
+
const branEnd = branch[j - 1];
|
|
52
|
+
const medial = toCubic(getCurveBetween(branStart, branEnd.next));
|
|
53
|
+
const rev = medial.slice().reverse();
|
|
54
54
|
let curCpNode = branStart;
|
|
55
55
|
let prevT = 0;
|
|
56
56
|
while (curCpNode !== branEnd) {
|
|
57
|
-
|
|
57
|
+
const t = closestPointOnBezier(medial, curCpNode.next.cp.circle.center).t;
|
|
58
58
|
simpleMap.set(curCpNode, { ps: medial, ts: [prevT, t] });
|
|
59
|
-
|
|
59
|
+
const oppositeCpNode = curCpNode.nextOnCircle.prev;
|
|
60
60
|
simpleMap.set(oppositeCpNode, { ps: rev, ts: [1 - t, 1 - prevT] });
|
|
61
61
|
prevT = t;
|
|
62
62
|
curCpNode = curCpNode.next;
|
|
63
63
|
}
|
|
64
64
|
simpleMap.set(curCpNode, { ps: medial, ts: [prevT, 1] });
|
|
65
|
-
|
|
65
|
+
const oppositeCpNode = curCpNode.nextOnCircle.prev;
|
|
66
66
|
simpleMap.set(oppositeCpNode, { ps: rev, ts: [0, 1 - prevT] });
|
|
67
67
|
}
|
|
68
68
|
}
|
|
@@ -70,8 +70,8 @@ function simplifyMatMapOnly(cpNode, anlgeTolerance = 15, hausdorffTolerance = 1e
|
|
|
70
70
|
return { simpleMap, cpNode };
|
|
71
71
|
}
|
|
72
72
|
function getTotalHausdorffDistance(i, j, branch, hausdorffSpacing) {
|
|
73
|
-
|
|
74
|
-
|
|
73
|
+
const hds = [];
|
|
74
|
+
const longCurve = getCurveBetween(branch[i], branch[j].next);
|
|
75
75
|
for (let m = i; m < j + 1; m++) {
|
|
76
76
|
hds.push(hausdorffDistance(getCurveToNext(branch[m]), longCurve, hausdorffSpacing));
|
|
77
77
|
}
|