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,18 +10,18 @@ function createInitialCpGraph(loops, cpTrees, sharpCornerss /*,
|
|
|
10
10
|
xMap: Map<number[][],{ ps: number[][] }>*/) {
|
|
11
11
|
let cpNode;
|
|
12
12
|
for (let k = 0; k < sharpCornerss.length; k++) {
|
|
13
|
-
|
|
14
|
-
// qqq
|
|
15
|
-
|
|
13
|
+
const sharpCorners = sharpCornerss[k];
|
|
14
|
+
// qqq const cpTree = new LlRbTree(CpNode.comparator, [], true);
|
|
15
|
+
const cpTree = new LlRbTree(CpNode.comparator, false);
|
|
16
16
|
let cpNode1 = undefined;
|
|
17
17
|
let cpNode2 = undefined;
|
|
18
|
-
for (
|
|
19
|
-
|
|
20
|
-
//
|
|
21
|
-
//
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
18
|
+
for (const pos of sharpCorners) {
|
|
19
|
+
const ps = pos.curve.next.ps;
|
|
20
|
+
//const x = xMap.get(ps);
|
|
21
|
+
//const isIntersection = !!x;
|
|
22
|
+
const circle = { center: pos.p, radius: 0 };
|
|
23
|
+
const cp1 = { pointOnShape: pos, circle, order: -1, order2: 0 };
|
|
24
|
+
const cp2 = { pointOnShape: pos, circle, order: +1, order2: 0 };
|
|
25
25
|
cpNode1 = CpNode.insert(false, /*isIntersection*/ false, cpTree, cp1, cpNode2);
|
|
26
26
|
cpNode2 = CpNode.insert(false, /*isIntersection*/ false, cpTree, cp2, cpNode1);
|
|
27
27
|
cpNode1.prevOnCircle = cpNode2;
|
|
@@ -32,7 +32,7 @@ xMap: Map<number[][],{ ps: number[][] }>*/) {
|
|
|
32
32
|
if (!cpNode) {
|
|
33
33
|
cpNode = cpNode1;
|
|
34
34
|
}
|
|
35
|
-
|
|
35
|
+
const loop = loops[k];
|
|
36
36
|
cpTrees.set(loop, cpTree);
|
|
37
37
|
}
|
|
38
38
|
return cpNode;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-initial-cp-graph.js","sourceRoot":"","sources":["../../../src/mat/find-mat/create-initial-cp-graph.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE1C,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAK1C;;;;;GAKG;AACH,SAAS,oBAAoB,CACrB,KAAa,EACb,OAAoC,EACpC,aAAgC,CAAA;0CACU;IAE9C,IAAI,MAAM,CAAC;IAEX,KAAK,IAAI,CAAC,GAAC,CAAC,EAAE,CAAC,GAAC,aAAa,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACvC,
|
|
1
|
+
{"version":3,"file":"create-initial-cp-graph.js","sourceRoot":"","sources":["../../../src/mat/find-mat/create-initial-cp-graph.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE1C,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAK1C;;;;;GAKG;AACH,SAAS,oBAAoB,CACrB,KAAa,EACb,OAAoC,EACpC,aAAgC,CAAA;0CACU;IAE9C,IAAI,MAAM,CAAC;IAEX,KAAK,IAAI,CAAC,GAAC,CAAC,EAAE,CAAC,GAAC,aAAa,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACvC,MAAM,YAAY,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC;QAEtC,gEAAgE;QAChE,MAAM,MAAM,GAAG,IAAI,QAAQ,CAAC,MAAM,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;QAEtD,IAAI,OAAO,GAAG,SAAS,CAAC;QACxB,IAAI,OAAO,GAAG,SAAS,CAAC;QACxB,KAAK,MAAM,GAAG,IAAI,YAAY,EAAE;YAC5B,MAAM,EAAE,GAAG,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;YAC7B,yBAAyB;YACzB,6BAA6B;YAE7B,MAAM,MAAM,GAAG,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC;YAE5C,MAAM,GAAG,GAAiB,EAAE,YAAY,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC;YAC9E,MAAM,GAAG,GAAiB,EAAE,YAAY,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC;YAE9E,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,kBAAkB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC;YAC/E,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,kBAAkB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC;YAE/E,OAAO,CAAC,YAAY,GAAG,OAAO,CAAC;YAC/B,OAAO,CAAC,YAAY,GAAG,OAAO,CAAC;YAE/B,OAAO,CAAC,YAAY,GAAG,OAAO,CAAC;YAC/B,OAAO,CAAC,YAAY,GAAG,OAAO,CAAC;SAClC;QAED,IAAI,CAAC,MAAM,EAAE;YAAE,MAAM,GAAG,OAAO,CAAC;SAAE;QAElC,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;QACtB,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;KAC7B;IAED,OAAO,MAAM,CAAC;AAClB,CAAC;AAGD,OAAO,EAAE,oBAAoB,EAAE,CAAA"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { getTwoProngType } from '../../get-two-prong-type.js';
|
|
2
2
|
/** @hidden */
|
|
3
3
|
function addDebugInfo(bezierPieces, failed, pos, circle, z, δ, xs, holeClosing) {
|
|
4
|
-
|
|
4
|
+
const twoProng = {
|
|
5
5
|
generated: _debug_.generated,
|
|
6
6
|
bezierPieces,
|
|
7
7
|
pos,
|
|
@@ -15,7 +15,7 @@ function addDebugInfo(bezierPieces, failed, pos, circle, z, δ, xs, holeClosing)
|
|
|
15
15
|
deleted: false,
|
|
16
16
|
cpNode: undefined
|
|
17
17
|
};
|
|
18
|
-
|
|
18
|
+
const twoProngType = getTwoProngType(twoProng);
|
|
19
19
|
_debug_.generated.elems[twoProngType].push(twoProng);
|
|
20
20
|
}
|
|
21
21
|
export { addDebugInfo };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-debug-info.js","sourceRoot":"","sources":["../../../../src/mat/find-mat/find-2-prong/add-debug-info.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAK9D,cAAc;AACd,SAAS,YAAY,CACb,YAA2B,EAC3B,MAAe,EACf,GAAkB,EAClB,MAAc,EACd,CAAgB,EAChB,CAAW,EACX,EAAoB,EACpB,WAAoB;IAExB,
|
|
1
|
+
{"version":3,"file":"add-debug-info.js","sourceRoot":"","sources":["../../../../src/mat/find-mat/find-2-prong/add-debug-info.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAK9D,cAAc;AACd,SAAS,YAAY,CACb,YAA2B,EAC3B,MAAe,EACf,GAAkB,EAClB,MAAc,EACd,CAAgB,EAChB,CAAW,EACX,EAAoB,EACpB,WAAoB;IAExB,MAAM,QAAQ,GAAyB;QAC/B,SAAS,EAAE,OAAO,CAAC,SAAS;QAC5B,YAAY;QACZ,GAAG;QACH,CAAC;QACD,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS;QACtB,MAAM;QACN,EAAE;QACF,MAAM;QACN,WAAW;QACX,QAAQ,EAAE,KAAK;QACf,OAAO,EAAE,KAAK;QACd,MAAM,EAAE,SAAS;KACxB,CAAC;IAEF,MAAM,YAAY,GAAG,eAAe,CAAC,QAAQ,CAAsB,CAAC;IACpE,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;AACzD,CAAC;AAGD,OAAO,EAAE,YAAY,EAAE,CAAA"}
|
|
@@ -15,11 +15,11 @@ function cullBezierPieces(bezierPieces, p, rSquared) {
|
|
|
15
15
|
if (bezierPieces.length <= CULL_THRESHOLD) {
|
|
16
16
|
return bezierPieces;
|
|
17
17
|
}
|
|
18
|
-
|
|
19
|
-
for (
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
18
|
+
const newPieces = [];
|
|
19
|
+
for (const bezierPiece of bezierPieces) {
|
|
20
|
+
const ps = bezierPiece.curve.ps;
|
|
21
|
+
const rect = getBoundingBox_(ps);
|
|
22
|
+
const bd = getClosestSquareDistanceToRect(rect, p);
|
|
23
23
|
if (bd <= rSquared * TOLERANCE) {
|
|
24
24
|
newPieces.push(bezierPiece);
|
|
25
25
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cull-bezier-pieces.js","sourceRoot":"","sources":["../../../../src/mat/find-mat/find-2-prong/cull-bezier-pieces.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,8BAA8B,EAAE,MAAM,uDAAuD,CAAC;AAEvG,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAGhE;;;;;;;GAOG;AACH,SAAS,gBAAgB,CACjB,YAA2B,EAC3B,CAAW,EACX,QAAgB;IAEpB,MAAM,cAAc,GAAG,CAAC,CAAC;IACzB,8BAA8B;IAC9B,MAAM,SAAS,GAAG,CAAC,GAAC,IAAI,CAAC;IAEzB,IAAI,YAAY,CAAC,MAAM,IAAI,cAAc,EAAE;QACvC,OAAO,YAAY,CAAC;KACvB;IAGD,
|
|
1
|
+
{"version":3,"file":"cull-bezier-pieces.js","sourceRoot":"","sources":["../../../../src/mat/find-mat/find-2-prong/cull-bezier-pieces.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,8BAA8B,EAAE,MAAM,uDAAuD,CAAC;AAEvG,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAGhE;;;;;;;GAOG;AACH,SAAS,gBAAgB,CACjB,YAA2B,EAC3B,CAAW,EACX,QAAgB;IAEpB,MAAM,cAAc,GAAG,CAAC,CAAC;IACzB,8BAA8B;IAC9B,MAAM,SAAS,GAAG,CAAC,GAAC,IAAI,CAAC;IAEzB,IAAI,YAAY,CAAC,MAAM,IAAI,cAAc,EAAE;QACvC,OAAO,YAAY,CAAC;KACvB;IAGD,MAAM,SAAS,GAAG,EAAE,CAAC;IACrB,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE;QACpC,MAAM,EAAE,GAAG,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC;QAEhC,MAAM,IAAI,GAAG,eAAe,CAAC,EAAE,CAAC,CAAC;QACjC,MAAM,EAAE,GAAG,8BAA8B,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;QACnD,IAAI,EAAE,IAAI,QAAQ,GAAG,SAAS,EAAE;YAC5B,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;SAC/B;KACJ;IAED,OAAO,SAAS,CAAC;AACrB,CAAC;AAGD,OAAO,EAAE,gBAAgB,EAAE,CAAA"}
|
|
@@ -42,7 +42,7 @@ function find2Prong(loops, extreme, squaredDiagonalLength, cpTrees, y, isHoleClo
|
|
|
42
42
|
const maxOsculatingCircleRadiusSquared = squaredDiagonalLength;
|
|
43
43
|
// The boundary piece that should contain the other point of
|
|
44
44
|
// the 2-prong circle. (Defined by start and end points).
|
|
45
|
-
|
|
45
|
+
const { bezierPieces, δ } = getInitialBezierPieces(isHoleClosing, k, loops, cpTrees, y);
|
|
46
46
|
//console.log(bezierPieces.length)
|
|
47
47
|
/** The center of the two-prong (successively refined) */
|
|
48
48
|
let x;
|
|
@@ -60,12 +60,12 @@ function find2Prong(loops, extreme, squaredDiagonalLength, cpTrees, y, isHoleClo
|
|
|
60
60
|
r = squaredDistanceBetween(p, x);
|
|
61
61
|
}
|
|
62
62
|
// The lines below is an optimization.
|
|
63
|
-
|
|
63
|
+
const r_ = reduceRadius(extreme, bezierPieces, p, x);
|
|
64
64
|
if (r > r_) {
|
|
65
65
|
x = interpolate(p, x, Math.sqrt(r_ / r));
|
|
66
66
|
}
|
|
67
67
|
/** Trace the convergence (for debugging). */
|
|
68
|
-
|
|
68
|
+
const xs = [];
|
|
69
69
|
/** The antipode of the two-prong (successively refined) */
|
|
70
70
|
let z;
|
|
71
71
|
let i = 0;
|
|
@@ -76,16 +76,16 @@ function find2Prong(loops, extreme, squaredDiagonalLength, cpTrees, y, isHoleClo
|
|
|
76
76
|
do {
|
|
77
77
|
i++;
|
|
78
78
|
/** squared distance between source boundary point and circle center */
|
|
79
|
-
|
|
79
|
+
const r = squaredDistanceBetween(x, y.p);
|
|
80
80
|
bezierPieces_ = cullBezierPieces(bezierPieces_, x, r);
|
|
81
81
|
z = getClosestBoundaryPoint(bezierPieces_, x, y.curve, y.t);
|
|
82
82
|
if (z === undefined) {
|
|
83
83
|
if (typeof _debug_ !== 'undefined') {
|
|
84
|
-
|
|
85
|
-
|
|
84
|
+
const elems = _debug_.generated.elems;
|
|
85
|
+
const elem = isHoleClosing
|
|
86
86
|
? elems.twoProng_holeClosing
|
|
87
87
|
: elems.twoProng_regular;
|
|
88
|
-
|
|
88
|
+
const elemStr = isHoleClosing
|
|
89
89
|
? 'hole-closing: ' + elem.length
|
|
90
90
|
: 'regular: ' + elem.length;
|
|
91
91
|
console.log('failed: no closest point - ' + elemStr);
|
|
@@ -97,7 +97,7 @@ function find2Prong(loops, extreme, squaredDiagonalLength, cpTrees, y, isHoleClo
|
|
|
97
97
|
xs.push({ x, y, z: z.pos, t: y.t });
|
|
98
98
|
}
|
|
99
99
|
/** squared distance between anti-pode boundary point and circle center */
|
|
100
|
-
|
|
100
|
+
const d = squaredDistanceBetween(x, z.pos.p);
|
|
101
101
|
//if (i === 1 && d*oneProngTolerance >= r) {
|
|
102
102
|
if (i === 1 && r < d + oneProngTolerance) {
|
|
103
103
|
// It is a 1-prong.
|
|
@@ -128,8 +128,8 @@ function find2Prong(loops, extreme, squaredDiagonalLength, cpTrees, y, isHoleClo
|
|
|
128
128
|
// nextX, but rather (distance from x to y) - (distance from x to z)
|
|
129
129
|
// Find the point on the line connecting y with x that is
|
|
130
130
|
// equidistant from y and z. This will be our next x.
|
|
131
|
-
|
|
132
|
-
|
|
131
|
+
const nextX = findEquidistantPointOnLine(x, y.p, z.pos.p);
|
|
132
|
+
const squaredError = squaredDistanceBetween(x, nextX);
|
|
133
133
|
x = nextX;
|
|
134
134
|
if (squaredError < squaredErrorTolerance) {
|
|
135
135
|
done++; // Do one more iteration
|
|
@@ -169,25 +169,25 @@ function reduceRadius(extreme, bezierPieces, p, x) {
|
|
|
169
169
|
let prevP = undefined;
|
|
170
170
|
let minRadius = Number.POSITIVE_INFINITY;
|
|
171
171
|
for (let i = 0; i < bezierPieces.length; i++) {
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
172
|
+
const bezierPiece = bezierPieces[i];
|
|
173
|
+
const ps = bezierPiece.curve.ps;
|
|
174
|
+
const p1 = evalDeCasteljau(ps, bezierPiece.ts[0]);
|
|
175
175
|
let r1 = Number.POSITIVE_INFINITY;
|
|
176
176
|
// Prevent evaluating the same points twice
|
|
177
177
|
if (!prevP || prevP[0] !== p1[0] || prevP[1] !== p1[1]) {
|
|
178
|
-
|
|
178
|
+
const cc1 = getCircleCenterFrom2PointsAndNormal(extreme, p, x, p1);
|
|
179
179
|
if (cc1) {
|
|
180
180
|
r1 = squaredDistanceBetween(p, cc1);
|
|
181
181
|
}
|
|
182
182
|
}
|
|
183
183
|
let r2 = Number.POSITIVE_INFINITY;
|
|
184
|
-
|
|
185
|
-
|
|
184
|
+
const p2 = evalDeCasteljau(ps, bezierPiece.ts[1]);
|
|
185
|
+
const cc2 = getCircleCenterFrom2PointsAndNormal(extreme, p, x, p2);
|
|
186
186
|
if (cc2) {
|
|
187
187
|
r2 = squaredDistanceBetween(p, cc2);
|
|
188
188
|
}
|
|
189
189
|
prevP = p2;
|
|
190
|
-
|
|
190
|
+
const d = Math.min(r1, r2);
|
|
191
191
|
if (d < minRadius) {
|
|
192
192
|
minRadius = d;
|
|
193
193
|
}
|
|
@@ -205,25 +205,25 @@ function reduceRadius(extreme, bezierPieces, p, x) {
|
|
|
205
205
|
*/
|
|
206
206
|
function getCircleCenterFrom2PointsAndNormal(extreme, p, x, p1) {
|
|
207
207
|
// TODO - remove delta
|
|
208
|
-
|
|
208
|
+
const TOLERANCE = (1e-4 * extreme) ** 2;
|
|
209
209
|
// Ignore if p and p1 are too close together
|
|
210
210
|
if (squaredDistanceBetween(p, p1) < TOLERANCE) {
|
|
211
211
|
return undefined;
|
|
212
212
|
}
|
|
213
213
|
/** The perpindicular bisector between the two given points on the circle */
|
|
214
|
-
|
|
214
|
+
const pb = [
|
|
215
215
|
(p[0] + p1[0]) / 2,
|
|
216
216
|
(p[1] + p1[1]) / 2,
|
|
217
217
|
];
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
218
|
+
const tan = [p1[0] - p[0], p1[1] - p[1]];
|
|
219
|
+
const norm = [-tan[1], tan[0]]; // Rotate by 90 degrees
|
|
220
|
+
const pb2 = [pb[0] + norm[0], pb[1] + norm[1]];
|
|
221
|
+
const res = lineLineIntersection([p, x], [pb, pb2]);
|
|
222
222
|
if (!res) {
|
|
223
223
|
return undefined;
|
|
224
224
|
}
|
|
225
|
-
|
|
226
|
-
|
|
225
|
+
const resO = [res[0] - p[0], res[1] - p[1]];
|
|
226
|
+
const xO = [x[0] - p[0], x[1] - p[1]];
|
|
227
227
|
if (dot(resO, xO) < 0) {
|
|
228
228
|
return undefined;
|
|
229
229
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"find-2-prong.js","sourceRoot":"","sources":["../../../../src/mat/find-mat/find-2-prong/find-2-prong.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,oBAAoB,EAAE,eAAe,EAAE,sBAAsB,EAAE,WAAW,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AAC/G,OAAO,EAAE,eAAe,IAAI,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAElE,OAAO,EAAE,uBAAuB,EAAE,MAC9B,4DAA4D,CAAC;AAIjE,OAAO,EAAE,mBAAmB,EAAiB,MAAM,4BAA4B,CAAC;AAEhF,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAEnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,0BAA0B,EAAE,MAAM,qCAAqC,CAAC;AACjF,OAAO,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAC;AACxE,OAAO,EAAE,sBAAsB,EAAE,MAAM,2DAA2D,CAAC;AAGnG,MAAM,eAAe,GAAG,gBAAgB,CAAC;AAGzC;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAEH,SAAS,UAAU,CACjB,KAAa,EACb,OAAe,EACf,qBAA6B,EAC7B,OAAmC,EAC7B,CAAgB,EACtB,aAAsB,EACtB,CAAS;IAEV,MAAM,cAAc,GAAG,EAAE,CAAC;IAC1B,MAAM,0BAA0B,GAAG,CAAC,IAAI,GAAG,OAAO,CAAC,IAAE,CAAC,CAAC;IACvD,yCAAyC;IACzC,MAAM,iBAAiB,GAAG,CAAC,IAAI,CAAC,IAAE,CAAC,CAAC;IACpC,MAAM,qBAAqB,GAAG,IAAI,GAAG,0BAA0B,CAAC;IAChE,MAAM,gCAAgC,GAAG,qBAAqB,CAAC;IAE/D,6DAA6D;IAC7D,yDAAyD;IACzD,
|
|
1
|
+
{"version":3,"file":"find-2-prong.js","sourceRoot":"","sources":["../../../../src/mat/find-mat/find-2-prong/find-2-prong.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,7 @@
|
|
|
8
8
|
function findEquidistantPointOnLine(x, y, z) {
|
|
9
9
|
// Some basic algebra (not shown) finds the required point.
|
|
10
10
|
// Swap axes if x and y are more aligned to y-axis than to x-axis.
|
|
11
|
-
|
|
11
|
+
const swapAxes = Math.abs((x[1] - y[1]) / (x[0] - y[0])) > 1;
|
|
12
12
|
// Cache
|
|
13
13
|
let x1, x2, y1, y2, z1, z2;
|
|
14
14
|
if (swapAxes) {
|
|
@@ -28,12 +28,12 @@ function findEquidistantPointOnLine(x, y, z) {
|
|
|
28
28
|
z2 = z[1];
|
|
29
29
|
}
|
|
30
30
|
// a <= 1 (due to swapped axes)
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
31
|
+
const a = (x2 - y2) / (x1 - y1);
|
|
32
|
+
const b = y2 - a * y1;
|
|
33
|
+
const c = (y1 * y1 + y2 * y2 - z1 * z1 - z2 * z2) + 2 * b * (z2 - y2);
|
|
34
|
+
const d = y1 - z1 + a * (y2 - z2);
|
|
35
|
+
const t1 = c / (2 * d);
|
|
36
|
+
const t2 = a * t1 + b;
|
|
37
37
|
return swapAxes ? [t2, t1] : [t1, t2];
|
|
38
38
|
}
|
|
39
39
|
export { findEquidistantPointOnLine };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"find-equidistant-point-on-line.js","sourceRoot":"","sources":["../../../../src/mat/find-mat/find-2-prong/find-equidistant-point-on-line.ts"],"names":[],"mappings":"AACA;;;;;;GAMG;AACH,SAAS,0BAA0B,CAAC,CAAW,EAAE,CAAW,EAAE,CAAW;IACxE,2DAA2D;IAE3D,kEAAkE;IAClE,
|
|
1
|
+
{"version":3,"file":"find-equidistant-point-on-line.js","sourceRoot":"","sources":["../../../../src/mat/find-mat/find-2-prong/find-equidistant-point-on-line.ts"],"names":[],"mappings":"AACA;;;;;;GAMG;AACH,SAAS,0BAA0B,CAAC,CAAW,EAAE,CAAW,EAAE,CAAW;IACxE,2DAA2D;IAE3D,kEAAkE;IAClE,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;IAE7D,QAAQ;IACR,IAAI,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC;IAE3B,IAAI,QAAQ,EAAE;QACb,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QAAC,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QACrB,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QAAC,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QACrB,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QAAC,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;KACrB;SAAM;QACN,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QAAC,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QACrB,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QAAC,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QACrB,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QAAC,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;KACrB;IAED,+BAA+B;IAC/B,MAAM,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC;IAChC,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,GAAC,EAAE,CAAC;IACpB,MAAM,CAAC,GAAG,CAAC,EAAE,GAAC,EAAE,GAAG,EAAE,GAAC,EAAE,GAAG,EAAE,GAAC,EAAE,GAAG,EAAE,GAAC,EAAE,CAAC,GAAG,CAAC,GAAC,CAAC,GAAC,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC;IAC1D,MAAM,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,GAAC,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC;IAChC,MAAM,EAAE,GAAG,CAAC,GAAC,CAAC,CAAC,GAAC,CAAC,CAAC,CAAC;IACnB,MAAM,EAAE,GAAG,CAAC,GAAC,EAAE,GAAG,CAAC,CAAC;IAEpB,OAAO,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,EAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,EAAC,EAAE,CAAC,CAAC;AACrC,CAAC;AAGD,OAAO,EAAE,0BAA0B,EAAE,CAAA"}
|
|
@@ -8,18 +8,18 @@ function getInitialBezierPieces(isHoleClosing, k, loops, cpTrees, y) {
|
|
|
8
8
|
if (isHoleClosing) {
|
|
9
9
|
bezierPieces = [];
|
|
10
10
|
for (let k2 = 0; k2 < k; k2++) {
|
|
11
|
-
|
|
11
|
+
const pieces = loops[k2].curves
|
|
12
12
|
.map(curve => ({ curve, ts: [0, 1] }));
|
|
13
13
|
bezierPieces.push(...pieces);
|
|
14
14
|
}
|
|
15
15
|
}
|
|
16
16
|
else {
|
|
17
17
|
//let order = PointOnShape.isDullCorner(y)
|
|
18
|
-
|
|
18
|
+
const order = isPosDullCorner(y)
|
|
19
19
|
? y.t === 1 ? -1 : +1
|
|
20
20
|
: 0;
|
|
21
|
-
|
|
22
|
-
|
|
21
|
+
const loop = loops[k];
|
|
22
|
+
const cpNode = getNeighbouringPoints(cpTrees.get(loop), y, order, 0)[0];
|
|
23
23
|
δ = [cpNode, cpNode];
|
|
24
24
|
if (!cpNode ||
|
|
25
25
|
// The special case if there is only a single sharp corner or
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-initial-bezier-pieces.js","sourceRoot":"","sources":["../../../../src/mat/find-mat/find-2-prong/get-initial-bezier-pieces.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AACrE,OAAO,EAAE,uBAAuB,EAAE,MAAM,qCAAqC,CAAC;AAI9E,OAAO,EAAE,eAAe,EAAiB,MAAM,4BAA4B,CAAC;AAG5E,cAAc;AACd,SAAS,sBAAsB,CACvB,aAAsB,EACtB,CAAS,EACT,KAAa,EACb,OAAmC,EACnC,CAAgB;IAEpB,IAAI,YAA2B,CAAC;IAChC,IAAI,CAAW,CAAC;IAEhB,IAAI,aAAa,EAAE;QACf,YAAY,GAAG,EAAE,CAAC;QAClB,KAAK,IAAI,EAAE,GAAC,CAAC,EAAE,EAAE,GAAC,CAAC,EAAE,EAAE,EAAE,EAAE;YACvB,
|
|
1
|
+
{"version":3,"file":"get-initial-bezier-pieces.js","sourceRoot":"","sources":["../../../../src/mat/find-mat/find-2-prong/get-initial-bezier-pieces.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AACrE,OAAO,EAAE,uBAAuB,EAAE,MAAM,qCAAqC,CAAC;AAI9E,OAAO,EAAE,eAAe,EAAiB,MAAM,4BAA4B,CAAC;AAG5E,cAAc;AACd,SAAS,sBAAsB,CACvB,aAAsB,EACtB,CAAS,EACT,KAAa,EACb,OAAmC,EACnC,CAAgB;IAEpB,IAAI,YAA2B,CAAC;IAChC,IAAI,CAAW,CAAC;IAEhB,IAAI,aAAa,EAAE;QACf,YAAY,GAAG,EAAE,CAAC;QAClB,KAAK,IAAI,EAAE,GAAC,CAAC,EAAE,EAAE,GAAC,CAAC,EAAE,EAAE,EAAE,EAAE;YACvB,MAAM,MAAM,GAAkB,KAAK,CAAC,EAAE,CAAC,CAAC,MAAM;iBACzC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC,EAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;YACzC,YAAY,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,CAAC;SAChC;KACJ;SAAM;QACH,0CAA0C;QAC1C,MAAM,KAAK,GAAG,eAAe,CAAC,CAAC,CAAC;YACxB,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACrB,CAAC,CAAC,CAAC,CAAC;QACZ,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;QACtB,MAAM,MAAM,GAAG,qBAAqB,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACxE,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QACrB,IAAI,CAAC,MAAM;YACP,8DAA8D;YAC9D,0DAA0D;YAC1D,CAAC,MAAM,KAAK,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAC/B;YACE,YAAY,GAAG,IAAI,CAAC,MAAM;iBACrB,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC,EAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;SAC5C;aAAM;YACH,YAAY,GAAG,uBAAuB,CAAC,CAAC,CAAC,CAAC;SAC7C;KACJ;IAED,OAAO,EAAE,YAAY,EAAE,CAAC,EAAE,CAAC;AAC/B,CAAC;AAGD,OAAO,EAAE,sBAAsB,EAAE,CAAA"}
|
|
@@ -12,7 +12,7 @@ import { getClosestPoints } from './get-closest-points.js';
|
|
|
12
12
|
* @param extreme
|
|
13
13
|
*/
|
|
14
14
|
function calcBetterX(bezierPiece3s, x, vectorToZeroV) {
|
|
15
|
-
|
|
15
|
+
const V = len(vectorToZeroV);
|
|
16
16
|
let nu = 1;
|
|
17
17
|
let better;
|
|
18
18
|
let newX;
|
|
@@ -20,12 +20,12 @@ function calcBetterX(bezierPiece3s, x, vectorToZeroV) {
|
|
|
20
20
|
let newV;
|
|
21
21
|
let i = 0; // Safeguard
|
|
22
22
|
do {
|
|
23
|
-
|
|
23
|
+
const shift = scale(vectorToZeroV, nu);
|
|
24
24
|
newX = translate(shift, x);
|
|
25
25
|
newPs = getClosestPoints(newX, bezierPiece3s);
|
|
26
26
|
// Point of zero V
|
|
27
|
-
|
|
28
|
-
|
|
27
|
+
const newCircleCenter = circumCenter(newPs.map(pos => pos.p));
|
|
28
|
+
const newVectorToZeroV = fromTo(newX, newCircleCenter);
|
|
29
29
|
newV = len(newVectorToZeroV);
|
|
30
30
|
better = newV < V;
|
|
31
31
|
nu = nu / 2;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"calc-better-x.js","sourceRoot":"","sources":["../../../../src/mat/find-mat/find-3-prong/calc-better-x.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAG3E,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAG3D;;;;;;;;;;GAUG;AACH,SAAS,WAAW,CACZ,aAA8B,EAC9B,CAAW,EACX,aAAuB;IAE3B,
|
|
1
|
+
{"version":3,"file":"calc-better-x.js","sourceRoot":"","sources":["../../../../src/mat/find-mat/find-3-prong/calc-better-x.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAG3E,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAG3D;;;;;;;;;;GAUG;AACH,SAAS,WAAW,CACZ,aAA8B,EAC9B,CAAW,EACX,aAAuB;IAE3B,MAAM,CAAC,GAAG,GAAG,CAAC,aAAa,CAAC,CAAC;IAE7B,IAAI,EAAE,GAAG,CAAC,CAAC;IACX,IAAI,MAAM,CAAC;IACX,IAAI,IAAI,CAAC;IACT,IAAI,KAAsB,CAAC;IAC3B,IAAI,IAAI,CAAC;IACT,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,YAAY;IACvB,GAAG;QACC,MAAM,KAAK,GAAG,KAAK,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC;QACvC,IAAI,GAAG,SAAS,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QAG3B,KAAK,GAAG,gBAAgB,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;QAE9C,kBAAkB;QAClB,MAAM,eAAe,GAAG,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QAC9D,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;KACP,QAAQ,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,EAAE;IAE3B,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAA;AAChC,CAAC;AAGD,OAAO,EAAE,WAAW,EAAE,CAAA"}
|
|
@@ -11,11 +11,11 @@ import { getClosestBoundaryPoint } from '../../closest-boundary-point/get-closes
|
|
|
11
11
|
* @param extreme
|
|
12
12
|
*/
|
|
13
13
|
function calcInitial3ProngCenter(δ3s, bezierPiece3s) {
|
|
14
|
-
|
|
15
|
-
|
|
14
|
+
const twoProngCircleCenter = δ3s[0][0].cp.circle.center;
|
|
15
|
+
const posInfo = getClosestBoundaryPoint(bezierPiece3s[1], twoProngCircleCenter, undefined, // curve
|
|
16
16
|
undefined // t
|
|
17
17
|
);
|
|
18
|
-
|
|
18
|
+
const meanPoints = [
|
|
19
19
|
δ3s[0][0].cp.pointOnShape.p,
|
|
20
20
|
posInfo.pos.p,
|
|
21
21
|
δ3s[2][1].cp.pointOnShape.p,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"calc-initial-3-prong-center.js","sourceRoot":"","sources":["../../../../src/mat/find-mat/find-3-prong/calc-initial-3-prong-center.ts"],"names":[],"mappings":"AAAA,cAAc;AACd,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAG5C,OAAO,EAAE,uBAAuB,EAAE,MAAM,4DAA4D,CAAC;AAGrG;;;;;;;;GAQG;AACH,SAAS,uBAAuB,CACxB,GAAe,EACf,aAA8B;IAElC,
|
|
1
|
+
{"version":3,"file":"calc-initial-3-prong-center.js","sourceRoot":"","sources":["../../../../src/mat/find-mat/find-3-prong/calc-initial-3-prong-center.ts"],"names":[],"mappings":"AAAA,cAAc;AACd,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAG5C,OAAO,EAAE,uBAAuB,EAAE,MAAM,4DAA4D,CAAC;AAGrG;;;;;;;;GAQG;AACH,SAAS,uBAAuB,CACxB,GAAe,EACf,aAA8B;IAElC,MAAM,oBAAoB,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC;IAExD,MAAM,OAAO,GAAG,uBAAuB,CAC/B,aAAa,CAAC,CAAC,CAAC,EAChB,oBAAoB,EACpB,SAAS,EAAE,QAAQ;IACnB,SAAS,CAAE,IAAI;KACtB,CAAC;IAEF,MAAM,UAAU,GAAG;QACf,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC;QAC3B,OAAO,CAAC,GAAG,CAAC,CAAC;QACb,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC;KAC9B,CAAC;IAEF,OAAO,YAAY,CAAC,UAAU,CAAC,CAAC;AACpC,CAAC;AAGD,OAAO,EAAE,uBAAuB,EAAE,CAAA"}
|
|
@@ -20,28 +20,28 @@ const calcVectorToZeroV_StraightToIt = fromTo;
|
|
|
20
20
|
function find3ProngForDelta3s(δs, idx, k, bezierPiecess, extreme) {
|
|
21
21
|
const TOLERANCE = extreme * 1e-10;
|
|
22
22
|
const MAX_ITERATIONS = 10;
|
|
23
|
-
|
|
23
|
+
const δs_ = [
|
|
24
24
|
δs[0],
|
|
25
25
|
δs[idx],
|
|
26
26
|
δs[δs.length - 1]
|
|
27
27
|
];
|
|
28
|
-
|
|
28
|
+
const bezierPieces_ = [
|
|
29
29
|
bezierPiecess[0],
|
|
30
30
|
bezierPiecess[idx],
|
|
31
31
|
bezierPiecess[δs.length - 1]
|
|
32
32
|
];
|
|
33
|
-
|
|
33
|
+
const δ3ss = [
|
|
34
34
|
[δs_[0], δs_[1], δs_[2]],
|
|
35
35
|
[δs_[1], δs_[2], δs_[0]],
|
|
36
36
|
[δs_[2], δs_[0], δs_[1]],
|
|
37
37
|
];
|
|
38
|
-
|
|
38
|
+
const bezierPiecess_ = [
|
|
39
39
|
[bezierPieces_[0], bezierPieces_[1], bezierPieces_[2]],
|
|
40
40
|
[bezierPieces_[1], bezierPieces_[2], bezierPieces_[0]],
|
|
41
41
|
[bezierPieces_[2], bezierPieces_[0], bezierPieces_[1]],
|
|
42
42
|
];
|
|
43
|
-
|
|
44
|
-
|
|
43
|
+
const δ3s = δ3ss[k];
|
|
44
|
+
const bezierPiece3s = bezierPiecess_[k];
|
|
45
45
|
if (δ3s[0][0].isSharp()) {
|
|
46
46
|
return undefined;
|
|
47
47
|
}
|
|
@@ -50,9 +50,9 @@ function find3ProngForDelta3s(δs, idx, k, bezierPiecess, extreme) {
|
|
|
50
50
|
let j = 0; // Safeguard for slow convergence
|
|
51
51
|
let x = calcInitial3ProngCenter(δ3s, bezierPiece3s);
|
|
52
52
|
if (typeof _debug_ !== 'undefined') {
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
53
|
+
const threeProngs = _debug_.generated.elems.threeProng;
|
|
54
|
+
const d = threeProngs[threeProngs.length - 1];
|
|
55
|
+
const trace = d.traces[d.traces.length - 1];
|
|
56
56
|
trace.push(x);
|
|
57
57
|
}
|
|
58
58
|
let tolerance = Number.POSITIVE_INFINITY;
|
|
@@ -67,7 +67,7 @@ function find3ProngForDelta3s(δs, idx, k, bezierPiecess, extreme) {
|
|
|
67
67
|
return undefined;
|
|
68
68
|
}
|
|
69
69
|
circumCenter_ = circumCenter(ps.map(x => x.p));
|
|
70
|
-
|
|
70
|
+
const vectorToZeroV = calcVectorToZeroV_StraightToIt(x, circumCenter_);
|
|
71
71
|
if (!Number.isFinite(vectorToZeroV[0]) || !Number.isFinite(vectorToZeroV[1])) {
|
|
72
72
|
// TODO - the code can be cleaned up and sped up a lot if we don't
|
|
73
73
|
// use this function as is but instead use δs[0] and δs[2] as is
|
|
@@ -75,22 +75,22 @@ function find3ProngForDelta3s(δs, idx, k, bezierPiecess, extreme) {
|
|
|
75
75
|
// loop. This check, for instance, would be eliminated completely.
|
|
76
76
|
return undefined;
|
|
77
77
|
}
|
|
78
|
-
|
|
78
|
+
const upds = calcBetterX(bezierPiece3s, x, vectorToZeroV);
|
|
79
79
|
x = upds.newX;
|
|
80
80
|
ps = upds.newPs;
|
|
81
81
|
if (typeof _debug_ !== 'undefined') {
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
82
|
+
const threeProngs = _debug_.generated.elems.threeProng;
|
|
83
|
+
const d = threeProngs[threeProngs.length - 1];
|
|
84
|
+
const trace = d.traces[d.traces.length - 1];
|
|
85
85
|
trace.push(x);
|
|
86
86
|
}
|
|
87
|
-
|
|
87
|
+
const V = len(vectorToZeroV); // The 'potential'
|
|
88
88
|
tolerance = Math.abs(V - upds.newV);
|
|
89
89
|
}
|
|
90
|
-
|
|
90
|
+
const radius = (distanceBetween(x, ps[0].p) +
|
|
91
91
|
distanceBetween(x, ps[1].p) +
|
|
92
92
|
distanceBetween(x, ps[2].p)) / 3;
|
|
93
|
-
|
|
93
|
+
const circle = { center: x, radius };
|
|
94
94
|
//-------------------------------------------------------------------------
|
|
95
95
|
// Calculate the unit tangent vector at 3-prong circle points - they should
|
|
96
96
|
// be very close to tangent to the boundary piece tangents at those points
|
|
@@ -98,23 +98,23 @@ function find3ProngForDelta3s(δs, idx, k, bezierPiecess, extreme) {
|
|
|
98
98
|
//-------------------------------------------------------------------------
|
|
99
99
|
let totalAngleError = 0;
|
|
100
100
|
for (let i = 0; i < 3; i++) {
|
|
101
|
-
|
|
101
|
+
const p = ps[i];
|
|
102
102
|
//----------------------------
|
|
103
103
|
// Tangent of circle at point
|
|
104
104
|
//----------------------------
|
|
105
|
-
|
|
106
|
-
|
|
105
|
+
const v = toUnitVector(fromTo(p.p, x));
|
|
106
|
+
const v1 = rotate90Degrees(v);
|
|
107
107
|
//-----------------------------------
|
|
108
108
|
// Check if point is on dull crorner
|
|
109
109
|
//-----------------------------------
|
|
110
110
|
//if (PointOnShape.isDullCorner(p)) {
|
|
111
111
|
if (isPosDullCorner(p)) {
|
|
112
|
-
//
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
112
|
+
//const corner = Curve.getCornerAtEnd(p.curve);
|
|
113
|
+
const corner = getCornerAtEnd(p.curve);
|
|
114
|
+
const tans = corner.tangents;
|
|
115
|
+
const perps = tans.map(rotate90Degrees);
|
|
116
|
+
const angleError1 = Math.asin(cross(perps[0], v));
|
|
117
|
+
const angleError2 = Math.asin(cross(v, perps[1]));
|
|
118
118
|
let angleError = 0;
|
|
119
119
|
if (angleError1 > 0) {
|
|
120
120
|
angleError += angleError1;
|
|
@@ -128,13 +128,13 @@ function find3ProngForDelta3s(δs, idx, k, bezierPiecess, extreme) {
|
|
|
128
128
|
//---------------------------
|
|
129
129
|
// Tangent of curve at point
|
|
130
130
|
//---------------------------
|
|
131
|
-
|
|
131
|
+
const v2 = toUnitVector(tangent(p.curve.ps, p.t));
|
|
132
132
|
// Cross is more numerically stable than Vector.dot at angles a
|
|
133
133
|
// multiple of Math.PI **and** is close to the actual angle value
|
|
134
134
|
// and can thus just be added to cone method of looking at
|
|
135
135
|
// tolerance.
|
|
136
136
|
// Should be close to zero and is close to the actual angle.
|
|
137
|
-
|
|
137
|
+
const cross_ = Math.abs(Math.asin(cross(v1, v2)));
|
|
138
138
|
totalAngleError += cross_;
|
|
139
139
|
}
|
|
140
140
|
}
|
|
@@ -143,17 +143,17 @@ function find3ProngForDelta3s(δs, idx, k, bezierPiecess, extreme) {
|
|
|
143
143
|
// point to the 3-prong. It should be around 0. If not, this is not a good
|
|
144
144
|
// candidate for the 3-prong.
|
|
145
145
|
//-------------------------------------------------------------------------
|
|
146
|
-
|
|
146
|
+
const closestDs = [];
|
|
147
147
|
for (let i = 0; i < bezierPiecess.length; i++) {
|
|
148
|
-
|
|
148
|
+
const p = getClosestBoundaryPoint(bezierPiecess[i], x, undefined, undefined);
|
|
149
149
|
closestDs.push(distanceBetween(p.pos.p, x));
|
|
150
150
|
}
|
|
151
|
-
|
|
152
|
-
|
|
151
|
+
const closestD = Math.min(...closestDs);
|
|
152
|
+
const radiusDelta = Math.abs(radius - closestD);
|
|
153
153
|
// Weights below still need to be optimized.
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
154
|
+
const W1 = 1;
|
|
155
|
+
const W2 = 1;
|
|
156
|
+
const error = W1 * radiusDelta + W2 * totalAngleError;
|
|
157
157
|
return { ps, circle, error, δ3s };
|
|
158
158
|
}
|
|
159
159
|
export { find3ProngForDelta3s };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"find-3-prong-for-delta3s.js","sourceRoot":"","sources":["../../../../src/mat/find-mat/find-3-prong/find-3-prong-for-delta3s.ts"],"names":[],"mappings":"AAGA,OAAO,EACH,MAAM,EAAE,YAAY,EAAE,GAAG,EAAE,eAAe,EAAE,YAAY,EAAE,eAAe,EACzE,KAAK,EACR,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAItC,OAAO,EAAE,eAAe,EAAiB,MAAM,4BAA4B,CAAC;AAC5E,OAAO,EAAE,uBAAuB,EAAE,MAAM,4DAA4D,CAAC;AACrG,OAAO,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;AAC3E,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAS,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAG1D,cAAc;AACd,MAAM,8BAA8B,GAAG,MAAM,CAAC;AAG9C;;;;;;;;GAQG;AACH,SAAS,oBAAoB,CACrB,EAAc,EACd,GAAW,EACX,CAAS,EACT,aAA8B,EAC9B,OAAe;IAEnB,MAAM,SAAS,GAAG,OAAO,GAAG,KAAK,CAAC;IAClC,MAAM,cAAc,GAAG,EAAE,CAAC;IAE1B,
|
|
1
|
+
{"version":3,"file":"find-3-prong-for-delta3s.js","sourceRoot":"","sources":["../../../../src/mat/find-mat/find-3-prong/find-3-prong-for-delta3s.ts"],"names":[],"mappings":"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"}
|