flo-mat 2.0.1 → 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 -7125
- 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 +28 -23
- 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 -2819
- package/browser/index.module.js +0 -7149
- package/browser/index.module.min.js +0 -2
- package/browser/index.module.min.js.LICENSE.txt +0 -2819
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"closest-points-on-curve.js","sourceRoot":"","sources":["../../../src/mat/closest-boundary-point/closest-points-on-curve.ts"],"names":[],"mappings":"AAAA,wFAAwF;AACxF,oHAAoH;AACpH,OAAO,EAAE,SAAS,EAAE,iBAAiB,EAAgB,MAAM,UAAU,CAAC;AACtE,OAAO,EAAmB,QAAQ,EAAE,kBAAkB,EAAyB,MAAM,aAAa,CAAC;AAKnG;;;;;;;GAOG;AACH,SAAS,oBAAoB,CACrB,KAAY,EACZ,CAAW,EACX,CAAC,EAAE,EAAC,EAAE,IAAc,CAAC,CAAC,EAAC,CAAC,CAAC,EACzB,YAAmB,EACnB,CAAS;IAKb,4DAA4D;IAC5D,MAAM,KAAK,GAAG,kBAAkB,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;IAE9C,mCAAmC;IACnC,MAAM,IAAI,GAAG,KAAK,KAAK,YAAY;QAC/B,CAAC,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,CAAC;QACrB,CAAC,CAAC,KAAK,CAAC;IAEZ,+EAA+E;IAC/E,
|
|
1
|
+
{"version":3,"file":"closest-points-on-curve.js","sourceRoot":"","sources":["../../../src/mat/closest-boundary-point/closest-points-on-curve.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,7 +10,7 @@ import { cullByTightBoundingBox } from './cull-by-tight-boundary-box.js';
|
|
|
10
10
|
function cullBezierPieces(bezierPieces, p) {
|
|
11
11
|
const CULL_THRESHOLD = 0;
|
|
12
12
|
if (bezierPieces.length > CULL_THRESHOLD) {
|
|
13
|
-
|
|
13
|
+
const bestSquaredDistance = getBestDistanceSquared(bezierPieces, p);
|
|
14
14
|
bezierPieces = cullByLooseBoundingBox(bezierPieces, p, bestSquaredDistance);
|
|
15
15
|
bezierPieces = cullByTightBoundingBox(bezierPieces, p, bestSquaredDistance);
|
|
16
16
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cull-bezier-pieces.js","sourceRoot":"","sources":["../../../src/mat/closest-boundary-point/cull-bezier-pieces.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAC;AACxE,OAAO,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AACzE,OAAO,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AAGzE;;;;;GAKG;AACH,SAAS,gBAAgB,CACjB,YAA2B,EAC3B,CAAW;IAEf,MAAM,cAAc,GAAG,CAAC,CAAC;IAEzB,IAAI,YAAY,CAAC,MAAM,GAAG,cAAc,EAAE;QACtC,
|
|
1
|
+
{"version":3,"file":"cull-bezier-pieces.js","sourceRoot":"","sources":["../../../src/mat/closest-boundary-point/cull-bezier-pieces.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAC;AACxE,OAAO,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AACzE,OAAO,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AAGzE;;;;;GAKG;AACH,SAAS,gBAAgB,CACjB,YAA2B,EAC3B,CAAW;IAEf,MAAM,cAAc,GAAG,CAAC,CAAC;IAEzB,IAAI,YAAY,CAAC,MAAM,GAAG,cAAc,EAAE;QACtC,MAAM,mBAAmB,GAAG,sBAAsB,CAC9C,YAAY,EAAE,CAAC,CAClB,CAAC;QACF,YAAY,GAAG,sBAAsB,CACjC,YAAY,EAAE,CAAC,EACf,mBAAmB,CACtB,CAAC;QAEF,YAAY,GAAG,sBAAsB,CACjC,YAAY,EAAE,CAAC,EACf,mBAAmB,CACtB,CAAC;KACL;IAED,OAAO,YAAY,CAAC;AACxB,CAAC;AAGD,OAAO,EAAE,gBAAgB,EAAE,CAAA"}
|
|
@@ -9,12 +9,12 @@ import { getClosestSquareDistanceToRect } from '../geometry/get-closest-square-d
|
|
|
9
9
|
* @param dSquared
|
|
10
10
|
*/
|
|
11
11
|
function cullByLooseBoundingBox(bezierPieces, p, dSquared) {
|
|
12
|
-
|
|
12
|
+
const candidateBezierPieces = [];
|
|
13
13
|
for (let i = 0; i < bezierPieces.length; i++) {
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
14
|
+
const bezierPiece = bezierPieces[i];
|
|
15
|
+
const ps = bezierPiece.curve.ps;
|
|
16
|
+
const boundingBox = getBoundingBox_(ps);
|
|
17
|
+
const d = getClosestSquareDistanceToRect(boundingBox, p);
|
|
18
18
|
if (d <= dSquared) {
|
|
19
19
|
candidateBezierPieces.push(bezierPiece);
|
|
20
20
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cull-by-loose-bounding-box.js","sourceRoot":"","sources":["../../../src/mat/closest-boundary-point/cull-by-loose-bounding-box.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAE7D,OAAO,EAAE,8BAA8B,EAAE,MAAM,oDAAoD,CAAC;AAGpG;;;;;;;GAOG;AACH,SAAS,sBAAsB,CACvB,YAA2B,EAC3B,CAAW,EACX,QAAgB;IAEpB,
|
|
1
|
+
{"version":3,"file":"cull-by-loose-bounding-box.js","sourceRoot":"","sources":["../../../src/mat/closest-boundary-point/cull-by-loose-bounding-box.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAE7D,OAAO,EAAE,8BAA8B,EAAE,MAAM,oDAAoD,CAAC;AAGpG;;;;;;;GAOG;AACH,SAAS,sBAAsB,CACvB,YAA2B,EAC3B,CAAW,EACX,QAAgB;IAEpB,MAAM,qBAAqB,GAAG,EAAE,CAAC;IAEjC,KAAK,IAAI,CAAC,GAAC,CAAC,EAAE,CAAC,GAAC,YAAY,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACtC,MAAM,WAAW,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC;QACpC,MAAM,EAAE,GAAG,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC;QAEhC,MAAM,WAAW,GAAG,eAAe,CAAC,EAAE,CAAC,CAAC;QAExC,MAAM,CAAC,GAAG,8BAA8B,CACpC,WAAW,EACX,CAAC,CACJ,CAAC;QACF,IAAI,CAAC,IAAI,QAAQ,EAAE;YACf,qBAAqB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;SAC3C;KACJ;IAED,OAAO,qBAAqB,CAAC;AACjC,CAAC;AAGD,OAAO,EAAE,sBAAsB,EAAE,CAAA"}
|
|
@@ -11,12 +11,12 @@ const getBoundingBoxTight_ = memoize(getBoundingBoxTight);
|
|
|
11
11
|
* @param bestSquaredDistance
|
|
12
12
|
*/
|
|
13
13
|
function cullByTightBoundingBox(bezierPieces, p, bestSquaredDistance) {
|
|
14
|
-
|
|
14
|
+
const candidateBezierPieces = [];
|
|
15
15
|
for (let i = 0; i < bezierPieces.length; i++) {
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
16
|
+
const bezierPiece = bezierPieces[i];
|
|
17
|
+
const ps = bezierPiece.curve.ps;
|
|
18
|
+
const tightBoundingBox = getBoundingBoxTight_(ps);
|
|
19
|
+
const d = getClosestSquaredDistanceToRotatedRect(tightBoundingBox, p);
|
|
20
20
|
if (d <= bestSquaredDistance) {
|
|
21
21
|
candidateBezierPieces.push(bezierPiece);
|
|
22
22
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cull-by-tight-boundary-box.js","sourceRoot":"","sources":["../../../src/mat/closest-boundary-point/cull-by-tight-boundary-box.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAEtC,OAAO,EAAE,sCAAsC,EAAE,MAAM,6DAA6D,CAAC;AAGrH,MAAM,oBAAoB,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;AAG1D;;;;;;;GAOG;AACH,SAAS,sBAAsB,CACvB,YAA2B,EAC3B,CAAW,EACX,mBAA2B;IAE/B,
|
|
1
|
+
{"version":3,"file":"cull-by-tight-boundary-box.js","sourceRoot":"","sources":["../../../src/mat/closest-boundary-point/cull-by-tight-boundary-box.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAEtC,OAAO,EAAE,sCAAsC,EAAE,MAAM,6DAA6D,CAAC;AAGrH,MAAM,oBAAoB,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;AAG1D;;;;;;;GAOG;AACH,SAAS,sBAAsB,CACvB,YAA2B,EAC3B,CAAW,EACX,mBAA2B;IAE/B,MAAM,qBAAqB,GAAG,EAAE,CAAC;IAEjC,KAAK,IAAI,CAAC,GAAC,CAAC,EAAE,CAAC,GAAC,YAAY,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACtC,MAAM,WAAW,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC;QACpC,MAAM,EAAE,GAAG,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC;QAEhC,MAAM,gBAAgB,GAAG,oBAAoB,CAAC,EAAE,CAAC,CAAC;QAClD,MAAM,CAAC,GAAG,sCAAsC,CACxC,gBAAgB,EAChB,CAAC,CACR,CAAC;QACF,IAAI,CAAC,IAAI,mBAAmB,EAAE;YAC1B,qBAAqB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;SAC3C;KACJ;IAED,OAAO,qBAAqB,CAAC;AACjC,CAAC;AAGD,OAAO,EAAE,sBAAsB,EAAE,CAAA"}
|
|
@@ -8,11 +8,11 @@ import { squaredDistanceBetween } from 'flo-vector2d';
|
|
|
8
8
|
function getBestDistanceSquared(bezierPieces, p) {
|
|
9
9
|
let bestSquaredDistance = Number.POSITIVE_INFINITY;
|
|
10
10
|
for (let i = 0; i < bezierPieces.length; i++) {
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
11
|
+
const bezierPiece = bezierPieces[i];
|
|
12
|
+
const ps = bezierPiece.curve.ps;
|
|
13
|
+
const p1 = evalDeCasteljau(ps, bezierPiece.ts[0]);
|
|
14
|
+
const p2 = evalDeCasteljau(ps, bezierPiece.ts[1]);
|
|
15
|
+
const d = Math.min(squaredDistanceBetween(p, p1), squaredDistanceBetween(p, p2));
|
|
16
16
|
if (d < bestSquaredDistance) {
|
|
17
17
|
bestSquaredDistance = d;
|
|
18
18
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-best-distance-squared.js","sourceRoot":"","sources":["../../../src/mat/closest-boundary-point/get-best-distance-squared.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AAItD;;;;GAIG;AACH,SAAS,sBAAsB,CACvB,YAA2B,EAC3B,CAAW;IAEf,IAAI,mBAAmB,GAAG,MAAM,CAAC,iBAAiB,CAAC;IACnD,KAAK,IAAI,CAAC,GAAC,CAAC,EAAE,CAAC,GAAC,YAAY,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACtC,
|
|
1
|
+
{"version":3,"file":"get-best-distance-squared.js","sourceRoot":"","sources":["../../../src/mat/closest-boundary-point/get-best-distance-squared.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AAItD;;;;GAIG;AACH,SAAS,sBAAsB,CACvB,YAA2B,EAC3B,CAAW;IAEf,IAAI,mBAAmB,GAAG,MAAM,CAAC,iBAAiB,CAAC;IACnD,KAAK,IAAI,CAAC,GAAC,CAAC,EAAE,CAAC,GAAC,YAAY,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACtC,MAAM,WAAW,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC;QAEpC,MAAM,EAAE,GAAG,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC;QAEhC,MAAM,EAAE,GAAG,eAAe,CAAC,EAAE,EAAE,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QAClD,MAAM,EAAE,GAAG,eAAe,CAAC,EAAE,EAAE,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QAElD,MAAM,CAAC,GAAG,IAAI,CAAC,GAAG,CACd,sBAAsB,CAAC,CAAC,EAAE,EAAE,CAAC,EAC7B,sBAAsB,CAAC,CAAC,EAAE,EAAE,CAAC,CAChC,CAAC;QAEF,IAAI,CAAC,GAAG,mBAAmB,EAAE;YACzB,mBAAmB,GAAG,CAAC,CAAC;SAC3B;KACJ;IAED,mEAAmE;IACnE,6CAA6C;IAC7C,OAAO,mBAAmB,GAAG,IAAI,CAAC;AACtC,CAAC;AAGD,OAAO,EAAE,sBAAsB,EAAE,CAAA"}
|
|
@@ -13,21 +13,21 @@ import { closestPointsOnCurve } from './closest-points-on-curve.js';
|
|
|
13
13
|
* @param extreme
|
|
14
14
|
*/
|
|
15
15
|
function getCloseBoundaryPoints(bezierPieces, point, y, distance) {
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
16
|
+
const touchedCurve = y.curve;
|
|
17
|
+
const t = y.t;
|
|
18
|
+
const p_ = y.p;
|
|
19
19
|
bezierPieces = cullBezierPieces(bezierPieces, point);
|
|
20
20
|
// TODO - integrate with is-another-cp-closeby - we MUST check angle too!
|
|
21
|
-
|
|
22
|
-
|
|
21
|
+
const DISTANCE_TOLERANCE = 1e-9;
|
|
22
|
+
const posInfos = [];
|
|
23
23
|
for (let i = 0; i < bezierPieces.length; i++) {
|
|
24
|
-
|
|
24
|
+
const bezierPiece = bezierPieces[i];
|
|
25
25
|
// TOOD - important - should be able to return multiple points
|
|
26
|
-
|
|
26
|
+
const ps = closestPointsOnCurve(bezierPiece.curve, point, bezierPiece.ts, touchedCurve, t);
|
|
27
27
|
//if (ps === undefined) { continue; }
|
|
28
28
|
for (let j = 0; j < ps.length; j++) {
|
|
29
|
-
|
|
30
|
-
|
|
29
|
+
const p = ps[j];
|
|
30
|
+
const d = distanceBetween(p.p, point);
|
|
31
31
|
let curve = bezierPiece.curve;
|
|
32
32
|
let t_ = p.t;
|
|
33
33
|
if (Math.abs(d - distance) < DISTANCE_TOLERANCE) {
|
|
@@ -44,25 +44,25 @@ function getCloseBoundaryPoints(bezierPieces, point, y, distance) {
|
|
|
44
44
|
// TODO - in future remove all these checks and join n-prongs when they
|
|
45
45
|
// are being added - much simpler and more symmetric. Remeber order when
|
|
46
46
|
// comparing closeness!
|
|
47
|
-
|
|
47
|
+
const indexesToCheck = [];
|
|
48
48
|
for (let i = 0; i < posInfos.length; i++) {
|
|
49
|
-
|
|
49
|
+
const pi = posInfos[i];
|
|
50
50
|
// Only check if they are close to the edges. Why??
|
|
51
51
|
//if (pi.pos.t < 1e-2 || 1-pi.pos.t < 1e-2) {
|
|
52
52
|
indexesToCheck.push(i);
|
|
53
53
|
//}
|
|
54
54
|
}
|
|
55
|
-
|
|
55
|
+
const indexesToRemove = [];
|
|
56
56
|
for (let i = 0; i < indexesToCheck.length; i++) {
|
|
57
57
|
for (let j = i + 1; j < indexesToCheck.length; j++) {
|
|
58
58
|
if (i === j) {
|
|
59
59
|
continue;
|
|
60
60
|
}
|
|
61
|
-
|
|
62
|
-
|
|
61
|
+
const p1 = posInfos[indexesToCheck[i]].pos.p;
|
|
62
|
+
const p2 = posInfos[indexesToCheck[j]].pos.p;
|
|
63
63
|
// Below checks for source point too - similar to
|
|
64
64
|
// isAnotherCpCloseBy
|
|
65
|
-
|
|
65
|
+
const p3 = p_;
|
|
66
66
|
if ((Math.abs(p1[0] - p2[0]) < 1e-6 &&
|
|
67
67
|
Math.abs(p1[1] - p2[1]) < 1e-6) ||
|
|
68
68
|
(Math.abs(p1[0] - p3[0]) < 1e-6 &&
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-close-boundary-points.js","sourceRoot":"","sources":["../../../src/mat/closest-boundary-point/get-close-boundary-points.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAiB,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAEtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAGpE;;;;;;;;;GASG;AACH,SAAS,sBAAsB,CACvB,YAA2B,EAC3B,KAAe,EACrB,CAAgB,EAChB,QAAgB;IAEjB,
|
|
1
|
+
{"version":3,"file":"get-close-boundary-points.js","sourceRoot":"","sources":["../../../src/mat/closest-boundary-point/get-close-boundary-points.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,13 +17,13 @@ function getClosestBoundaryPoint(bezierPieces, point, touchedCurve, t) {
|
|
|
17
17
|
let bestDistance = Number.POSITIVE_INFINITY;
|
|
18
18
|
let posInfo;
|
|
19
19
|
for (let i = 0; i < bezierPieces.length; i++) {
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
20
|
+
const bezierPiece = bezierPieces[i];
|
|
21
|
+
const ps = closestPointsOnCurve(bezierPiece.curve, point, bezierPiece.ts, touchedCurve, t);
|
|
22
|
+
const p = getObjClosestTo(point, ps, p => p.p);
|
|
23
23
|
if (p === undefined) {
|
|
24
24
|
continue;
|
|
25
25
|
}
|
|
26
|
-
|
|
26
|
+
const d = distanceBetween(p.p, point);
|
|
27
27
|
let curve = bezierPiece.curve;
|
|
28
28
|
let t_ = p.t;
|
|
29
29
|
if (d < bestDistance) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-closest-boundary-point.js","sourceRoot":"","sources":["../../../src/mat/closest-boundary-point/get-closest-boundary-point.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAEhE,OAAO,EAAE,YAAY,EAAiB,MAAM,yBAAyB,CAAC;AAEtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAGpE;;;;;;;;;GASG;AACH,SAAS,uBAAuB,CACxB,YAA2B,EAC3B,KAAe,EACrB,YAAmB,EACnB,CAAS;IAEV,YAAY,GAAG,gBAAgB,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC;IAErD,IAAI,YAAY,GAAG,MAAM,CAAC,iBAAiB,CAAC;IAC5C,IAAI,OAA0C,CAAC;IAC/C,KAAK,IAAI,CAAC,GAAC,CAAC,EAAE,CAAC,GAAC,YAAY,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACzC,
|
|
1
|
+
{"version":3,"file":"get-closest-boundary-point.js","sourceRoot":"","sources":["../../../src/mat/closest-boundary-point/get-closest-boundary-point.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAEhE,OAAO,EAAE,YAAY,EAAiB,MAAM,yBAAyB,CAAC;AAEtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAGpE;;;;;;;;;GASG;AACH,SAAS,uBAAuB,CACxB,YAA2B,EAC3B,KAAe,EACrB,YAAmB,EACnB,CAAS;IAEV,YAAY,GAAG,gBAAgB,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC;IAErD,IAAI,YAAY,GAAG,MAAM,CAAC,iBAAiB,CAAC;IAC5C,IAAI,OAA0C,CAAC;IAC/C,KAAK,IAAI,CAAC,GAAC,CAAC,EAAE,CAAC,GAAC,YAAY,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACzC,MAAM,WAAW,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC;QAEpC,MAAM,EAAE,GAAG,oBAAoB,CAC7B,WAAW,CAAC,KAAK,EACjB,KAAK,EACL,WAAW,CAAC,EAAE,EACd,YAAY,EACZ,CAAC,CACF,CAAC;QAEF,MAAM,CAAC,GAAG,eAAe,CAAC,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;QAE9C,IAAI,CAAC,KAAK,SAAS,EAAE;YAAE,SAAS;SAAE;QAElC,MAAM,CAAC,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;QAEtC,IAAI,KAAK,GAAG,WAAW,CAAC,KAAK,CAAC;QAC9B,IAAI,EAAE,GAAE,CAAC,CAAC,CAAC,CAAC;QAEZ,IAAI,CAAC,GAAG,YAAY,EAAE;YACrB,IAAI,EAAE,KAAK,CAAC,EAAE;gBACb,EAAE,GAAG,CAAC,CAAC;gBACP,KAAK,GAAG,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC;aAC/B;YAED,OAAO,GAAG,EAAE,GAAG,EAAE,IAAI,YAAY,CAAC,KAAK,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC;YAClD,YAAY,GAAG,CAAC,CAAC;SACjB;KACD;IAED,OAAO,OAAO,CAAC;AAChB,CAAC;AAGD,OAAO,EAAE,uBAAuB,EAAE,CAAC"}
|
|
@@ -5,11 +5,11 @@ import { CpNode } from '../cp-node.js';
|
|
|
5
5
|
* @param cpNode
|
|
6
6
|
*/
|
|
7
7
|
function createNewCpTree(cpNode) {
|
|
8
|
-
|
|
9
|
-
|
|
8
|
+
const newCpTrees = new Map();
|
|
9
|
+
const cps = cpNode.getAllOnLoop();
|
|
10
10
|
cps.forEach(f);
|
|
11
11
|
function f(cpNode) {
|
|
12
|
-
|
|
12
|
+
const loop = cpNode.cp.pointOnShape.curve.loop;
|
|
13
13
|
let cpTree = newCpTrees.get(loop);
|
|
14
14
|
if (!cpTree) {
|
|
15
15
|
// qqq cpTree = new LlRbTree(CpNode.comparator, [], true);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-new-cp-tree.js","sourceRoot":"","sources":["../../src/mat/create-new-cp-tree.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAIvC;;;GAGG;AACH,SAAS,eAAe,CAAC,MAAc;IACtC,
|
|
1
|
+
{"version":3,"file":"create-new-cp-tree.js","sourceRoot":"","sources":["../../src/mat/create-new-cp-tree.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAIvC;;;GAGG;AACH,SAAS,eAAe,CAAC,MAAc;IACtC,MAAM,UAAU,GAA+B,IAAI,GAAG,EAAE,CAAC;IAEzD,MAAM,GAAG,GAAG,MAAM,CAAC,YAAY,EAAE,CAAC;IAElC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IAEf,SAAS,CAAC,CAAC,MAAc;QACxB,MAAM,IAAI,GAAG,MAAM,CAAC,EAAE,CAAC,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC;QAC/C,IAAI,MAAM,GAAG,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAClC,IAAI,CAAC,MAAM,EAAE;YACZ,2DAA2D;YAC3D,MAAM,GAAG,IAAI,QAAQ,CAAC,MAAM,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;YAChD,UAAU,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;SAC7B;QACD,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACvB,CAAC;IAED,OAAO,UAAU,CAAC;AACnB,CAAC;AAGD,OAAO,EAAE,eAAe,EAAE,CAAA"}
|
|
@@ -26,9 +26,9 @@ function add1Prong(maxOsculatingCircleRadius, cpGraphs, pos) {
|
|
|
26
26
|
return;
|
|
27
27
|
}
|
|
28
28
|
//let circle = PointOnShape.getOsculatingCircle(maxOsculatingCircleRadius, pos);
|
|
29
|
-
|
|
30
|
-
//
|
|
31
|
-
|
|
29
|
+
const circle = getOsculatingCircle(maxOsculatingCircleRadius, pos);
|
|
30
|
+
//const order = PointOnShape.calcOrder(circle, pos);
|
|
31
|
+
const order = calcPosOrder(circle, pos);
|
|
32
32
|
// Make sure there isn't already a ContactPoint close by - it can cause
|
|
33
33
|
// floating point stability issues.
|
|
34
34
|
if (isAnotherCpCloseby(cpGraphs, pos, circle, order, 0, 1000, 'magenta')) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-1-prong.js","sourceRoot":"","sources":["../../../src/mat/find-mat/add-1-prong.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,mBAAmB,EAAE,YAAY,EAAE,eAAe,EAAiB,MAAM,yBAAyB,CAAC;AAE5G,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AAGjE;;;;;GAKG;AACH,SAAS,SAAS,CAChB,yBAAiC,EAC3B,QAAoC,EACpC,GAAkB;IAEzB,uCAAuC;IACpC,IAAI,eAAe,CAAC,GAAG,CAAC,EAAE;QAC5B,sCAAsC;QAEtC,kBAAkB;QAClB,gEAAgE;QAChE,wEAAwE;QACxE,mEAAmE;QACnE,mEAAmE;QACnE,qEAAqE;QAC/D,kEAAkE;QAClE,oEAAoE;QAE1E,kCAAkC;QAElC,IAAI,OAAO,OAAO,KAAK,WAAW,EAAE;YAC1B,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,oBAAoB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SAC1D;QAEP,OAAO;KACP;IAED,gFAAgF;IAChF,
|
|
1
|
+
{"version":3,"file":"add-1-prong.js","sourceRoot":"","sources":["../../../src/mat/find-mat/add-1-prong.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,mBAAmB,EAAE,YAAY,EAAE,eAAe,EAAiB,MAAM,yBAAyB,CAAC;AAE5G,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AAGjE;;;;;GAKG;AACH,SAAS,SAAS,CAChB,yBAAiC,EAC3B,QAAoC,EACpC,GAAkB;IAEzB,uCAAuC;IACpC,IAAI,eAAe,CAAC,GAAG,CAAC,EAAE;QAC5B,sCAAsC;QAEtC,kBAAkB;QAClB,gEAAgE;QAChE,wEAAwE;QACxE,mEAAmE;QACnE,mEAAmE;QACnE,qEAAqE;QAC/D,kEAAkE;QAClE,oEAAoE;QAE1E,kCAAkC;QAElC,IAAI,OAAO,OAAO,KAAK,WAAW,EAAE;YAC1B,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,oBAAoB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SAC1D;QAEP,OAAO;KACP;IAED,gFAAgF;IAChF,MAAM,MAAM,GAAG,mBAAmB,CAAC,yBAAyB,EAAE,GAAG,CAAC,CAAC;IAEnE,oDAAoD;IACpD,MAAM,KAAK,GAAG,YAAY,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACxC,uEAAuE;IACvE,mCAAmC;IACnC,IAAI,kBAAkB,CAAC,QAAQ,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,SAAS,CAAC,EAAE;QACzE,OAAO;KACP;IAEE,YAAY,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,EAAE,QAAQ,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;IAE5D,IAAI,OAAO,OAAO,KAAK,WAAW,EAAE;QAC7B,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;KAC9C;AACL,CAAC;AAGD,OAAO,EAAE,SAAS,EAAE,CAAA"}
|
|
@@ -16,8 +16,8 @@ import { getNeighbouringPoints } from '../get-neighboring-cps.js';
|
|
|
16
16
|
*/
|
|
17
17
|
function add2Prong(cpGraphs, circle, posSource, posAntipodes, holeClosing, extreme) {
|
|
18
18
|
//let orderSource = PointOnShape.calcOrder(circle, posSource);
|
|
19
|
-
|
|
20
|
-
|
|
19
|
+
const orderSource = calcPosOrder(circle, posSource);
|
|
20
|
+
const orderAntipodes = posAntipodes.map(posAntipode => {
|
|
21
21
|
//console.log(circle.center)
|
|
22
22
|
//return PointOnShape.calcOrder(circle, posAntipode.pos);
|
|
23
23
|
return calcPosOrder(circle, posAntipode.pos);
|
|
@@ -34,8 +34,8 @@ function add2Prong(cpGraphs, circle, posSource, posAntipodes, holeClosing, extre
|
|
|
34
34
|
// TODO - possibly combine n-prongs in this case
|
|
35
35
|
let isCloseByAntipodes = false;
|
|
36
36
|
for (let i = 0; i < posAntipodes.length; i++) {
|
|
37
|
-
|
|
38
|
-
|
|
37
|
+
const posAntipode = posAntipodes[i];
|
|
38
|
+
const orderAntipode = orderAntipodes[i];
|
|
39
39
|
if (isAnotherCpCloseby(cpGraphs, posAntipode.pos, circle, orderAntipode, 0, extreme, 'red')) {
|
|
40
40
|
isCloseByAntipodes = true;
|
|
41
41
|
break;
|
|
@@ -54,30 +54,30 @@ function add2Prong(cpGraphs, circle, posSource, posAntipodes, holeClosing, extre
|
|
|
54
54
|
return;
|
|
55
55
|
}
|
|
56
56
|
// Antipode
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
57
|
+
const newCpAntipodes = [];
|
|
58
|
+
const cpAntipodes = [];
|
|
59
|
+
const cpTreeAntipodes = [];
|
|
60
|
+
const deltaAntipodes = [];
|
|
61
|
+
const loopAntipodes = [];
|
|
62
62
|
for (let i = 0; i < posAntipodes.length; i++) {
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
63
|
+
const posAntipode = posAntipodes[i];
|
|
64
|
+
const orderAntipode = orderAntipodes[i];
|
|
65
|
+
const cpAntipode = { pointOnShape: posAntipode.pos, circle, order: orderAntipode, order2: 0 };
|
|
66
66
|
cpAntipodes.push(cpAntipode);
|
|
67
|
-
|
|
67
|
+
const loopAntipode = posAntipode.pos.curve.loop;
|
|
68
68
|
loopAntipodes.push(loopAntipode);
|
|
69
|
-
|
|
69
|
+
const cpTreeAntipode = cpGraphs.get(loopAntipode);
|
|
70
70
|
cpTreeAntipodes.push(cpTreeAntipode);
|
|
71
|
-
|
|
71
|
+
const deltaAntipode = getNeighbouringPoints(cpTreeAntipode, posAntipode.pos, orderAntipode, 0);
|
|
72
72
|
deltaAntipodes.push(deltaAntipode);
|
|
73
73
|
newCpAntipodes.push(CpNode.insert(holeClosing, false, cpTreeAntipode, cpAntipode, deltaAntipode[0]));
|
|
74
74
|
}
|
|
75
75
|
// Source
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
76
|
+
const cpSource = { pointOnShape: posSource, circle, order: orderSource, order2: 0 };
|
|
77
|
+
const loopSource = posSource.curve.loop;
|
|
78
|
+
const cpTreeSource = cpGraphs.get(loopSource);
|
|
79
|
+
const deltaSource = getNeighbouringPoints(cpTreeSource, posSource, orderSource, 0);
|
|
80
|
+
const newCpSource = CpNode.insert(holeClosing, false, cpTreeSource, cpSource, deltaSource[0]);
|
|
81
81
|
// Connect graph
|
|
82
82
|
if (newCpAntipodes.length === 1) {
|
|
83
83
|
newCpSource.prevOnCircle = newCpAntipodes[0];
|
|
@@ -86,16 +86,16 @@ function add2Prong(cpGraphs, circle, posSource, posAntipodes, holeClosing, extre
|
|
|
86
86
|
newCpAntipodes[0].nextOnCircle = newCpSource;
|
|
87
87
|
}
|
|
88
88
|
else {
|
|
89
|
-
|
|
89
|
+
const cpNodes = newCpAntipodes.slice();
|
|
90
90
|
cpNodes.push(newCpSource);
|
|
91
91
|
// Order points according to their angle with the x-axis
|
|
92
92
|
cpNodes.sort(byAngle(circle));
|
|
93
93
|
for (let i = 0; i < cpNodes.length; i++) {
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
94
|
+
const iNext = (i + 1 === cpNodes.length) ? 0 : i + 1;
|
|
95
|
+
const iPrev = (i === 0) ? cpNodes.length - 1 : i - 1;
|
|
96
|
+
const cpNodeCurr = cpNodes[i];
|
|
97
|
+
const cpNodeNext = cpNodes[iNext];
|
|
98
|
+
const cpNodePrev = cpNodes[iPrev];
|
|
99
99
|
cpNodeCurr.nextOnCircle = cpNodeNext;
|
|
100
100
|
cpNodeCurr.prevOnCircle = cpNodePrev;
|
|
101
101
|
}
|
|
@@ -103,10 +103,10 @@ function add2Prong(cpGraphs, circle, posSource, posAntipodes, holeClosing, extre
|
|
|
103
103
|
if (holeClosing) {
|
|
104
104
|
// TODO - important - take care of case where there are more than 1 antipode
|
|
105
105
|
// Duplicate ContactPoints
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
106
|
+
const cpB2 = { pointOnShape: posAntipodes[0].pos, circle, order: cpAntipodes[0].order, order2: +1 };
|
|
107
|
+
const newCpB2Node = CpNode.insert(true, false, cpTreeAntipodes[0], cpB2, newCpAntipodes[0]);
|
|
108
|
+
const cpB1 = { pointOnShape: posSource, circle, order: cpSource.order, order2: -1 };
|
|
109
|
+
const newCpB1Node = CpNode.insert(true, false, cpTreeSource, cpB1, newCpSource.prev);
|
|
110
110
|
// Connect graph
|
|
111
111
|
newCpB1Node.prevOnCircle = newCpB2Node;
|
|
112
112
|
newCpB1Node.nextOnCircle = newCpB2Node;
|
|
@@ -125,7 +125,7 @@ function add2Prong(cpGraphs, circle, posSource, posAntipodes, holeClosing, extre
|
|
|
125
125
|
else {
|
|
126
126
|
elems = _debug_.generated.elems['twoProng_regular'];
|
|
127
127
|
}
|
|
128
|
-
|
|
128
|
+
const elem = elems[elems.length - 1];
|
|
129
129
|
if (!newCpSource) {
|
|
130
130
|
console.log('asas');
|
|
131
131
|
}
|
|
@@ -169,9 +169,9 @@ function getSize(x, y) {
|
|
|
169
169
|
}
|
|
170
170
|
/** @hidden */
|
|
171
171
|
function byAngle(circle) {
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
172
|
+
const c = circle.center;
|
|
173
|
+
const r = circle.radius;
|
|
174
|
+
const exp = exponent(r);
|
|
175
175
|
return function (_a, _b) {
|
|
176
176
|
let a = _a.cp.pointOnShape.p;
|
|
177
177
|
let b = _b.cp.pointOnShape.p;
|
|
@@ -179,13 +179,13 @@ function byAngle(circle) {
|
|
|
179
179
|
a = [a[0] - c[0], a[1] - c[1]];
|
|
180
180
|
b = [b[0] - c[0], b[1] - c[1]];
|
|
181
181
|
// Scale
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
182
|
+
const ax = scale(a[0], exp);
|
|
183
|
+
const ay = scale(a[1], exp);
|
|
184
|
+
const bx = scale(b[0], exp);
|
|
185
|
+
const by = scale(b[1], exp);
|
|
186
186
|
// Get 'size'
|
|
187
|
-
|
|
188
|
-
|
|
187
|
+
const sa = getSize(ax, ay);
|
|
188
|
+
const sb = getSize(bx, by);
|
|
189
189
|
return sb - sa;
|
|
190
190
|
};
|
|
191
191
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-2-prong.js","sourceRoot":"","sources":["../../../src/mat/find-mat/add-2-prong.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAGxC,OAAO,EAAE,MAAM,EAAQ,MAAM,kBAAkB,CAAC;AAGhD,OAAO,EAAE,YAAY,EAAE,YAAY,EAAiB,MAAM,yBAAyB,CAAC;AACpF,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAIlE;;;;;;;;;;GAUG;AACH,SAAS,SAAS,CAChB,QAA0C,EACpC,MAAsB,EACtB,SAA6B,EACnC,YAAmD,EACnD,WAAuB,EACvB,OAAsB;IAEvB,gEAAgE;IAChE,
|
|
1
|
+
{"version":3,"file":"add-2-prong.js","sourceRoot":"","sources":["../../../src/mat/find-mat/add-2-prong.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAGxC,OAAO,EAAE,MAAM,EAAQ,MAAM,kBAAkB,CAAC;AAGhD,OAAO,EAAE,YAAY,EAAE,YAAY,EAAiB,MAAM,yBAAyB,CAAC;AACpF,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAIlE;;;;;;;;;;GAUG;AACH,SAAS,SAAS,CAChB,QAA0C,EACpC,MAAsB,EACtB,SAA6B,EACnC,YAAmD,EACnD,WAAuB,EACvB,OAAsB;IAEvB,gEAAgE;IAChE,MAAM,WAAW,GAAK,YAAY,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IACtD,MAAM,cAAc,GAAG,YAAY,CAAC,GAAG,CACtC,WAAW,CAAC,EAAE;QACb,4BAA4B;QAC5B,yDAAyD;QACzD,OAAO,YAAY,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC;IAC9C,CAAC,CACD,CAAC;IAEF,IAAI,GAAG,GAAG,SAAS,CAAC,CAAC,CAAC;IACtB,IAAI,KAAK,CAAC;IACV,IAAI,GAAG,KAAK,CAAC,EAAE;QACd,GAAG,GAAG,CAAC,CAAC;QACR,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC;QAC7B,SAAS,GAAG,IAAI,YAAY,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;KACzC;IAGD,uEAAuE;IACvE,mCAAmC;IACnC,gDAAgD;IAEhD,IAAI,kBAAkB,GAAG,KAAK,CAAC;IAC/B,KAAK,IAAI,CAAC,GAAC,CAAC,EAAE,CAAC,GAAC,YAAY,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACzC,MAAM,WAAW,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC;QACpC,MAAM,aAAa,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC;QAExC,IAAI,kBAAkB,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE;YAC5F,kBAAkB,GAAG,IAAI,CAAC;YAC1B,MAAM;SACN;KACD;IACD,IAAI,kBAAkB,CAAC,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC;QAClF,kBAAkB,EAAE;QAEpB,IAAI,OAAO,OAAO,KAAK,WAAW,EAAE;YACnC,IAAI,WAAW,EAAE;gBAChB,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAC,GAAG,EAAE,CAAC;aACtD;iBAAM;gBACN,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC,GAAG,EAAE,CAAC;aAClD;SACD;QACD,OAAO;KACP;IAED,WAAW;IACX,MAAM,cAAc,GAAa,EAAE,CAAC;IACpC,MAAM,WAAW,GAAmB,EAAE,CAAC;IACvC,MAAM,eAAe,GAAuB,EAAE,CAAC;IAC/C,MAAM,cAAc,GAAe,EAAE,CAAC;IACtC,MAAM,aAAa,GAAW,EAAE,CAAC;IACjC,KAAK,IAAI,CAAC,GAAC,CAAC,EAAE,CAAC,GAAC,YAAY,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACzC,MAAM,WAAW,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC;QACpC,MAAM,aAAa,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC;QAExC,MAAM,UAAU,GAAiB,EAAE,YAAY,EAAE,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC;QAC5G,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAC7B,MAAM,YAAY,GAAG,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC;QAChD,aAAa,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACjC,MAAM,cAAc,GAAG,QAAQ,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;QAClD,eAAe,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QACrC,MAAM,aAAa,GAAG,qBAAqB,CAC1C,cAAc,EAAE,WAAW,CAAC,GAAG,EAAE,aAAa,EAAE,CAAC,CACjD,CAAC;QACF,cAAc,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAEnC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAChC,WAAW,EACX,KAAK,EACL,cAAc,EACd,UAAU,EACV,aAAa,CAAC,CAAC,CAAC,CAChB,CAAC,CAAC;KACH;IAGD,SAAS;IACT,MAAM,QAAQ,GAAiB,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC;IAClG,MAAM,UAAU,GAAG,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC;IACxC,MAAM,YAAY,GAAG,QAAQ,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IAC9C,MAAM,WAAW,GAAG,qBAAqB,CACxC,YAAY,EAAE,SAAS,EAAE,WAAW,EAAE,CAAC,CACvC,CAAC;IACF,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAChC,WAAW,EACX,KAAK,EACL,YAAY,EACZ,QAAQ,EACR,WAAW,CAAC,CAAC,CAAC,CACd,CAAC;IAGF,gBAAgB;IAChB,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE;QAChC,WAAW,CAAC,YAAY,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC;QAC7C,WAAW,CAAC,YAAY,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC;QAE7C,cAAc,CAAC,CAAC,CAAC,CAAC,YAAY,GAAG,WAAW,CAAC;QAC7C,cAAc,CAAC,CAAC,CAAC,CAAC,YAAY,GAAG,WAAW,CAAC;KAC7C;SAAM;QACN,MAAM,OAAO,GAAG,cAAc,CAAC,KAAK,EAAE,CAAC;QACvC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAE1B,wDAAwD;QACxD,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;QAE9B,KAAK,IAAI,CAAC,GAAC,CAAC,EAAE,CAAC,GAAC,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACpC,MAAM,KAAK,GAAG,CAAC,CAAC,GAAC,CAAC,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAC,CAAC,CAAC;YACjD,MAAM,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,GAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAC,CAAC,CAAC;YAEjD,MAAM,UAAU,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;YAC9B,MAAM,UAAU,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;YAClC,MAAM,UAAU,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;YAElC,UAAU,CAAC,YAAY,GAAG,UAAU,CAAC;YACrC,UAAU,CAAC,YAAY,GAAG,UAAU,CAAC;SACrC;KACD;IAGD,IAAI,WAAW,EAAE;QAChB,4EAA4E;QAC5E,0BAA0B;QAC1B,MAAM,IAAI,GAAiB,EAAE,YAAY,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC;QAClH,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,eAAe,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC;QAE5F,MAAM,IAAI,GAAiB,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC;QAClG,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,YAAY,EAAE,IAAI,EAAE,WAAW,CAAC,IAAI,CAAC,CAAC;QAErF,gBAAgB;QAChB,WAAW,CAAC,YAAY,GAAG,WAAW,CAAC;QACvC,WAAW,CAAC,YAAY,GAAG,WAAW,CAAC;QACvC,WAAW,CAAC,YAAY,GAAG,WAAW,CAAC;QACvC,WAAW,CAAC,YAAY,GAAG,WAAW,CAAC;QAEvC,cAAc,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,WAAW,CAAC;QACrC,WAAW,CAAC,IAAI,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC;QAErC,WAAW,CAAC,IAAI,GAAG,WAAW,CAAC;QAC/B,WAAW,CAAC,IAAI,GAAG,WAAW,CAAC;KAC/B;IAGD,IAAI,OAAO,OAAO,KAAK,WAAW,EAAE;QACnC,IAAI,KAA6B,CAAC;QAClC,IAAI,WAAW,EAAE;YAChB,KAAK,GAAG,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAC;SACxD;aAAM;YACN,KAAK,GAAG,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;SACpD;QAED,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,GAAC,CAAC,CAAC,CAAC;QAEnC,IAAI,CAAC,WAAW,EAAE;YAAE,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;SAAC;QACxC,IAAI,CAAC,MAAM,GAAG,WAAW,CAAC;KAC1B;IAED,OAAO,WAAW,CAAC;AACpB,CAAC;AAGD,cAAc;AACd,SAAS,KAAK,CAAC,CAAS,EAAE,GAAW;IACjC,OAAO,CAAC,GAAG,CAAC,CAAC,IAAE,CAAC,CAAC,GAAG,GAAC,CAAC,CAAC,CAAC,CAAC;AAC7B,CAAC;AAGD,cAAc;AACd,SAAS,OAAO,CAAC,CAAS,EAAE,CAAS;IACpC,gBAAgB;IAChB,IAAI,CAAC,GAAG,CAAC,EAAE;QACV,IAAI,CAAC,GAAG,GAAG,EAAE;YACZ,OAAO,CAAC,CAAC,CAAC,oDAAoD;SAC9D;aAAM;YACN,IAAI,CAAC,GAAG,CAAC,EAAE;gBACV,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,iBAAiB;aAC/B;iBAAM;gBACN,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,eAAe;aAC9B;SACD;KACD;SAAM;QACN,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE;YACb,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,eAAe;SAC9B;aAAM;YACN,IAAI,CAAC,GAAG,CAAC,EAAE;gBACV,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,eAAe;aAC7B;iBAAM;gBACN,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,aAAa;aAC5B;SACD;KACD;AACF,CAAC;AAGD,cAAc;AACd,SAAS,OAAO,CAAC,MAAc;IAC9B,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC;IACxB,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC;IAExB,MAAM,GAAG,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;IAExB,OAAO,UAAS,EAAU,EAAE,EAAU;QACrC,IAAI,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC;QAC7B,IAAI,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC;QAE7B,mBAAmB;QACnB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC3B,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAE3B,QAAQ;QACR,MAAM,EAAE,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;QAC5B,MAAM,EAAE,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;QAC5B,MAAM,EAAE,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;QAC5B,MAAM,EAAE,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;QAE5B,aAAa;QACb,MAAM,EAAE,GAAG,OAAO,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;QAC3B,MAAM,EAAE,GAAG,OAAO,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;QAE3B,OAAO,EAAE,GAAG,EAAE,CAAC;IAChB,CAAC,CAAA;AACF,CAAC;AAGD,OAAO,EAAE,SAAS,EAAE,CAAA"}
|
|
@@ -9,7 +9,7 @@ import { isAnotherCpCloseby } from '../is-another-cp-closeby.js';
|
|
|
9
9
|
* @param threeProng
|
|
10
10
|
*/
|
|
11
11
|
function add3Prong(cpTrees, orders, threeProng) {
|
|
12
|
-
|
|
12
|
+
const { circle, ps: poss, δ3s } = threeProng;
|
|
13
13
|
// Keep for possible future debugging.
|
|
14
14
|
/*
|
|
15
15
|
if (typeof _debug_ !== 'undefined') {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-3-prong.js","sourceRoot":"","sources":["../../../src/mat/find-mat/add-3-prong.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AAGjE;;;;;;;GAOG;AACH,SAAS,SAAS,CAChB,OAAmC,EACnC,MAAgB,EAChB,UAIC;IAEF,
|
|
1
|
+
{"version":3,"file":"add-3-prong.js","sourceRoot":"","sources":["../../../src/mat/find-mat/add-3-prong.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AAGjE;;;;;;;GAOG;AACH,SAAS,SAAS,CAChB,OAAmC,EACnC,MAAgB,EAChB,UAIC;IAEF,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,UAAU,CAAC;IAE7C,uCAAuC;IACvC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAgCE;IAEF,+CAA+C;IAC/C,kBAAkB,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;IACzE,kBAAkB,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;IACzE,kBAAkB,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;IAEzE,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;IAEjD,OAAO,MAAM,CAAC;AACf,CAAC;AAGD,OAAO,EAAE,SAAS,EAAE,CAAA"}
|
|
@@ -1,32 +1,30 @@
|
|
|
1
1
|
import { getBoundingHull, getBoundingBoxTight } from 'flo-bezier3';
|
|
2
2
|
import { getCornerAtEnd } from '../../curve.js';
|
|
3
3
|
import { getBoundingBox_ } from '../../get-bounding-box-.js';
|
|
4
|
-
|
|
5
|
-
var timingStart;
|
|
6
|
-
}
|
|
4
|
+
let timingStart;
|
|
7
5
|
/** @hidden */
|
|
8
6
|
function addDebugInfo1(loops) {
|
|
9
7
|
if (typeof _debug_ === 'undefined') {
|
|
10
8
|
return;
|
|
11
9
|
}
|
|
12
10
|
timingStart = performance.now();
|
|
13
|
-
for (
|
|
11
|
+
for (const loop of loops) {
|
|
14
12
|
_debug_.fs.nameObj(loop, 'l|');
|
|
15
13
|
}
|
|
16
|
-
|
|
14
|
+
const generated = _debug_.generated;
|
|
17
15
|
//generated.elems.loop.push(...loops);
|
|
18
16
|
//generated.elems.loops.push(loops);
|
|
19
|
-
for (
|
|
17
|
+
for (const loop of loops) {
|
|
20
18
|
let i = 0;
|
|
21
19
|
loop.curves.forEach(function (curve) {
|
|
22
|
-
|
|
23
|
-
|
|
20
|
+
const ps = curve.ps;
|
|
21
|
+
const hull = getBoundingHull(ps);
|
|
24
22
|
generated.elems.boundingHull.push(hull);
|
|
25
|
-
|
|
23
|
+
const looseBoundingBox = getBoundingBox_(ps);
|
|
26
24
|
generated.elems.looseBoundingBox.push(looseBoundingBox);
|
|
27
|
-
|
|
25
|
+
const tightBoundingBox = getBoundingBoxTight(ps);
|
|
28
26
|
generated.elems.tightBoundingBox.push(tightBoundingBox);
|
|
29
|
-
|
|
27
|
+
const corner = getCornerAtEnd(curve);
|
|
30
28
|
if (corner.isSharp) {
|
|
31
29
|
generated.elems.sharpCorner.push(curve);
|
|
32
30
|
}
|
|
@@ -42,8 +40,8 @@ function addDebugInfo2() {
|
|
|
42
40
|
if (typeof _debug_ === 'undefined') {
|
|
43
41
|
return;
|
|
44
42
|
}
|
|
45
|
-
|
|
46
|
-
|
|
43
|
+
const timing = _debug_.generated.timing;
|
|
44
|
+
const now = performance.now();
|
|
47
45
|
timing.holeClosers += now - timingStart;
|
|
48
46
|
timingStart = now;
|
|
49
47
|
}
|
|
@@ -51,9 +49,9 @@ function addDebugInfo3() {
|
|
|
51
49
|
if (typeof _debug_ === 'undefined') {
|
|
52
50
|
return;
|
|
53
51
|
}
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
52
|
+
const generated = _debug_.generated;
|
|
53
|
+
const timing = generated.timing;
|
|
54
|
+
const now = performance.now();
|
|
57
55
|
timing.oneAnd2Prongs += now - timingStart;
|
|
58
56
|
timingStart = now;
|
|
59
57
|
}
|
|
@@ -61,8 +59,8 @@ function addDebugInfo4(mat) {
|
|
|
61
59
|
if (typeof _debug_ === 'undefined') {
|
|
62
60
|
return;
|
|
63
61
|
}
|
|
64
|
-
|
|
65
|
-
|
|
62
|
+
const generated = _debug_.generated;
|
|
63
|
+
const timing = generated.timing;
|
|
66
64
|
generated.elems.mat.push(mat);
|
|
67
65
|
timing.threeProngs += performance.now() - timingStart;
|
|
68
66
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-debug-info.js","sourceRoot":"","sources":["../../../src/mat/find-mat/add-debug-info.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAGnE,OAAO,EAAS,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAEvD,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAO7D,IAAI,
|
|
1
|
+
{"version":3,"file":"add-debug-info.js","sourceRoot":"","sources":["../../../src/mat/find-mat/add-debug-info.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,9 +10,9 @@ import { PointOnShape, comparePoss } from '../../point-on-shape.js';
|
|
|
10
10
|
*/
|
|
11
11
|
function getInterestingPointsOnLoop(minBezLength, maxCurviness, maxLength) {
|
|
12
12
|
return function (loop) {
|
|
13
|
-
|
|
13
|
+
const allPoints = [];
|
|
14
14
|
for (let i = 0; i < loop.curves.length; i++) {
|
|
15
|
-
|
|
15
|
+
const curve = loop.curves[i];
|
|
16
16
|
// qqq if (lengthSquaredUpperBound(curve.ps) < minBezLength) {
|
|
17
17
|
if (controlPointLinesLength(curve.ps) < minBezLength) {
|
|
18
18
|
continue;
|
|
@@ -31,10 +31,10 @@ function getInterestingPointsOnLoop(minBezLength, maxCurviness, maxLength) {
|
|
|
31
31
|
*/
|
|
32
32
|
// let { maxima } = getCurvatureExtrema(curve.ps);
|
|
33
33
|
// qqq let { maxCurvatureTs, maxNegativeCurvatureTs } = getCurvatureExtrema(curve.ps);
|
|
34
|
-
|
|
34
|
+
const { maxima } = getCurvatureExtrema(curve.ps);
|
|
35
35
|
// let maxAbsCurvatures = maxima.map(t => new PointOnShape(curve, t));
|
|
36
36
|
// qqq let maxAbsCurvatures = [...maxCurvatureTs, ...maxNegativeCurvatureTs].map(t => new PointOnShape(curve, t));
|
|
37
|
-
|
|
37
|
+
const maxAbsCurvatures = [...maxima].map(t => new PointOnShape(curve, t));
|
|
38
38
|
allPoints.push(...getContactCirclesAtInterface(curve), ...maxAbsCurvatures);
|
|
39
39
|
let ts = splitByCurvatureAndLength(curve.ps, maxCurviness, maxLength);
|
|
40
40
|
if (ts.length === 2) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-get-interesting-points-on-loop.js","sourceRoot":"","sources":["../../../src/mat/find-mat/create-get-interesting-points-on-loop.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,yBAAyB,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC;AACtG,OAAO,EAAE,4BAA4B,EAAE,MAAM,wCAAwC,CAAC;AAEtF,OAAO,EAAE,YAAY,EAAE,WAAW,EAAiB,MAAM,yBAAyB,CAAC;AAGnF;;;;;;GAMG;AACH,SAAS,0BAA0B,CAC3B,YAAoB,EACpB,YAAoB,EACpB,SAAiB;IAErB,OAAO,UAAS,IAAU;QACtB,
|
|
1
|
+
{"version":3,"file":"create-get-interesting-points-on-loop.js","sourceRoot":"","sources":["../../../src/mat/find-mat/create-get-interesting-points-on-loop.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,yBAAyB,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC;AACtG,OAAO,EAAE,4BAA4B,EAAE,MAAM,wCAAwC,CAAC;AAEtF,OAAO,EAAE,YAAY,EAAE,WAAW,EAAiB,MAAM,yBAAyB,CAAC;AAGnF;;;;;;GAMG;AACH,SAAS,0BAA0B,CAC3B,YAAoB,EACpB,YAAoB,EACpB,SAAiB;IAErB,OAAO,UAAS,IAAU;QACtB,MAAM,SAAS,GAAoB,EAAE,CAAC;QAEtC,KAAK,IAAI,CAAC,GAAC,CAAC,EAAE,CAAC,GAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACrC,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;YAE7B,8DAA8D;YAC9D,IAAI,uBAAuB,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,YAAY,EAAE;gBAClD,SAAS;aACZ;YAGD;;;;;;;;;;;cAWE;YAEF,kDAAkD;YAClD,sFAAsF;YACtF,MAAM,EAAE,MAAM,EAAE,GAAG,mBAAmB,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;YACjD,sEAAsE;YACtE,kHAAkH;YAClH,MAAM,gBAAgB,GAAG,CAAC,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,YAAY,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC;YAE1E,SAAS,CAAC,IAAI,CACV,GAAG,4BAA4B,CAAC,KAAK,CAAC,EACtC,GAAG,gBAAgB,CACtB,CAAC;YAEF,IAAI,EAAE,GAAG,yBAAyB,CAAC,KAAK,CAAC,EAAE,EAAE,YAAY,EAAE,SAAS,CAAC,CAAC;YACtE,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC,EAAE;gBACjB,EAAE,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;aACpB;YAED,KAAK,IAAI,CAAC,GAAC,CAAC,EAAE,CAAC,GAAC,EAAE,CAAC,MAAM,GAAC,CAAC,EAAE,CAAC,EAAE,EAAE;gBAC9B,SAAS,CAAC,IAAI,CAAE,IAAI,YAAY,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAE,CAAC;aACpD;SACJ;QAED,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAE5B,OAAO,SAAS,CAAC;IACrB,CAAC,CAAA;AACL,CAAC;AAGD,OAAO,EAAE,0BAA0B,EAAE,CAAA"}
|