flo-mat 4.1.3 → 4.1.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/__tests__/cp-node/circle-identity.spec.ts +56 -0
- package/__tests__/find-2-prong/get-medial/dd-get-medial-point-coeffs-same-curve.spec.ts +8 -6
- package/__tests__/find-2-prong/get-medial/dd-get-medial-point-coeffs.spec.ts +4 -2
- package/__tests__/specific-cases/specific-cases.spec.ts +1 -14
- package/__tests__/specific-cases/test-svgs/achispado.svg +37 -24
- package/browser/index.js +2969 -2315
- package/browser/index.min.js +1 -1
- package/node/add-n-prong.ts/join-spokes.js +3 -2
- package/node/add-n-prong.ts/join-spokes.js.map +1 -1
- package/node/cp-node/fs/enhance-cp-node.d.ts +9 -9
- package/node/cp-node/fs/get-angle-between-mat-curves.d.ts +1 -1
- package/node/cp-node/fs/get-angle-between-mat-curves.js +2 -1
- package/node/cp-node/fs/get-angle-between-mat-curves.js.map +1 -1
- package/node/cp-node/fs/get-edge-direction.js +3 -2
- package/node/cp-node/fs/get-edge-direction.js.map +1 -1
- package/node/cp-node/fs/get-implied-boundary-bezier-between.d.ts +1 -1
- package/node/cp-node/fs/get-implied-boundary-bezier-between.js +3 -2
- package/node/cp-node/fs/get-implied-boundary-bezier-between.js.map +1 -1
- package/node/cp-node/fs/get-mat-curve-between.d.ts +1 -0
- package/node/cp-node/fs/get-mat-curve-between.js +1 -0
- package/node/cp-node/fs/get-mat-curve-between.js.map +1 -1
- package/node/cp-node/fs/insert-cp-node.d.ts +12 -1
- package/node/cp-node/fs/insert-cp-node.js +21 -6
- package/node/cp-node/fs/insert-cp-node.js.map +1 -1
- package/node/cp-node/fs/is-fully-terminating.d.ts +1 -1
- package/node/cp-node/fs/is-fully-terminating.js +3 -5
- package/node/cp-node/fs/is-fully-terminating.js.map +1 -1
- package/node/cp-node/fs/is-on-same-circle.d.ts +3 -0
- package/node/cp-node/fs/is-on-same-circle.js +4 -4
- package/node/cp-node/fs/is-on-same-circle.js.map +1 -1
- package/node/cp-node/fs/is-order-correct.d.ts +9 -1
- package/node/cp-node/fs/is-order-correct.js +51 -10
- package/node/cp-node/fs/is-order-correct.js.map +1 -1
- package/node/cp-node/fs/remove-cp-node.js +1 -1
- package/node/cp-node/fs/remove-cp-node.js.map +1 -1
- package/node/cp-node/stringification/from-stringifyable.js +16 -0
- package/node/cp-node/stringification/from-stringifyable.js.map +1 -1
- package/node/debug/functions/check-ordering.d.ts +4 -0
- package/node/debug/functions/check-ordering.js +43 -0
- package/node/debug/functions/check-ordering.js.map +1 -0
- package/node/find-2-prong/add-2-prong.js +8 -2
- package/node/find-2-prong/add-2-prong.js.map +1 -1
- package/node/find-2-prong/calc-seperation-tolerance.js +2 -2
- package/node/find-2-prong/calc-seperation-tolerance.js.map +1 -1
- package/node/find-2-prong/find-and-add-2-prongs.js +1 -1
- package/node/find-2-prong/find-and-add-2-prongs.js.map +1 -1
- package/node/find-2-prong/get-initial-bezier-pieces.js +2 -2
- package/node/find-2-prong/get-initial-bezier-pieces.js.map +1 -1
- package/node/find-3-prong/find-3-prong-for-delta3s.d.ts +1 -1
- package/node/find-3-prong/find-3-prong-for-delta3s.js +1 -1
- package/node/find-3-prong/find-3-prong-for-delta3s.js.map +1 -1
- package/node/find-3-prong/find-3-prong.d.ts +1 -1
- package/node/find-3-prong/find-3-prong.js.map +1 -1
- package/node/find-3-prong/find-and-add-3-prong.js +1 -1
- package/node/find-3-prong/find-and-add-3-prong.js.map +1 -1
- package/node/find-3-prong/find-and-add-3-prongs-on-loop.d.ts +1 -1
- package/node/find-3-prong/find-and-add-3-prongs-on-loop.js +6 -2
- package/node/find-3-prong/find-and-add-3-prongs-on-loop.js.map +1 -1
- package/node/find-3-prong/three-prong-info.d.ts +1 -1
- package/node/find-mat/create-initial-cp-tree.js +2 -2
- package/node/find-mat/create-initial-cp-tree.js.map +1 -1
- package/node/find-mat/find-mat.js +2 -2
- package/node/find-mat/find-mat.js.map +1 -1
- package/node/find-mat/get-for-1-prongs-on-loop.js +3 -1
- package/node/find-mat/get-for-1-prongs-on-loop.js.map +1 -1
- package/node/geometry/get-closest-squared-distance-to-rotated-rect.js +2 -1
- package/node/geometry/get-closest-squared-distance-to-rotated-rect.js.map +1 -1
- package/node/mat/add-to-cp-tree.d.ts +4 -1
- package/node/mat/add-to-cp-tree.js +11 -4
- package/node/mat/add-to-cp-tree.js.map +1 -1
- package/node/mat/get-boundary-piece-beziers.d.ts +2 -2
- package/node/mat/get-boundary-piece-beziers.js +1 -1
- package/node/mat/get-boundary-piece-beziers.js.map +1 -1
- package/node/mat/get-closeby-cp-if-exist.js +4 -3
- package/node/mat/get-closeby-cp-if-exist.js.map +1 -1
- package/node/mat/{get-cp-node-to-left-or-same.d.ts → get-cp-node-neighbors.d.ts} +2 -2
- package/node/mat/get-cp-node-neighbors.js +31 -0
- package/node/mat/get-cp-node-neighbors.js.map +1 -0
- package/node/point-on-shape/point-on-shape.d.ts +5 -0
- package/node/reconstruct-from-mat/reconstruct-from-mat.js.map +1 -1
- package/package.json +15 -15
- package/src/add-n-prong.ts/join-spokes.ts +4 -2
- package/src/cp-node/fs/get-angle-between-mat-curves.ts +4 -2
- package/src/cp-node/fs/get-edge-direction.ts +4 -2
- package/src/cp-node/fs/get-implied-boundary-bezier-between.ts +6 -6
- package/src/cp-node/fs/get-mat-curve-between.ts +1 -0
- package/src/cp-node/fs/insert-cp-node.ts +22 -7
- package/src/cp-node/fs/is-fully-terminating.ts +3 -7
- package/src/cp-node/fs/is-on-same-circle.ts +6 -7
- package/src/cp-node/fs/is-order-correct copy.ts +60 -0
- package/src/cp-node/fs/is-order-correct.ts +61 -13
- package/src/cp-node/fs/remove-cp-node.ts +1 -1
- package/src/cp-node/stringification/from-stringifyable.ts +17 -0
- package/src/debug/functions/check-ordering.ts +44 -61
- package/src/find-2-prong/add-2-prong.ts +9 -2
- package/src/find-2-prong/calc-seperation-tolerance.ts +2 -2
- package/src/find-2-prong/find-and-add-2-prongs.ts +1 -1
- package/src/find-2-prong/get-initial-bezier-pieces.ts +2 -2
- package/src/find-3-prong/find-3-prong-for-delta3s.ts +15 -7
- package/src/find-3-prong/find-3-prong.ts +1 -1
- package/src/find-3-prong/find-and-add-3-prong.ts +1 -4
- package/src/find-3-prong/find-and-add-3-prongs-on-loop.ts +6 -3
- package/src/find-3-prong/three-prong-info.ts +1 -1
- package/src/find-mat/create-initial-cp-tree.ts +2 -2
- package/src/find-mat/find-mat.ts +3 -2
- package/src/find-mat/get-for-1-prongs-on-loop.ts +3 -1
- package/src/geometry/get-closest-squared-distance-to-rotated-rect.ts +4 -4
- package/src/mat/add-to-cp-tree copy.ts +71 -0
- package/src/mat/add-to-cp-tree.ts +12 -4
- package/src/mat/get-boundary-piece-beziers.ts +2 -2
- package/src/mat/get-closeby-cp-if-exist.ts +5 -3
- package/src/mat/{get-cp-node-to-left-or-same.ts → get-cp-node-neighbors.ts} +12 -10
- package/src/point-on-shape/point-on-shape.ts +5 -0
- package/src/utils/deg-to-rad.ts +4 -2
- package/src/utils/rad-to-deg.ts +4 -1
- package/webpack.config.cjs +7 -2
- package/node/mat/get-cp-node-to-left-or-same.js +0 -30
- package/node/mat/get-cp-node-to-left-or-same.js.map +0 -1
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
const { atan2 } = Math;
|
|
1
2
|
function joinSpokes(circle, cpNodes) {
|
|
2
3
|
cpNodes = cpNodes.slice().sort(byAngle(circle));
|
|
3
4
|
const len = cpNodes.length;
|
|
@@ -16,8 +17,8 @@ function byAngle(circle) {
|
|
|
16
17
|
// Move onto origin
|
|
17
18
|
a = [a[0] - c[0], a[1] - c[1]];
|
|
18
19
|
b = [b[0] - c[0], b[1] - c[1]];
|
|
19
|
-
const a_ =
|
|
20
|
-
const b_ =
|
|
20
|
+
const a_ = atan2(a[1], a[0]);
|
|
21
|
+
const b_ = atan2(b[1], b[0]);
|
|
21
22
|
return b_ - a_;
|
|
22
23
|
};
|
|
23
24
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"join-spokes.js","sourceRoot":"","sources":["../../src/add-n-prong.ts/join-spokes.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"join-spokes.js","sourceRoot":"","sources":["../../src/add-n-prong.ts/join-spokes.ts"],"names":[],"mappings":"AAIA,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;AAGvB,SAAS,UAAU,CACX,MAAc,EACd,OAAiB;IAErB,OAAO,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;IAEhD,MAAM,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC;IAC3B,KAAK,IAAI,CAAC,GAAC,CAAC,EAAE,CAAC,GAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;QACvB,MAAM,MAAM,GAAG,OAAO,CAAC,CAAC,CAAoB,CAAC;QAC7C,MAAM,CAAC,YAAY,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,GAAC,GAAG,CAAC,CAAC;QAC3C,MAAM,CAAC,YAAY,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,GAAC,GAAG,CAAC,CAAC;IACrD,CAAC;AACL,CAAC;AAGD,gBAAgB;AAChB,SAAS,OAAO,CAAC,MAAc;IAC3B,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC;IAExB,OAAO,UAAS,EAAU,EAAE,EAAU;QAClC,IAAI,CAAC,GAAG,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC;QAC1B,IAAI,CAAC,GAAG,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC;QAE1B,mBAAmB;QACnB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC/B,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAE/B,MAAM,EAAE,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC7B,MAAM,EAAE,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAE7B,OAAO,EAAE,GAAG,EAAE,CAAC;IACnB,CAAC,CAAA;AACL,CAAC;AAGD,OAAO,EAAE,UAAU,EAAE,CAAA"}
|
|
@@ -4,6 +4,15 @@ import { CpNode } from "../cp-node.js";
|
|
|
4
4
|
* @param cpNode
|
|
5
5
|
*/
|
|
6
6
|
declare function enhanceCpNode(cpNode: CpNode): {
|
|
7
|
+
id: number;
|
|
8
|
+
pointOnShape: import("../../index.js").PointOnShape;
|
|
9
|
+
isHoleClosing: boolean;
|
|
10
|
+
isIntersection: boolean;
|
|
11
|
+
prev: CpNode;
|
|
12
|
+
next: CpNode;
|
|
13
|
+
prevOnCircle: CpNode;
|
|
14
|
+
nextOnCircle: CpNode;
|
|
15
|
+
holeCloserTwin?: CpNode | undefined;
|
|
7
16
|
pos: import("../../index.js").PointOnShape;
|
|
8
17
|
p: number[];
|
|
9
18
|
t: number;
|
|
@@ -20,14 +29,5 @@ declare function enhanceCpNode(cpNode: CpNode): {
|
|
|
20
29
|
};
|
|
21
30
|
curve: import("flo-boolean").Curve;
|
|
22
31
|
loop: import("flo-boolean").Loop;
|
|
23
|
-
id: number;
|
|
24
|
-
pointOnShape: import("../../index.js").PointOnShape;
|
|
25
|
-
isHoleClosing: boolean;
|
|
26
|
-
isIntersection: boolean;
|
|
27
|
-
prev: CpNode;
|
|
28
|
-
next: CpNode;
|
|
29
|
-
prevOnCircle: CpNode;
|
|
30
|
-
nextOnCircle: CpNode;
|
|
31
|
-
holeCloserTwin?: CpNode | undefined;
|
|
32
32
|
};
|
|
33
33
|
export { enhanceCpNode };
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { tangent } from "flo-bezier3";
|
|
2
2
|
import { cross, toUnitVector } from "flo-vector2d";
|
|
3
3
|
import { getMatCurveToNext } from "./get-mat-curve-to-next.js";
|
|
4
|
+
const { abs, asin, PI: π } = Math;
|
|
4
5
|
/**
|
|
5
6
|
*
|
|
6
7
|
* @param cpNode1
|
|
@@ -11,7 +12,7 @@ function getInitialDegAngleBetweenMatCurves(cpNode1, cpNode2) {
|
|
|
11
12
|
const tan1 = toUnitVector(tangent(getMatCurveToNext(cpNode1), 0));
|
|
12
13
|
const tan2 = toUnitVector(tangent(getMatCurveToNext(cpNode2), 0));
|
|
13
14
|
const cross_ = cross(tan1, tan2);
|
|
14
|
-
const angle =
|
|
15
|
+
const angle = abs(asin(cross_) * (180 / π));
|
|
15
16
|
return angle;
|
|
16
17
|
}
|
|
17
18
|
export { getInitialDegAngleBetweenMatCurves };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-angle-between-mat-curves.js","sourceRoot":"","sources":["../../../src/cp-node/fs/get-angle-between-mat-curves.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"get-angle-between-mat-curves.js","sourceRoot":"","sources":["../../../src/cp-node/fs/get-angle-between-mat-curves.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AACtC,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAE/D,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,EAAE,GAAG,IAAI,CAAC;AAGlC;;;;;GAKG;AACH,SAAS,kCAAkC,CACnC,OAAe,EACf,OAAe;IAEnB,MAAM,IAAI,GAAG,YAAY,CAAC,OAAO,CAC7B,iBAAiB,CAAC,OAAO,CAAC,EAC1B,CAAC,CACJ,CAAC,CAAC;IACH,MAAM,IAAI,GAAG,YAAY,CAAC,OAAO,CAC7B,iBAAiB,CAAC,OAAO,CAAC,EAC1B,CAAC,CACJ,CAAC,CAAC;IAEH,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IACjC,MAAM,KAAK,GAAG,GAAG,CAAC,IAAI,CAAE,MAAM,CAAE,GAAG,CAAC,GAAG,GAAC,CAAC,CAAC,CAAC,CAAC;IAE5C,OAAO,KAAK,CAAC;AACjB,CAAC;AAGD,OAAO,EAAE,kCAAkC,EAAE,CAAA"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { toUnitVector, fromTo, rotate, translate, rotate90Degrees, reverse as reverseVec, dot } from 'flo-vector2d';
|
|
2
2
|
import { tangent } from 'flo-bezier3';
|
|
3
3
|
import { isPosSharpCorner } from '../../point-on-shape/is-pos-sharp-corner.js';
|
|
4
|
+
const { sqrt } = Math;
|
|
4
5
|
/**
|
|
5
6
|
* Returns a line segment of unit length starting in the given Vertex center and
|
|
6
7
|
* pointing in the direction of the medial axis (viewed as a rooted tree).
|
|
@@ -43,8 +44,8 @@ function getEdgeDirection(cpNode) {
|
|
|
43
44
|
// Recall the identities sin(acos(x)) = sqrt(1-x^2), etc. Also
|
|
44
45
|
// recall the half angle formulas. Then the rotation matrix, R, can
|
|
45
46
|
// be calculated.
|
|
46
|
-
const cosθ =
|
|
47
|
-
const sinθ =
|
|
47
|
+
const cosθ = sqrt((1 + x) / 2);
|
|
48
|
+
const sinθ = sqrt((1 - x) / 2);
|
|
48
49
|
vDir = rotate(sinθ, cosθ, tan2);
|
|
49
50
|
}
|
|
50
51
|
const v = translate(toUnitVector(vDir), circleCenter);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-edge-direction.js","sourceRoot":"","sources":["../../../src/cp-node/fs/get-edge-direction.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,eAAe,EAAE,OAAO,IAAI,UAAU,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AACpH,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AACtC,OAAO,EAAE,gBAAgB,EAAE,MAAM,6CAA6C,CAAC;
|
|
1
|
+
{"version":3,"file":"get-edge-direction.js","sourceRoot":"","sources":["../../../src/cp-node/fs/get-edge-direction.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,eAAe,EAAE,OAAO,IAAI,UAAU,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AACpH,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AACtC,OAAO,EAAE,gBAAgB,EAAE,MAAM,6CAA6C,CAAC;AAE/E,MAAM,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC;AAGtB;;;;;;;GAOG;AACH,SAAS,gBAAgB,CACjB,MAAc;IAElB,MAAM,YAAY,GAAG,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC;IAEvD,MAAM,GAAG,GAAG,MAAM,CAAC;IACnB,MAAM,GAAG,GAAG,MAAM,CAAC,YAAY,CAAC;IAEhC,MAAM,IAAI,GAAG,GAAG,CAAC,YAAY,CAAC;IAC9B,MAAM,IAAI,GAAG,GAAG,CAAC,YAAY,CAAC;IAE9B,MAAM,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC;IAClB,MAAM,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC;IAElB,IAAI,IAAI,CAAC;IAET,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,EAAE,CAAC;QAC1B,IAAI,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACrC,IAAI,GAAG,MAAM,CAAC,EAAE,EAAE,YAAY,CAAC,CAAC,CAAC,YAAY;QACjD,CAAC;aAAM,CAAC;YACJ,IAAI,GAAG,eAAe,CAAE,MAAM,CAAC,EAAE,EAAE,EAAE,CAAC,CAAE,CAAC,CAAC,iBAAiB;QAC/D,CAAC;IACL,CAAC;SAAM,CAAC;QACJ,IAAI,MAAa,CAAC;QAClB,IAAI,MAAa,CAAC;QAElB,IAAI,IAAI,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC;YACf,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC;YACpB,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;QAC7B,CAAC;aAAM,IAAI,IAAI,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC;YACtB,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;YACzB,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC;QACxB,CAAC;QAED,MAAM,IAAI,GAAG,YAAY,CAAC,OAAO,CAAC,MAAO,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;QAClD,MAAM,IAAI,GAAG,UAAU,CAAE,YAAY,CAAC,OAAO,CAAC,MAAO,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAE,CAAC;QAEhE,MAAM,CAAC,GAAG,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAC1B,+DAA+D;QAC/D,oEAAoE;QACpE,iBAAiB;QACjB,MAAM,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,GAAC,CAAC,CAAC,CAAC;QAC7B,MAAM,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,GAAC,CAAC,CAAC,CAAC;QAE7B,IAAI,GAAG,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IACpC,CAAC;IAED,MAAM,CAAC,GAAG,SAAS,CACf,YAAY,CAAC,IAAI,CAAC,EAClB,YAAY,CACf,CAAC;IAEF,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC;AAC7B,CAAC;AAGD,OAAO,EAAE,gBAAgB,EAAE,CAAA"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { tangent } from 'flo-bezier3';
|
|
2
2
|
import { fromTo, dot, cross, translate, lineLineIntersection, toUnitVector } from 'flo-vector2d';
|
|
3
|
+
const { abs } = Math;
|
|
3
4
|
/** @internal */
|
|
4
5
|
const TOLERANCE_ADD_2PRONG = 0.01;
|
|
5
6
|
/** @internal */
|
|
@@ -41,8 +42,8 @@ function getImpliedBoundaryBezierBetween(cpNodeA, cpNodeB) {
|
|
|
41
42
|
}
|
|
42
43
|
const w1 = fromTo(lA[0], lA[1]); // This is a unit vector
|
|
43
44
|
const w2 = fromTo(lB[0], lB[1]); // This is a unit vector
|
|
44
|
-
const d1 =
|
|
45
|
-
const d2 =
|
|
45
|
+
const d1 = abs(cross(c, w1)) / (3 * 3);
|
|
46
|
+
const d2 = abs(cross(c, w2)) / (3 * 3);
|
|
46
47
|
if (d1 > TOLERANCE_ADD_2PRONG || d2 > TOLERANCE_ADD_2PRONG) {
|
|
47
48
|
// not within tolerance
|
|
48
49
|
return undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-implied-boundary-bezier-between.js","sourceRoot":"","sources":["../../../src/cp-node/fs/get-implied-boundary-bezier-between.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"get-implied-boundary-bezier-between.js","sourceRoot":"","sources":["../../../src/cp-node/fs/get-implied-boundary-bezier-between.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-mat-curve-between.js","sourceRoot":"","sources":["../../../src/cp-node/fs/get-mat-curve-between.ts"],"names":[],"mappings":"AACA,OAAO,EACH,MAAM,IAAI,SAAS,EAAE,GAAG,EAAE,KAAK,EAAE,eAAe,EAAE,WAAW,EAAE,SAAS,EACxE,oBAAoB,EACvB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAE3D,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;AAGrB,gBAAgB;AAChB,MAAM,oBAAoB,GAAG,IAAI,CAAC;AAClC,gBAAgB;AAChB,MAAM,kBAAkB,GAAG,MAAM,CAAC,CAAC,aAAa;AAGhD
|
|
1
|
+
{"version":3,"file":"get-mat-curve-between.js","sourceRoot":"","sources":["../../../src/cp-node/fs/get-mat-curve-between.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,18 @@
|
|
|
1
1
|
import type { CpNode } from "../cp-node.js";
|
|
2
2
|
import type { PointOnShape } from "../../point-on-shape/point-on-shape.js";
|
|
3
3
|
import { RbTree } from "flo-ll-rb-tree";
|
|
4
|
-
|
|
4
|
+
/**
|
|
5
|
+
*
|
|
6
|
+
* @param insertIfOrderWrong order cannot be checked for hole-closers since they're on different loops
|
|
7
|
+
* @param isHoleClosing
|
|
8
|
+
* @param isIntersection
|
|
9
|
+
* @param cpTree
|
|
10
|
+
* @param pos
|
|
11
|
+
* @param pred predecessor (to `pos`) on sampe loop (found via `cpTree`)
|
|
12
|
+
* @param succ successor (to `pos`) on sampe loop (found via `cpTree`)
|
|
13
|
+
* @param lastInsertId
|
|
14
|
+
*/
|
|
15
|
+
declare function insertCpNode(insertIfOrderWrong: boolean, isHoleClosing: boolean, isIntersection: boolean, cpTree: RbTree<CpNode>, pos: PointOnShape, pred: CpNode | undefined, succ: CpNode | undefined, lastInsertId: {
|
|
5
16
|
id: number;
|
|
6
17
|
}): CpNode | undefined;
|
|
7
18
|
export { insertCpNode };
|
|
@@ -1,8 +1,23 @@
|
|
|
1
1
|
import { isOrderCorrect } from "./is-order-correct.js";
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
2
|
+
/**
|
|
3
|
+
*
|
|
4
|
+
* @param insertIfOrderWrong order cannot be checked for hole-closers since they're on different loops
|
|
5
|
+
* @param isHoleClosing
|
|
6
|
+
* @param isIntersection
|
|
7
|
+
* @param cpTree
|
|
8
|
+
* @param pos
|
|
9
|
+
* @param pred predecessor (to `pos`) on sampe loop (found via `cpTree`)
|
|
10
|
+
* @param succ successor (to `pos`) on sampe loop (found via `cpTree`)
|
|
11
|
+
* @param lastInsertId
|
|
12
|
+
*/
|
|
13
|
+
function insertCpNode(insertIfOrderWrong, isHoleClosing, isIntersection, cpTree, pos, pred, succ, lastInsertId) {
|
|
14
|
+
if (pred !== undefined && succ !== undefined) {
|
|
15
|
+
// !isOrderCorrect(cpTree, pos, pred.next, false)) {
|
|
16
|
+
const orderCorrect = isOrderCorrect(cpTree, pred, pos, succ, false);
|
|
17
|
+
// if (!orderCorrect) {
|
|
18
|
+
// console.log('aaaaa');
|
|
19
|
+
// }
|
|
20
|
+
if (!insertIfOrderWrong && !orderCorrect) {
|
|
6
21
|
return undefined;
|
|
7
22
|
}
|
|
8
23
|
}
|
|
@@ -17,8 +32,8 @@ function insertCpNode(insertIfOrderWrong, isHoleClosing, isIntersection, cpTree,
|
|
|
17
32
|
prevOnCircle: undefined
|
|
18
33
|
};
|
|
19
34
|
lastInsertId.id++;
|
|
20
|
-
const prev =
|
|
21
|
-
const next =
|
|
35
|
+
const prev = pred === undefined ? cpNode : pred;
|
|
36
|
+
const next = pred === undefined ? cpNode : prev.next;
|
|
22
37
|
next.prev = cpNode;
|
|
23
38
|
prev.next = cpNode;
|
|
24
39
|
cpNode.prev = prev;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"insert-cp-node.js","sourceRoot":"","sources":["../../../src/cp-node/fs/insert-cp-node.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAGvD,SAAS,YAAY,CACb,kBAA2B,EAC3B,aAAsB,EACtB,cAAuB,EACvB,MAAsB,EACtB,GAAiB,EACjB,
|
|
1
|
+
{"version":3,"file":"insert-cp-node.js","sourceRoot":"","sources":["../../../src/cp-node/fs/insert-cp-node.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAGvD;;;;;;;;;;GAUG;AACH,SAAS,YAAY,CACb,kBAA2B,EAC3B,aAAsB,EACtB,cAAuB,EACvB,MAAsB,EACtB,GAAiB,EACjB,IAAwB,EACxB,IAAwB,EACxB,YAA4B;IAEhC,IAAI,IAAI,KAAK,SAAS,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QAC3C,oDAAoD;QACpD,MAAM,YAAY,GAAG,cAAc,CAAC,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;QACpE,uBAAuB;QACvB,4BAA4B;QAC5B,IAAI;QACJ,IAAI,CAAC,kBAAkB,IAAI,CAAC,YAAY,EAAE,CAAC;YACvC,OAAO,SAAS,CAAC;QACrB,CAAC;IACL,CAAC;IAED,MAAM,MAAM,GAAoB;QAC5B,YAAY,EAAE,GAAG;QACjB,aAAa;QACb,cAAc;QACd,EAAE,EAAE,YAAY,CAAC,EAAE;QACnB,IAAI,EAAE,SAAU;QAChB,IAAI,EAAE,SAAU;QAChB,YAAY,EAAE,SAAU;QACxB,YAAY,EAAE,SAAU;KAC3B,CAAC;IACF,YAAY,CAAC,EAAE,EAAE,CAAC;IAElB,MAAM,IAAI,GAAG,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC;IAChD,MAAM,IAAI,GAAG,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;IAEpD,IAAwB,CAAC,IAAI,GAAG,MAAM,CAAC;IACvC,IAAwB,CAAC,IAAI,GAAG,MAAM,CAAC;IACxC,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC;IAEnB,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAEtB,OAAO,MAAgB,CAAC;AAC5B,CAAC;AAGD,OAAO,EAAE,YAAY,EAAE,CAAA"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { CpNode } from "../cp-node.js";
|
|
2
2
|
/**
|
|
3
|
-
* Like isTerminating
|
|
3
|
+
* Like `isTerminating` but only returns true if all `CpNode`s on the circle
|
|
4
4
|
* (except this.prevOnCircle) is terminating.
|
|
5
5
|
*/
|
|
6
6
|
declare function isFullyTerminating(cpNode: CpNode): boolean;
|
|
@@ -2,12 +2,10 @@ import { getAllOnCircle } from "./get-all-on-circle.js";
|
|
|
2
2
|
import { isTerminating } from "./is-terminating.js";
|
|
3
3
|
import { isTrivial } from "./is-trivial.js";
|
|
4
4
|
/**
|
|
5
|
-
* Like isTerminating
|
|
5
|
+
* Like `isTerminating` but only returns true if all `CpNode`s on the circle
|
|
6
6
|
* (except this.prevOnCircle) is terminating.
|
|
7
7
|
*/
|
|
8
8
|
function isFullyTerminating(cpNode) {
|
|
9
|
-
// const otherOnCircle = getAllOnCircle(cpNode.prevOnCircle, true);
|
|
10
|
-
// return otherOnCircle.every(isTerminating);
|
|
11
9
|
if (!isTerminating(cpNode)) {
|
|
12
10
|
return false;
|
|
13
11
|
}
|
|
@@ -17,8 +15,8 @@ function isFullyTerminating(cpNode) {
|
|
|
17
15
|
while (cpNode.prev === cpNode.prevOnCircle) {
|
|
18
16
|
cpNode = cpNode.prev;
|
|
19
17
|
}
|
|
20
|
-
|
|
21
|
-
|
|
18
|
+
return getAllOnCircle(cpNode.prevOnCircle, true)
|
|
19
|
+
.every(isTerminating);
|
|
22
20
|
}
|
|
23
21
|
export { isFullyTerminating };
|
|
24
22
|
//# sourceMappingURL=is-fully-terminating.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"is-fully-terminating.js","sourceRoot":"","sources":["../../../src/cp-node/fs/is-fully-terminating.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C;;;GAGG;AACH,SAAS,kBAAkB,CAAC,MAAc;IACtC,
|
|
1
|
+
{"version":3,"file":"is-fully-terminating.js","sourceRoot":"","sources":["../../../src/cp-node/fs/is-fully-terminating.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C;;;GAGG;AACH,SAAS,kBAAkB,CAAC,MAAc;IACtC,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE,CAAC;QACzB,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,IAAI,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC;QACpB,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,OAAO,MAAM,CAAC,IAAI,KAAK,MAAM,CAAC,YAAY,EAAE,CAAC;QACzC,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC;IACzB,CAAC;IAED,OAAO,cAAc,CAAC,MAAM,CAAC,YAAY,EAAE,IAAI,CAAC;SAC3C,KAAK,CAAC,aAAa,CAAC,CAAC;AAC9B,CAAC;AAGD,OAAO,EAAE,kBAAkB,EAAE,CAAA"}
|
|
@@ -3,6 +3,9 @@ import { CpNode } from "../cp-node.js";
|
|
|
3
3
|
* Returns true if the 2 given `CpNode`s are on the same maximal disk
|
|
4
4
|
* circle.
|
|
5
5
|
*
|
|
6
|
+
* * O(1): all `CpNode`s on the same on-circle ring share the same `Circle`
|
|
7
|
+
* object, and no other ring does (see `PointOnShape.circle`)
|
|
8
|
+
*
|
|
6
9
|
* @param cpNode1 A `CpNode`.
|
|
7
10
|
* @param cpNode2 Another `CpNode`
|
|
8
11
|
*/
|
|
@@ -1,15 +1,15 @@
|
|
|
1
|
-
import { getAllOnCircle } from "./get-all-on-circle.js";
|
|
2
1
|
/**
|
|
3
2
|
* Returns true if the 2 given `CpNode`s are on the same maximal disk
|
|
4
3
|
* circle.
|
|
5
4
|
*
|
|
5
|
+
* * O(1): all `CpNode`s on the same on-circle ring share the same `Circle`
|
|
6
|
+
* object, and no other ring does (see `PointOnShape.circle`)
|
|
7
|
+
*
|
|
6
8
|
* @param cpNode1 A `CpNode`.
|
|
7
9
|
* @param cpNode2 Another `CpNode`
|
|
8
10
|
*/
|
|
9
11
|
function isOnSameCircle(cpNode1, cpNode2) {
|
|
10
|
-
|
|
11
|
-
const cpNodes = getAllOnCircle(cpNode1);
|
|
12
|
-
return cpNodes.indexOf(cpNode2) >= 0;
|
|
12
|
+
return cpNode1.pointOnShape.circle === cpNode2.pointOnShape.circle;
|
|
13
13
|
}
|
|
14
14
|
export { isOnSameCircle };
|
|
15
15
|
//# sourceMappingURL=is-on-same-circle.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"is-on-same-circle.js","sourceRoot":"","sources":["../../../src/cp-node/fs/is-on-same-circle.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"is-on-same-circle.js","sourceRoot":"","sources":["../../../src/cp-node/fs/is-on-same-circle.ts"],"names":[],"mappings":"AAGA;;;;;;;;;GASG;AACH,SAAS,cAAc,CACf,OAAe,EACf,OAAe;IAEnB,OAAO,OAAO,CAAC,YAAY,CAAC,MAAM,KAAK,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC;AACvE,CAAC;AAGD,OAAO,EAAE,cAAc,EAAE,CAAA"}
|
|
@@ -1,5 +1,13 @@
|
|
|
1
1
|
import type { CpNode } from "../cp-node.js";
|
|
2
2
|
import { RbTree } from "flo-ll-rb-tree";
|
|
3
3
|
import { PointOnShape } from "../../point-on-shape/point-on-shape.js";
|
|
4
|
-
|
|
4
|
+
/**
|
|
5
|
+
*
|
|
6
|
+
* @param cpTree
|
|
7
|
+
* @param pos
|
|
8
|
+
* @param succ
|
|
9
|
+
* @param alreadyInserted set to `true` if the given `pos` has already been
|
|
10
|
+
* inserted, `false` otherwise.
|
|
11
|
+
*/
|
|
12
|
+
declare function isOrderCorrect(cpTree: RbTree<CpNode>, pred: CpNode, pos: PointOnShape, succ: CpNode, alreadyInserted: boolean): boolean;
|
|
5
13
|
export { isOrderCorrect };
|
|
@@ -1,20 +1,61 @@
|
|
|
1
1
|
import { comparePoss } from "../../point-on-shape/compare-poss.js";
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
2
|
+
/**
|
|
3
|
+
*
|
|
4
|
+
* @param cpTree
|
|
5
|
+
* @param pos
|
|
6
|
+
* @param succ
|
|
7
|
+
* @param alreadyInserted set to `true` if the given `pos` has already been
|
|
8
|
+
* inserted, `false` otherwise.
|
|
9
|
+
*/
|
|
10
|
+
function isOrderCorrect(cpTree, pred, pos, succ, alreadyInserted) {
|
|
11
|
+
if (cpTree.size <= (alreadyInserted ? 2 : 1)) {
|
|
5
12
|
return true;
|
|
6
13
|
}
|
|
7
|
-
|
|
14
|
+
const a = pred.pointOnShape;
|
|
15
|
+
const b = pos;
|
|
16
|
+
const c = succ.pointOnShape;
|
|
17
|
+
// Let a = pred, b = pos, and c = succ.
|
|
18
|
+
// For a cyclic order we need:
|
|
19
|
+
// `(a < b && b < c)` || `(b < c && c < a)` || `(c < a && a < b)`
|
|
20
|
+
// Let `X = a < b, Y = b < c, Z = c < a` then
|
|
21
|
+
// `(X && Y)` || `(Y && Z)` || `(Z && X)`
|
|
22
|
+
const _X = comparePoss(a, b);
|
|
23
|
+
if (_X === 0) { // two points must have different order
|
|
24
|
+
// console.log('aaa');
|
|
25
|
+
// throw 'a';
|
|
8
26
|
return false;
|
|
9
27
|
}
|
|
10
|
-
const
|
|
11
|
-
if (
|
|
28
|
+
const _Y = comparePoss(b, c);
|
|
29
|
+
if (_Y === 0) { // two points must have different order
|
|
30
|
+
// console.log('bbb');
|
|
31
|
+
// throw 'b';
|
|
32
|
+
return false;
|
|
33
|
+
}
|
|
34
|
+
const _Z = comparePoss(c, a);
|
|
35
|
+
if (_Z === 0) {
|
|
36
|
+
// console.log('bbb');
|
|
37
|
+
// throw 'c';
|
|
38
|
+
return false;
|
|
39
|
+
} // impossible anyway at this point
|
|
40
|
+
// Now neither `_X` nor `_Y` nor `_Z` === `0`
|
|
41
|
+
const X = _X < 0;
|
|
42
|
+
const Y = _Y < 0;
|
|
43
|
+
const Z = _Z < 0;
|
|
44
|
+
// Cyclic order condition
|
|
45
|
+
if ((X && Y) || (Y && Z) || (Z && X)) {
|
|
12
46
|
return true;
|
|
13
47
|
}
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
//
|
|
17
|
-
return
|
|
48
|
+
// throw 'd';
|
|
49
|
+
// console.log(_X, _Y, _Z);
|
|
50
|
+
// console.log(cpTree.toArr().map(v => {
|
|
51
|
+
// return {
|
|
52
|
+
// curveIdx: v.pointOnShape.curve.idx,
|
|
53
|
+
// t: v.pointOnShape.t,
|
|
54
|
+
// order: v.pointOnShape.order,
|
|
55
|
+
// order2: v.pointOnShape.order2
|
|
56
|
+
// }
|
|
57
|
+
// }));
|
|
58
|
+
return false;
|
|
18
59
|
}
|
|
19
60
|
export { isOrderCorrect };
|
|
20
61
|
//# sourceMappingURL=is-order-correct.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"is-order-correct.js","sourceRoot":"","sources":["../../../src/cp-node/fs/is-order-correct.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AAGnE,SAAS,cAAc,CACf,MAAsB,EACtB,GAAiB,EACjB,IAAY;
|
|
1
|
+
{"version":3,"file":"is-order-correct.js","sourceRoot":"","sources":["../../../src/cp-node/fs/is-order-correct.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AAGnE;;;;;;;GAOG;AACH,SAAS,cAAc,CACf,MAAsB,EACtB,IAAY,EACZ,GAAiB,EACjB,IAAY,EACZ,eAAwB;IAE5B,IAAI,MAAM,CAAC,IAAI,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC3C,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,MAAM,CAAC,GAAG,IAAI,CAAC,YAAY,CAAC;IAC5B,MAAM,CAAC,GAAG,GAAG,CAAC;IACd,MAAM,CAAC,GAAG,IAAI,CAAC,YAAY,CAAC;IAE5B,uCAAuC;IACvC,8BAA8B;IAC9B,iEAAiE;IACjE,6CAA6C;IAC7C,yCAAyC;IAEzC,MAAM,EAAE,GAAG,WAAW,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC7B,IAAI,EAAE,KAAK,CAAC,EAAE,CAAC,CAAE,uCAAuC;QACpD,sBAAsB;QACtB,aAAa;QACb,OAAO,KAAK,CAAC;IACjB,CAAC;IACD,MAAM,EAAE,GAAG,WAAW,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC7B,IAAI,EAAE,KAAK,CAAC,EAAE,CAAC,CAAE,uCAAuC;QACpD,sBAAsB;QACtB,aAAa;QACb,OAAO,KAAK,CAAC;IACjB,CAAC;IACD,MAAM,EAAE,GAAG,WAAW,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC7B,IAAI,EAAE,KAAK,CAAC,EAAE,CAAC;QACX,sBAAsB;QACtB,aAAa;QACb,OAAO,KAAK,CAAC;IACjB,CAAC,CAAE,kCAAkC;IAErC,6CAA6C;IAC7C,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IACjB,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IACjB,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAEjB,yBAAyB;IACzB,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;QAAC,OAAO,IAAI,CAAC;IAAC,CAAC;IAEtD,aAAa;IAEb,2BAA2B;IAC3B,wCAAwC;IACxC,eAAe;IACf,8CAA8C;IAC9C,+BAA+B;IAC/B,uCAAuC;IACvC,wCAAwC;IACxC,QAAQ;IACR,OAAO;IAEP,OAAO,KAAK,CAAC;AACjB,CAAC;AAGD,OAAO,EAAE,cAAc,EAAE,CAAA"}
|
|
@@ -5,7 +5,7 @@ function removeCpNode(cpNode, meta) {
|
|
|
5
5
|
prev.next = next;
|
|
6
6
|
next.prev = prev;
|
|
7
7
|
const cpTree = cpTrees.get(cpNode.pointOnShape.curve.loop);
|
|
8
|
-
cpTree.remove(cpNode
|
|
8
|
+
cpTree.remove(cpNode);
|
|
9
9
|
}
|
|
10
10
|
export { removeCpNode };
|
|
11
11
|
//# sourceMappingURL=remove-cp-node.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remove-cp-node.js","sourceRoot":"","sources":["../../../src/cp-node/fs/remove-cp-node.ts"],"names":[],"mappings":"AAKA,SAAS,YAAY,CACb,MAAc,EACd,IAAa;IAEjB,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;IAEzB,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;IACzB,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;IACxB,IAAwB,CAAC,IAAI,GAAG,IAAI,CAAC;IACrC,IAAwB,CAAC,IAAI,GAAG,IAAI,CAAC;IAEtC,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,IAAI,CAAE,CAAC;IAC5D,MAAM,CAAC,MAAM,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"remove-cp-node.js","sourceRoot":"","sources":["../../../src/cp-node/fs/remove-cp-node.ts"],"names":[],"mappings":"AAKA,SAAS,YAAY,CACb,MAAc,EACd,IAAa;IAEjB,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;IAEzB,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;IACzB,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;IACxB,IAAwB,CAAC,IAAI,GAAG,IAAI,CAAC;IACrC,IAAwB,CAAC,IAAI,GAAG,IAAI,CAAC;IAEtC,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,IAAI,CAAE,CAAC;IAC5D,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;AAC1B,CAAC;AAGD,OAAO,EAAE,YAAY,EAAE,CAAA"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { EDGES } from "./cp-node-stringifyable";
|
|
2
|
+
import { getAllOnCircle } from "../fs/get-all-on-circle.js";
|
|
2
3
|
import { loopFromStringifyable } from './loop-from-stringifyable.js';
|
|
3
4
|
function fromStringifyable(cpNodesStringifyable) {
|
|
4
5
|
const { cpNodes: _cpNodes, loops: _loops } = cpNodesStringifyable;
|
|
@@ -38,6 +39,21 @@ function fromStringifyable(cpNodesStringifyable) {
|
|
|
38
39
|
cpNode[edge] = nodeMap.get(id);
|
|
39
40
|
}
|
|
40
41
|
}
|
|
42
|
+
//--------------------------------------------------------------------------
|
|
43
|
+
// Third pass: one shared `Circle` object per on-circle ring, as when the
|
|
44
|
+
// MAT was built (the JSON gave every contact point its own copy).
|
|
45
|
+
//--------------------------------------------------------------------------
|
|
46
|
+
const done = new Set();
|
|
47
|
+
for (const cpNode of cpNodes) {
|
|
48
|
+
if (done.has(cpNode)) {
|
|
49
|
+
continue;
|
|
50
|
+
}
|
|
51
|
+
const { circle } = cpNode.pointOnShape;
|
|
52
|
+
for (const cp of getAllOnCircle(cpNode)) {
|
|
53
|
+
done.add(cp);
|
|
54
|
+
cp.pointOnShape.circle = circle;
|
|
55
|
+
}
|
|
56
|
+
}
|
|
41
57
|
return cpNodes[0];
|
|
42
58
|
}
|
|
43
59
|
export { fromStringifyable };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"from-stringifyable.js","sourceRoot":"","sources":["../../../src/cp-node/stringification/from-stringifyable.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"from-stringifyable.js","sourceRoot":"","sources":["../../../src/cp-node/stringification/from-stringifyable.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AAGrE,SAAS,iBAAiB,CAClB,oBAAyC;IAE7C,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,oBAAoB,CAAC;IAClE,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC;IAChD,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;IAEhE,4EAA4E;IAC5E,yDAAyD;IACzD,6CAA6C;IAC7C,4EAA4E;IAC5E,MAAM,OAAO,GAAa,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;QAC7C,MAAM,EAAE,EAAE,EAAE,YAAY,EAAE,aAAa,EAAE,cAAc,EAAE,GAAG,OAAO,CAAC;QACpE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,YAAY,CAAC;QAC/C,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,QAAQ,EAAE,GAAG,YAAY,CAAC;QAEhE,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,CAAC,OAAO,CAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAExD,MAAM,aAAa,GAAiB;YAChC,MAAM;YACN,KAAK,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,QAAQ;YAC1B,KAAK,EAAE,MAAM;SAChB,CAAC;QAEF,OAAO;YACH,GAAG,OAAO;YACV,EAAE,EAAE,aAAa,EAAE,cAAc;YACjC,YAAY,EAAE,aAAa;SACpB,CAAC;IAChB,CAAC,CAAC,CAAC;IAEH,4EAA4E;IAC5E,oEAAoE;IACpE,4EAA4E;IAC5E,MAAM,OAAO,GAAG,IAAI,GAAG,CAAiB,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IAErE,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;QAC3B,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACvB,MAAM,EAAE,GAAG,MAAM,CAAC,IAAI,CAAkC,CAAC;YACzD,IAAI,EAAE,KAAK,SAAS,EAAE,CAAC;gBAAC,SAAS;YAAC,CAAC;YAEnC,aAAa;YACb,MAAM,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,EAAE,CAAE,CAAC;QACpC,CAAC;IACL,CAAC;IAED,4EAA4E;IAC5E,yEAAyE;IACzE,kEAAkE;IAClE,4EAA4E;IAC5E,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/B,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;QAC3B,IAAI,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;YAAC,SAAS;QAAC,CAAC;QAEnC,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC,YAAY,CAAC;QACvC,KAAK,MAAM,EAAE,IAAI,cAAc,CAAC,MAAM,CAAC,EAAE,CAAC;YACtC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YACZ,EAAE,CAAC,YAAsC,CAAC,MAAM,GAAG,MAAM,CAAC;QAC/D,CAAC;IACL,CAAC;IAED,OAAO,OAAO,CAAC,CAAC,CAAC,CAAC;AACtB,CAAC;AAGD,OAAO,EAAE,iBAAiB,EAAE,CAAA"}
|
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
import { getAllOnLoop } from "../../cp-node/fs/get-all-on-loop.js";
|
|
2
|
+
import { getProngCount } from "../../cp-node/fs/get-prong-count.js";
|
|
3
|
+
import { isOrderCorrect } from "../../cp-node/fs/is-order-correct.js";
|
|
4
|
+
function checkOrdering(meta, cpStart) {
|
|
5
|
+
const { cpTrees } = meta;
|
|
6
|
+
const cpNodes = getAllOnLoop(cpStart);
|
|
7
|
+
const wrongsPerLoop = new Map();
|
|
8
|
+
for (const cpNode of cpNodes) {
|
|
9
|
+
const pos = cpNode.pointOnShape;
|
|
10
|
+
const loop = pos.curve.loop;
|
|
11
|
+
if (loop !== cpNode.prev.pointOnShape.curve.loop ||
|
|
12
|
+
loop !== cpNode.next.pointOnShape.curve.loop) {
|
|
13
|
+
continue;
|
|
14
|
+
}
|
|
15
|
+
const cpTree = cpTrees.get(loop);
|
|
16
|
+
const orderCorrect = isOrderCorrect(cpTree, cpNode.prev, cpNode.pointOnShape, cpNode.next, true);
|
|
17
|
+
if (!orderCorrect) {
|
|
18
|
+
const A = toOrder(cpNode);
|
|
19
|
+
const B = toOrder(cpNode.next);
|
|
20
|
+
let wrongs = wrongsPerLoop.getOrInsert(loop, []);
|
|
21
|
+
wrongs.push([A, B]);
|
|
22
|
+
}
|
|
23
|
+
}
|
|
24
|
+
for (const [loop, wrongs] of wrongsPerLoop) {
|
|
25
|
+
for (const wrong of wrongs) {
|
|
26
|
+
const A = wrong[0];
|
|
27
|
+
const B = wrong[1];
|
|
28
|
+
// const c = comparePoss(A.cpNode.pointOnShape, B.cpNode.pointOnShape);
|
|
29
|
+
console.log(A);
|
|
30
|
+
console.log(B);
|
|
31
|
+
console.log('---------');
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
function toOrder(cpNode) {
|
|
36
|
+
const prongCount = getProngCount(cpNode);
|
|
37
|
+
const { pointOnShape } = cpNode;
|
|
38
|
+
const { p, t, order, order2, curve } = pointOnShape;
|
|
39
|
+
const curveIdx = curve.idx;
|
|
40
|
+
return { cpNode, prongCount, p, curveIdx, t, order, order2 };
|
|
41
|
+
}
|
|
42
|
+
export { checkOrdering };
|
|
43
|
+
//# sourceMappingURL=check-ordering.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"check-ordering.js","sourceRoot":"","sources":["../../../src/debug/functions/check-ordering.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAC;AACnE,OAAO,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAC;AAetE,SAAS,aAAa,CACd,IAAa,EACb,OAAe;IAEnB,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;IAEzB,MAAM,OAAO,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC;IAEtC,MAAM,aAAa,GAA8B,IAAI,GAAG,EAAE,CAAC;IAC3D,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;QAC3B,MAAM,GAAG,GAAG,MAAM,CAAC,YAAY,CAAC;QAChC,MAAM,IAAI,GAAG,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC;QAE5B,IAAI,IAAI,KAAK,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,IAAI;YAC5C,IAAI,KAAK,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;YAE/C,SAAS;QACb,CAAC;QAED,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,CAAE,CAAC;QAElC,MAAM,YAAY,GAAG,cAAc,CAC/B,MAAM,EAAE,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,YAAY,EAAE,MAAM,CAAC,IAAI,EAAE,IAAI,CAC9D,CAAC;QACF,IAAI,CAAC,YAAY,EAAE,CAAC;YAChB,MAAM,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;YAC1B,MAAM,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAE/B,IAAI,MAAM,GAAG,aAAa,CAAC,WAAW,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YACjD,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAC,CAAC,CAAC,CAAC,CAAC;QACvB,CAAC;IACL,CAAC;IAED,KAAK,MAAM,CAAC,IAAI,EAAC,MAAM,CAAC,IAAI,aAAa,EAAE,CAAC;QACxC,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;YACzB,MAAM,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;YACnB,MAAM,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;YACnB,uEAAuE;YAEvE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YACf,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YACf,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QAC7B,CAAC;IACL,CAAC;AACL,CAAC;AAGD,SAAS,OAAO,CACR,MAAc;IAElB,MAAM,UAAU,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC;IACzC,MAAM,EAAE,YAAY,EAAE,GAAG,MAAM,CAAC;IAChC,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,YAAY,CAAC;IACpD,MAAM,QAAQ,GAAG,KAAK,CAAC,GAAG,CAAC;IAE3B,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;AACjE,CAAC;AAGD,OAAO,EAAE,aAAa,EAAE,CAAA"}
|
|
@@ -51,14 +51,20 @@ function add2Prong(meta, circle, pposSource, pposAntipode, isHoleClosing) {
|
|
|
51
51
|
function closeHole(meta, cpNodes) {
|
|
52
52
|
const { cpTrees } = meta;
|
|
53
53
|
const [cpNodeSource, cpNodeAntipode] = cpNodes;
|
|
54
|
+
// The twins form their own on-circle ring (a separate MAT vertex - that
|
|
55
|
+
// is what cuts the hole), so they get their own (equal) `Circle` object:
|
|
56
|
+
// one `Circle` object per ring.
|
|
57
|
+
const twinCircle = { ...cpNodeSource.pointOnShape.circle };
|
|
54
58
|
// Antipode - create and insert twin
|
|
55
59
|
const posAntipode = cpNodeAntipode.pointOnShape;
|
|
56
|
-
const cpNodeAntipodeTwin = insertCpNode(true, true, false, cpTrees.get(posAntipode.curve.loop), { ...posAntipode, order2: +1 }, cpNodeAntipode,
|
|
60
|
+
const cpNodeAntipodeTwin = insertCpNode(true, true, false, cpTrees.get(posAntipode.curve.loop), { ...posAntipode, circle: twinCircle, order2: +1 }, cpNodeAntipode, undefined, // unused
|
|
61
|
+
meta.lastInsertId);
|
|
57
62
|
cpNodeAntipodeTwin.holeCloserTwin = cpNodeAntipode;
|
|
58
63
|
cpNodeAntipode.holeCloserTwin = cpNodeAntipodeTwin;
|
|
59
64
|
// Source - create and insert twin
|
|
60
65
|
const posSource = cpNodeSource.pointOnShape;
|
|
61
|
-
const cpNodeSourceTwin = insertCpNode(true, true, false, cpTrees.get(posSource.curve.loop), { ...
|
|
66
|
+
const cpNodeSourceTwin = insertCpNode(true, true, false, cpTrees.get(posSource.curve.loop), { ...posSource, circle: twinCircle, order2: -1 }, cpNodeSource.prev, undefined, // unused
|
|
67
|
+
meta.lastInsertId);
|
|
62
68
|
cpNodeSourceTwin.holeCloserTwin = cpNodeSource;
|
|
63
69
|
cpNodeSource.holeCloserTwin = cpNodeSourceTwin;
|
|
64
70
|
// Connect graph
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-2-prong.js","sourceRoot":"","sources":["../../src/find-2-prong/add-2-prong.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAC;AACnE,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AACxE,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAG/D;;;;;;;;;;GAUG;AACH,SAAS,SAAS,CACV,IAAa,EACb,MAAc,EACd,UAA2B,EAC3B,YAA6B,EAC7B,aAAsB;IAE1B,UAAU,GAAG,UAAU,CAAC,CAAC,KAAK,CAAC;QAC3B,CAAC,CAAC,EAAE,GAAG,UAAU,EAAE,KAAK,EAAE,UAAU,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,EAAE;QACvD,CAAC,CAAC,UAAU,CAAC;IAEjB,MAAM,WAAW,GAAG,YAAY,CAAC,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAC5D,MAAM,aAAa,GAAG,YAAY,CAAC,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;IAEhE,MAAM,WAAW,GAAiB;QAC9B,GAAG,YAAY,EAAE,MAAM,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,EAAE,CAAC;KAC3D,CAAC;IACF,MAAM,SAAS,GAAiB;QAC5B,GAAG,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,EAAE,CAAC;KACvD,CAAA;IAED,uEAAuE;IACvE,mCAAmC;IACnC,IAAI,CAAC,CAAC,mBAAmB,CAAC,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;QACrE,OAAO,SAAS,CAAC;IACrB,CAAC;IACD,IAAI,CAAC,CAAC,mBAAmB,CAAC,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;QACzE,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,WAAW,CACtC,aAAa,EAAE,aAAa,EAAE,MAAM,EACpC,CAAC,WAAW,EAAE,aAAa,CAAC,EAC5B,IAAI,EACJ,CAAC,SAAS,EAAE,WAAW,CAAC,CAC3B,CAAC;IAEF,IAAI,SAAS,EAAE,CAAC;QACZ,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;YACrB,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;gBACvB,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;YAC/B,CAAC;QACL,CAAC,CAAC,CAAC;QACH,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,IAAI,aAAa,EAAE,CAAC;QAChB,SAAS,CAAC,IAAI,EAAE,OAAmB,CAAC,CAAC;IACzC,CAAC;IAED,OAAO,OAAO,CAAC,CAAC,CAAC,CAAC,CAAE,6BAA6B;AACrD,CAAC;AAGD,SAAS,SAAS,CACV,IAAa,EACb,OAAiB;IAErB,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;IAEzB,MAAM,CAAC,YAAY,EAAE,cAAc,CAAC,GAAG,OAA4B,CAAC;IAEpE,oCAAoC;IACpC,MAAM,WAAW,GAAG,cAAc,CAAC,YAAY,CAAC;IAChD,MAAM,kBAAkB,GAAG,YAAY,CACnC,IAAI,EAAE,IAAI,EAAE,KAAK,EACjB,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,CAAE,EACpC,EAAE,GAAG,WAAW,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE,
|
|
1
|
+
{"version":3,"file":"add-2-prong.js","sourceRoot":"","sources":["../../src/find-2-prong/add-2-prong.ts"],"names":[],"mappings":"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"}
|
|
@@ -65,10 +65,10 @@ export { calcSeperationTolerance };
|
|
|
65
65
|
// // return r*θ; // approximate arc with line
|
|
66
66
|
// }
|
|
67
67
|
// function degToRad(degrees: number) {
|
|
68
|
-
// return degrees/360*2*
|
|
68
|
+
// return degrees/360*2*PI;
|
|
69
69
|
// }
|
|
70
70
|
// function radToDeg(rad: number) {
|
|
71
|
-
// return rad*360/2/
|
|
71
|
+
// return rad*360/2/PI;
|
|
72
72
|
// }
|
|
73
73
|
// const R = 699;
|
|
74
74
|
// const r = 698;
|