flo-mat 4.0.1 → 4.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.
Files changed (132) hide show
  1. package/README.md +1 -1
  2. package/__tests__/find-2-prong/get-medial/get-closest-points.spec.ts +49 -0
  3. package/browser/index.js +1153 -1205
  4. package/browser/index.min.js +1 -1
  5. package/node/closest-boundary-point/foot-and-endpoint-info.d.ts +0 -3
  6. package/node/closest-boundary-point/get-close-boundary-points-certified.d.ts +1 -1
  7. package/node/closest-boundary-point/get-close-boundary-points-certified.js +2 -2
  8. package/node/closest-boundary-point/get-close-boundary-points-certified.js.map +1 -1
  9. package/node/closest-boundary-point/get-potential-closest-points-on-curve-certified.d.ts +1 -2
  10. package/node/closest-boundary-point/get-potential-closest-points-on-curve-certified.js +34 -24
  11. package/node/closest-boundary-point/get-potential-closest-points-on-curve-certified.js.map +1 -1
  12. package/node/closest-boundary-point/root-interval-to-distance-squared-interval.d.ts +1 -1
  13. package/node/closest-boundary-point/root-interval-to-distance-squared-interval.js +6 -9
  14. package/node/closest-boundary-point/root-interval-to-distance-squared-interval.js.map +1 -1
  15. package/node/cp-node/fs/insert-cp-node.d.ts +2 -2
  16. package/node/cp-node/fs/insert-cp-node.js.map +1 -1
  17. package/node/cp-node/fs/is-order-correct.d.ts +2 -2
  18. package/node/cp-node/fs/is-order-correct.js.map +1 -1
  19. package/node/cp-node/fs/traverse-cp.js.map +1 -1
  20. package/node/cp-node/fs/traverse-vertices.d.ts +1 -1
  21. package/node/cp-node/fs/traverse-vertices.js.map +1 -1
  22. package/node/debug/functions/draw-elem/draw-branch.d.ts +1 -1
  23. package/node/debug/functions/draw-elem/draw-branch.js.map +1 -1
  24. package/node/debug/functions/draw-elem/draw-cp-node.d.ts +1 -1
  25. package/node/debug/functions/draw-elem/draw-cp-node.js +2 -2
  26. package/node/debug/functions/draw-elem/draw-cp-node.js.map +1 -1
  27. package/node/debug/functions/draw-elem/draw-leaves.d.ts +1 -1
  28. package/node/debug/functions/draw-elem/draw-leaves.js +2 -2
  29. package/node/debug/functions/draw-elem/draw-leaves.js.map +1 -1
  30. package/node/debug/functions/draw-elem/draw-mat.d.ts +1 -1
  31. package/node/debug/functions/draw-elem/draw-mat.js +1 -2
  32. package/node/debug/functions/draw-elem/draw-mat.js.map +1 -1
  33. package/node/debug/functions/draw-elem/draw-min-y.d.ts +1 -1
  34. package/node/debug/functions/draw-elem/draw-min-y.js.map +1 -1
  35. package/node/debug/functions/draw-elem/draw-three-prong.d.ts +1 -1
  36. package/node/debug/functions/draw-elem/draw-three-prong.js +2 -2
  37. package/node/debug/functions/draw-elem/draw-three-prong.js.map +1 -1
  38. package/node/debug/functions/draw-elem/draw-vertex.d.ts +1 -1
  39. package/node/debug/functions/draw-elem/draw-vertex.js +0 -2
  40. package/node/debug/functions/draw-elem/draw-vertex.js.map +1 -1
  41. package/node/error-analysis/gamma.d.ts +32 -0
  42. package/node/error-analysis/gamma.js +39 -0
  43. package/node/error-analysis/gamma.js.map +1 -0
  44. package/node/find-2-prong/find-2-prong.js +5 -5
  45. package/node/find-2-prong/find-2-prong.js.map +1 -1
  46. package/node/find-2-prong/get-medial/get-closest-points.js +27 -23
  47. package/node/find-2-prong/get-medial/get-closest-points.js.map +1 -1
  48. package/node/find-3-prong/calc-better-x.d.ts +1 -1
  49. package/node/find-3-prong/calc-better-x.js +6 -4
  50. package/node/find-3-prong/calc-better-x.js.map +1 -1
  51. package/node/find-3-prong/calc-initial-3-prong-center.d.ts +1 -1
  52. package/node/find-3-prong/calc-initial-3-prong-center.js +4 -3
  53. package/node/find-3-prong/calc-initial-3-prong-center.js.map +1 -1
  54. package/node/find-3-prong/find-3-prong-for-delta3s.js +22 -5
  55. package/node/find-3-prong/find-3-prong-for-delta3s.js.map +1 -1
  56. package/node/find-3-prong/find-and-add-3-prong.d.ts +2 -2
  57. package/node/find-3-prong/find-and-add-3-prong.js +15 -0
  58. package/node/find-3-prong/find-and-add-3-prong.js.map +1 -1
  59. package/node/find-3-prong/find-and-add-3-prongs-on-loop.js +8 -21
  60. package/node/find-3-prong/find-and-add-3-prongs-on-loop.js.map +1 -1
  61. package/node/find-3-prong/find-and-add-3-prongs.d.ts +1 -4
  62. package/node/find-3-prong/find-and-add-3-prongs.js +1 -2
  63. package/node/find-3-prong/find-and-add-3-prongs.js.map +1 -1
  64. package/node/find-3-prong/get-closest-points.d.ts +1 -1
  65. package/node/find-3-prong/get-closest-points.js +2 -2
  66. package/node/find-3-prong/get-closest-points.js.map +1 -1
  67. package/node/find-3-prong/timed-cc.d.ts +3 -0
  68. package/node/find-3-prong/timed-cc.js +5 -0
  69. package/node/find-3-prong/timed-cc.js.map +1 -0
  70. package/node/find-mat/create-initial-cp-tree.d.ts +2 -2
  71. package/node/find-mat/create-initial-cp-tree.js +2 -2
  72. package/node/find-mat/create-initial-cp-tree.js.map +1 -1
  73. package/node/find-mat/find-mat.d.ts +4 -4
  74. package/node/find-mat/find-mat.js.map +1 -1
  75. package/node/find-mat/find-mats.js +2 -2
  76. package/node/find-mat/find-mats.js.map +1 -1
  77. package/node/find-mat/get-meta.d.ts +2 -2
  78. package/node/find-mat/get-meta.js +1 -0
  79. package/node/find-mat/get-meta.js.map +1 -1
  80. package/node/index.d.ts +1 -0
  81. package/node/index.js +1 -0
  82. package/node/index.js.map +1 -1
  83. package/node/mat/create-new-cp-trees.d.ts +2 -2
  84. package/node/mat/create-new-cp-trees.js +2 -2
  85. package/node/mat/create-new-cp-trees.js.map +1 -1
  86. package/node/mat/get-cp-node-to-left-or-same.d.ts +2 -2
  87. package/node/mat/get-cp-node-to-left-or-same.js +2 -1
  88. package/node/mat/get-cp-node-to-left-or-same.js.map +1 -1
  89. package/node/mat/mat-meta.d.ts +2 -2
  90. package/node/point-on-shape/get-osculating-circle.js +2 -1
  91. package/node/point-on-shape/get-osculating-circle.js.map +1 -1
  92. package/package.json +5 -6
  93. package/src/closest-boundary-point/foot-and-endpoint-info.ts +0 -3
  94. package/src/closest-boundary-point/get-close-boundary-points-certified.ts +0 -2
  95. package/src/closest-boundary-point/get-potential-closest-points-on-curve-certified.ts +41 -27
  96. package/src/closest-boundary-point/root-interval-to-distance-squared-interval.ts +5 -10
  97. package/src/cp-node/fs/insert-cp-node.ts +2 -2
  98. package/src/cp-node/fs/is-order-correct.ts +2 -2
  99. package/src/cp-node/fs/traverse-cp.ts +1 -1
  100. package/src/cp-node/fs/traverse-vertices.ts +1 -2
  101. package/src/debug/functions/check-ordering.ts +0 -1
  102. package/src/debug/functions/draw-elem/draw-branch.ts +1 -3
  103. package/src/debug/functions/draw-elem/draw-cp-node.ts +3 -4
  104. package/src/debug/functions/draw-elem/draw-leaves.ts +3 -3
  105. package/src/debug/functions/draw-elem/draw-mat.ts +2 -5
  106. package/src/debug/functions/draw-elem/draw-min-y.ts +2 -2
  107. package/src/debug/functions/draw-elem/draw-three-prong.ts +3 -3
  108. package/src/debug/functions/draw-elem/draw-vertex.ts +1 -4
  109. package/src/error-analysis/gamma.ts +9 -2
  110. package/src/find-2-prong/find-2-prong.ts +7 -6
  111. package/src/find-2-prong/get-medial/get-closest-points.ts +24 -26
  112. package/src/find-3-prong/calc-better-x.ts +7 -4
  113. package/src/find-3-prong/calc-initial-3-prong-center.ts +2 -3
  114. package/src/find-3-prong/find-3-prong-for-delta3s.ts +23 -5
  115. package/src/find-3-prong/find-and-add-3-prong.ts +18 -4
  116. package/src/find-3-prong/find-and-add-3-prongs-on-loop.ts +7 -23
  117. package/src/find-3-prong/find-and-add-3-prongs.ts +5 -3
  118. package/src/find-3-prong/get-closest-points.ts +0 -2
  119. package/src/find-3-prong/timed-cc.ts +9 -0
  120. package/src/find-mat/create-initial-cp-tree.ts +3 -3
  121. package/src/find-mat/find-mat.ts +5 -6
  122. package/src/find-mat/find-mats.ts +4 -2
  123. package/src/find-mat/get-meta.ts +3 -3
  124. package/src/index.ts +2 -1
  125. package/src/mat/create-new-cp-trees.ts +3 -3
  126. package/src/mat/get-cp-node-to-left-or-same.ts +4 -3
  127. package/src/mat/mat-meta.ts +2 -2
  128. package/src/point-on-shape/get-osculating-circle.ts +2 -1
  129. package/wallaby.mjs +1 -0
  130. package/node/closest-boundary-point/get-p-from-box.d.ts +0 -3
  131. package/node/closest-boundary-point/get-p-from-box.js +0 -11
  132. package/node/closest-boundary-point/get-p-from-box.js.map +0 -1
@@ -1,6 +1,6 @@
1
1
  import { lengthSquared } from "flo-vector2d";
2
- import { roots, deflate, Horner } from 'flo-poly';
3
- import { evalDeCasteljau, getMedialPointCoeffs, getMedialPointCoeffsBez0 } from 'flo-bezier3';
2
+ import { roots, Horner } from 'flo-poly';
3
+ import { evalDeCasteljau, getMedialPointCoeffs, getMedialPointCoeffsBez0, getMedialPointCoeffsBez2_SameCurve, getMedialPointCoeffsBez3_SameCurve } from 'flo-bezier3';
4
4
  const { sqrt, abs, max } = Math;
5
5
  /**
6
6
  * @param maxCoordPowerOf2
@@ -16,23 +16,21 @@ function getClosestPoint(maxCoordPowerOf2, nnorm, yPos, for1Prong, angle, curveP
16
16
  const { curve, ts: [tS, tE] } = curvePiece;
17
17
  const { ps } = curve;
18
18
  const { curve: touchedCurve, t, p: y } = yPos;
19
- const shouldDeflate = angle === 0 && curve === touchedCurve;
19
+ const isTouched = curve === touchedCurve;
20
+ const shouldDeflate = angle === 0 && isTouched;
20
21
  const infos = [];
21
- // let onePushed = false;
22
22
  let startPushed = false;
23
23
  let endPushed = false;
24
24
  let ss;
25
- if (tS !== tE) {
26
- const { A, B, C, D, H } = getMedialPointCoeffs(y, nnorm, ps);
27
- const def = shouldDeflate ? deflate(H, t) : undefined;
28
- const def2 = for1Prong && shouldDeflate
29
- ? deflate(def, t)
30
- : undefined;
31
- const def3 = for1Prong && shouldDeflate
32
- ? deflate(def2, t)
33
- : undefined;
34
- const pDd = def3 ?? def ?? H;
35
- ss = roots(pDd, tS, tE) || [];
25
+ if (tS !== tE &&
26
+ !(shouldDeflate && ps.length === 2) &&
27
+ !(isTouched && ps.length === 3 && for1Prong)) {
28
+ const { A, B, H } = shouldDeflate
29
+ ? ps.length === 3
30
+ ? getMedialPointCoeffsBez2_SameCurve(t, nnorm, ps)
31
+ : getMedialPointCoeffsBez3_SameCurve(t, nnorm, ps)
32
+ : getMedialPointCoeffs(y, nnorm, ps);
33
+ ss = roots(H, tS, tE) || [];
36
34
  //-----------------------
37
35
  for (let i = 0; i < ss.length; i++) {
38
36
  const ri = ss[i];
@@ -43,20 +41,26 @@ function getClosestPoint(maxCoordPowerOf2, nnorm, yPos, for1Prong, angle, curveP
43
41
  if (sE < tS || sS > tE) {
44
42
  continue;
45
43
  } // outside curve piece
46
- const s = _s < 0 ? 0 : _s > 1 ? 1 : _s; // clip to [0,1]
44
+ if (sS < 0) {
45
+ continue;
46
+ } // outside curve piece
47
+ // clip to [0,1]
48
+ const s = sE > 1 ? 1 : _s;
47
49
  //-----------------------
48
50
  const AS = Horner(A, s);
49
51
  const BS = Horner(B, s);
50
- const CS = Horner(C, s);
51
- const DS = Horner(D, s);
52
+ // const CS = Horner(C, s);
53
+ // const DS = Horner(D, s);
52
54
  const _AS = abs(AS);
53
- const _CS = abs(CS);
54
- if (max(_AS, _CS) < 2 ** -40) {
55
+ // const _CS = abs(CS);
56
+ // if (max(_AS, _CS) < 2**-40) { continue; }
57
+ if (max(_AS) < 2 ** -40) {
55
58
  continue;
56
59
  }
57
- const w = _AS > _CS
58
- ? -BS / AS
59
- : -DS / CS; // alternative
60
+ // const w = _AS > _CS
61
+ // ? -BS / AS
62
+ // : -DS / CS; // alternative
63
+ const w = -BS / AS;
60
64
  if (w <= 0) {
61
65
  // If `w` is negative the circle radius is negative -> discard
62
66
  continue;
@@ -1 +1 @@
1
- {"version":3,"file":"get-closest-points.js","sourceRoot":"","sources":["../../../src/find-2-prong/get-medial/get-closest-points.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"get-closest-points.js","sourceRoot":"","sources":["../../../src/find-2-prong/get-medial/get-closest-points.ts"],"names":[],"mappings":"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"}
@@ -14,7 +14,7 @@ import type { CurvePiece } from '../mat/curve-piece.js';
14
14
  *
15
15
  * @internal
16
16
  */
17
- declare function calcBetterX(maxCoordPowerOf2: number, curvePiece3s: CurvePiece[][], x: number[], vectorToZeroV: number[]): {
17
+ declare function calcBetterX(curvePiece3s: CurvePiece[][], x: number[], vectorToZeroV: number[]): {
18
18
  newX: number[];
19
19
  newV: number;
20
20
  newPoss: PrePointOnShape[];
@@ -1,5 +1,7 @@
1
- import { fromTo, circumCenter, len, scale, translate } from 'flo-vector2d';
2
- import { getClosestPoints } from './get-closest-points.js';
1
+ // import { fromTo, circumCenter, len, scale, translate } from 'flo-vector2d';
2
+ import { fromTo, len, scale, translate } from 'flo-vector2d';
3
+ import { circumCenter } from './timed-cc.js'; // TODO - testing - restore
4
+ import { getCloseBoundaryPointsCertified } from '../closest-boundary-point/get-close-boundary-points-certified.js';
3
5
  /**
4
6
  * Find new `x` and `ps` that are better estimates of the 3-prong circle.
5
7
  *
@@ -14,7 +16,7 @@ import { getClosestPoints } from './get-closest-points.js';
14
16
  *
15
17
  * @internal
16
18
  */
17
- function calcBetterX(maxCoordPowerOf2, curvePiece3s, x, vectorToZeroV) {
19
+ function calcBetterX(curvePiece3s, x, vectorToZeroV) {
18
20
  const V = len(vectorToZeroV);
19
21
  let nu = 1;
20
22
  let better;
@@ -25,7 +27,7 @@ function calcBetterX(maxCoordPowerOf2, curvePiece3s, x, vectorToZeroV) {
25
27
  do {
26
28
  const shift = scale(vectorToZeroV, nu);
27
29
  newX = translate(shift, x);
28
- newPoss = getClosestPoints(maxCoordPowerOf2, newX, curvePiece3s);
30
+ newPoss = curvePiece3s.map(curvePieces => getCloseBoundaryPointsCertified(curvePieces, x)[0]);
29
31
  // Point of zero V
30
32
  const newCircleCenter = circumCenter(newPoss.map(pos => pos.p));
31
33
  const newVectorToZeroV = fromTo(newX, newCircleCenter);
@@ -1 +1 @@
1
- {"version":3,"file":"calc-better-x.js","sourceRoot":"","sources":["../../src/find-3-prong/calc-better-x.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC3E,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAG3D;;;;;;;;;;;;;GAaG;AACH,SAAS,WAAW,CACZ,gBAAwB,EACxB,YAA4B,EAC5B,CAAW,EACX,aAAuB;IAM3B,MAAM,CAAC,GAAG,GAAG,CAAC,aAAa,CAAC,CAAC;IAE7B,IAAI,EAAE,GAAG,CAAC,CAAC;IACX,IAAI,MAAM,CAAC;IACX,IAAI,IAAI,CAAC;IACT,IAAI,OAA0B,CAAC;IAC/B,IAAI,IAAI,CAAC;IACT,IAAI,CAAC,GAAG,CAAC,CAAC,CAAE,YAAY;IACxB,GAAG,CAAC;QACA,MAAM,KAAK,GAAG,KAAK,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC;QACvC,IAAI,GAAG,SAAS,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QAE3B,OAAO,GAAG,gBAAgB,CAAC,gBAAgB,EAAE,IAAI,EAAE,YAAY,CAAC,CAAC;QAEjE,kBAAkB;QAClB,MAAM,eAAe,GAAG,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAI,CAAC,CAAC,CAAC,CAAC,CAAC;QACjE,MAAM,gBAAgB,GAAG,MAAM,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;QACvD,IAAI,GAAG,GAAG,CAAC,gBAAgB,CAAC,CAAC;QAE7B,MAAM,GAAG,IAAI,GAAG,CAAC,CAAC;QAElB,EAAE,GAAG,EAAE,GAAC,CAAC,CAAC;QAEV,CAAC,EAAE,CAAC;IACR,CAAC,QAAQ,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,EAAE;IAE3B,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,CAAA;AAClC,CAAC;AAGD,OAAO,EAAE,WAAW,EAAE,CAAA"}
1
+ {"version":3,"file":"calc-better-x.js","sourceRoot":"","sources":["../../src/find-3-prong/calc-better-x.ts"],"names":[],"mappings":"AAEA,8EAA8E;AAC9E,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC,CAAE,2BAA2B;AAC1E,OAAO,EAAE,+BAA+B,EAAE,MAAM,kEAAkE,CAAC;AAGnH;;;;;;;;;;;;;GAaG;AACH,SAAS,WAAW,CACZ,YAA4B,EAC5B,CAAW,EACX,aAAuB;IAM3B,MAAM,CAAC,GAAG,GAAG,CAAC,aAAa,CAAC,CAAC;IAE7B,IAAI,EAAE,GAAG,CAAC,CAAC;IACX,IAAI,MAAM,CAAC;IACX,IAAI,IAAI,CAAC;IACT,IAAI,OAA0B,CAAC;IAC/B,IAAI,IAAI,CAAC;IACT,IAAI,CAAC,GAAG,CAAC,CAAC,CAAE,YAAY;IACxB,GAAG,CAAC;QACA,MAAM,KAAK,GAAG,KAAK,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC;QACvC,IAAI,GAAG,SAAS,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QAE3B,OAAO,GAAG,YAAY,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,CACrC,+BAA+B,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CACrD,CAAC;QAEF,kBAAkB;QAClB,MAAM,eAAe,GAAG,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAI,CAAC,CAAC,CAAC,CAAC,CAAC;QACjE,MAAM,gBAAgB,GAAG,MAAM,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;QACvD,IAAI,GAAG,GAAG,CAAC,gBAAgB,CAAC,CAAC;QAE7B,MAAM,GAAG,IAAI,GAAG,CAAC,CAAC;QAElB,EAAE,GAAG,EAAE,GAAC,CAAC,CAAC;QAEV,CAAC,EAAE,CAAC;IACR,CAAC,QAAQ,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,EAAE;IAE3B,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,CAAA;AAClC,CAAC;AAGD,OAAO,EAAE,WAAW,EAAE,CAAA"}
@@ -11,5 +11,5 @@ import type { CurvePiece } from '../mat/curve-piece.js';
11
11
  *
12
12
  * @internal
13
13
  */
14
- declare function calcInitial3ProngCenter(maxCoordPowerOf2: number, δ3s: CpNode[][], curvePiece3s: CurvePiece[][]): number[];
14
+ declare function calcInitial3ProngCenter(δ3s: CpNode[][], curvePiece3s: CurvePiece[][]): number[];
15
15
  export { calcInitial3ProngCenter };
@@ -1,4 +1,5 @@
1
- import { circumCenter } from 'flo-vector2d';
1
+ // import { circumCenter } from 'flo-vector2d';
2
+ import { circumCenter } from './timed-cc.js'; // TODO - testing - restore
2
3
  import { getCloseBoundaryPointsCertified } from '../closest-boundary-point/get-close-boundary-points-certified.js';
3
4
  /**
4
5
  * Finds an initial 3-prong circle center point from which to iterate. The point
@@ -11,10 +12,10 @@ import { getCloseBoundaryPointsCertified } from '../closest-boundary-point/get-c
11
12
  *
12
13
  * @internal
13
14
  */
14
- function calcInitial3ProngCenter(maxCoordPowerOf2, δ3s, curvePiece3s) {
15
+ function calcInitial3ProngCenter(δ3s, curvePiece3s) {
15
16
  const circle = δ3s[0][0].pointOnShape.circle;
16
17
  const twoProngCircleCenter = circle.center;
17
- const pos = getCloseBoundaryPointsCertified(maxCoordPowerOf2, curvePiece3s[1], twoProngCircleCenter)[0];
18
+ const pos = getCloseBoundaryPointsCertified(curvePiece3s[1], twoProngCircleCenter)[0];
18
19
  const meanPoints = [
19
20
  δ3s[0][0].pointOnShape.p,
20
21
  pos.p,
@@ -1 +1 @@
1
- {"version":3,"file":"calc-initial-3-prong-center.js","sourceRoot":"","sources":["../../src/find-3-prong/calc-initial-3-prong-center.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,EAAE,+BAA+B,EAAE,MAAM,kEAAkE,CAAC;AAGnH;;;;;;;;;;GAUG;AACH,SAAS,uBAAuB,CACxB,gBAAwB,EACxB,GAAe,EACf,YAA4B;IAEhC,MAAM,MAAM,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,MAAM,CAAC;IAC7C,MAAM,oBAAoB,GAAG,MAAM,CAAC,MAAM,CAAC;IAE3C,MAAM,GAAG,GAAG,+BAA+B,CACvC,gBAAgB,EAChB,YAAY,CAAC,CAAC,CAAC,EACf,oBAAoB,CACvB,CAAC,CAAC,CAAC,CAAC;IAEL,MAAM,UAAU,GAAG;QACf,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC;QACxB,GAAG,CAAC,CAAC;QACL,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC;KAC3B,CAAC;IAEF,OAAO,YAAY,CAAC,UAAU,CAAC,CAAC;AACpC,CAAC;AAGD,OAAO,EAAE,uBAAuB,EAAE,CAAA"}
1
+ {"version":3,"file":"calc-initial-3-prong-center.js","sourceRoot":"","sources":["../../src/find-3-prong/calc-initial-3-prong-center.ts"],"names":[],"mappings":"AAEA,+CAA+C;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC,CAAE,2BAA2B;AAC1E,OAAO,EAAE,+BAA+B,EAAE,MAAM,kEAAkE,CAAC;AAGnH;;;;;;;;;;GAUG;AACH,SAAS,uBAAuB,CACxB,GAAe,EACf,YAA4B;IAEhC,MAAM,MAAM,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,MAAM,CAAC;IAC7C,MAAM,oBAAoB,GAAG,MAAM,CAAC,MAAM,CAAC;IAE3C,MAAM,GAAG,GAAG,+BAA+B,CACvC,YAAY,CAAC,CAAC,CAAC,EACf,oBAAoB,CACvB,CAAC,CAAC,CAAC,CAAC;IAEL,MAAM,UAAU,GAAG;QACf,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC;QACxB,GAAG,CAAC,CAAC;QACL,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC;KAC3B,CAAC;IAEF,OAAO,YAAY,CAAC,UAAU,CAAC,CAAC;AACpC,CAAC;AAGD,OAAO,EAAE,uBAAuB,EAAE,CAAA"}
@@ -1,4 +1,6 @@
1
- import { fromTo, circumCenter as getCircumCenter, len, distanceBetween, toUnitVector, rotate90Degrees, cross } from 'flo-vector2d';
1
+ // import { fromTo, circumCenter as getCircumCenter, len, distanceBetween, toUnitVector, rotate90Degrees, cross } from 'flo-vector2d';
2
+ import { fromTo, len, distanceBetween, toUnitVector, rotate90Degrees, cross } from 'flo-vector2d';
3
+ import { circumCenter as getCircumCenter } from './timed-cc.js'; // TODO - testing - restore
2
4
  import { tangent } from 'flo-bezier3';
3
5
  import { calcInitial3ProngCenter } from './calc-initial-3-prong-center.js';
4
6
  import { getClosestPoints } from './get-closest-points.js';
@@ -48,13 +50,28 @@ function find3ProngForDelta3s(δs, idx, k, curvePiecess, maxCoordPowerOf2) {
48
50
  if (isSharp(δ3s[0][0])) {
49
51
  return undefined;
50
52
  }
53
+ // TODO
54
+ //----------------------------
55
+ // const l1 = curvePiece3s[0].length;
56
+ // const l2 = curvePiece3s[1].length;
57
+ // const l3 = curvePiece3s[2].length;
58
+ // if (l1 === 1 && l2 == 1 && l3 === 1) {
59
+ // // console.log('aaa');
60
+ // const A = curvePiece3s[0][0].curve.ps;
61
+ // const B = curvePiece3s[1][0].curve.ps;
62
+ // const C = curvePiece3s[2][0].curve.ps;
63
+ // console.log(A.length, B.length, C.length);
64
+ // } else {
65
+ // // console.log('bbb');
66
+ // }
67
+ //----------------------------
51
68
  let poss = undefined;
52
69
  let j = 0; // Safeguard for slow convergence
53
- let x = calcInitial3ProngCenter(maxCoordPowerOf2, δ3s, curvePiece3s);
70
+ let x = calcInitial3ProngCenter(δ3s, curvePiece3s);
54
71
  let tolerance = Infinity;
55
72
  while (tolerance > TOLERANCE && j < MAX_ITERATIONS) {
56
73
  j++;
57
- poss = getClosestPoints(maxCoordPowerOf2, x, curvePiece3s);
74
+ poss = getClosestPoints(x, curvePiece3s);
58
75
  if (!Number.isFinite(x[0]) || !Number.isFinite(x[1])) {
59
76
  // FUTURE - the code can be cleaned up and sped up a lot if we don't
60
77
  // use this function as is but instead use δs[0] and δs[2] as is
@@ -71,7 +88,7 @@ function find3ProngForDelta3s(δs, idx, k, curvePiecess, maxCoordPowerOf2) {
71
88
  // loop. This check, for instance, would be eliminated completely.
72
89
  return undefined;
73
90
  }
74
- const upds = calcBetterX(maxCoordPowerOf2, curvePiece3s, x, vectorToZeroV);
91
+ const upds = calcBetterX(curvePiece3s, x, vectorToZeroV);
75
92
  x = upds.newX;
76
93
  poss = upds.newPoss;
77
94
  const V = len(vectorToZeroV); // The 'potential'
@@ -133,7 +150,7 @@ function find3ProngForDelta3s(δs, idx, k, curvePiecess, maxCoordPowerOf2) {
133
150
  //-------------------------------------------------------------------------
134
151
  const closestDs = [];
135
152
  for (let i = 0; i < curvePiecess.length; i++) {
136
- const pos = getCloseBoundaryPointsCertified(maxCoordPowerOf2, curvePiecess[i], x)[0];
153
+ const pos = getCloseBoundaryPointsCertified(curvePiecess[i], x)[0];
137
154
  closestDs.push(distanceBetween(pos.p, x));
138
155
  }
139
156
  const closestD = min(...closestDs);
@@ -1 +1 @@
1
- {"version":3,"file":"find-3-prong-for-delta3s.js","sourceRoot":"","sources":["../../src/find-3-prong/find-3-prong-for-delta3s.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"find-3-prong-for-delta3s.js","sourceRoot":"","sources":["../../src/find-3-prong/find-3-prong-for-delta3s.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,5 @@
1
- import { CpNode } from '../cp-node/cp-node.js';
2
- import { MatMeta } from '../mat/mat-meta.js';
1
+ import type { CpNode } from '../cp-node/cp-node.js';
2
+ import type { MatMeta } from '../mat/mat-meta.js';
3
3
  /**
4
4
  * @internal
5
5
  * Finds and add a 3-prong MAT circle to the given shape.
@@ -3,6 +3,7 @@ import { find3Prong } from './find-3-prong.js';
3
3
  import { addToCpTree } from '../mat/add-to-cp-tree.js';
4
4
  import { getCloseByCpIfExist } from '../mat/get-closeby-cp-if-exist.js';
5
5
  import { getProngCount } from '../cp-node/fs/get-prong-count.js';
6
+ let ii = 0;
6
7
  /**
7
8
  * @internal
8
9
  * Finds and add a 3-prong MAT circle to the given shape.
@@ -16,6 +17,20 @@ function findAndAdd3Prong(meta, visitedCps) {
16
17
  for (const visitedCp of visitedCps) {
17
18
  δs.push([visitedCp, visitedCp.next]);
18
19
  }
20
+ // TODO - remove - debugging
21
+ //-------------------------
22
+ // ii++;
23
+ // if (ii === 13) {
24
+ // //@ts-ignore
25
+ // if (_debug_.temp === undefined) { _debug_.temp = []; }
26
+ // //@ts-ignore
27
+ // _debug_.temp.push(δs);
28
+ // }
29
+ // //@ts-ignore
30
+ // if (_debug_.temp2 === undefined) { _debug_.temp2 = []; }
31
+ // //@ts-ignore
32
+ // _debug_.temp2.push(δs.length);
33
+ //-------------------------
19
34
  const threeProngInfo = find3Prong(δs, meta.maxCoordPowerOf2);
20
35
  const { circle, poss, δ3s } = threeProngInfo;
21
36
  const orders = [];
@@ -1 +1 @@
1
- {"version":3,"file":"find-and-add-3-prong.js","sourceRoot":"","sources":["../../src/find-3-prong/find-and-add-3-prong.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAC;AACnE,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAE/C,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AAGxE,OAAO,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AAGjE;;;;;;;GAOG;AACH,SAAS,gBAAgB,CACjB,IAAa,EACb,UAAoB;IAExB,MAAM,EAAE,GAAuB,EAAE,CAAC;IAClC,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;QACjC,EAAE,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;IACzC,CAAC;IAED,MAAM,cAAc,GAAG,UAAU,CAAC,EAAE,EAAE,IAAI,CAAC,gBAAgB,CAAC,CAAC;IAE7D,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,cAAc,CAAC;IAE7C,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,KAAK,IAAI,CAAC,GAAC,CAAC,EAAE,CAAC,GAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;QACrB,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACtD,CAAC;IAED,MAAM,iBAAiB,GAAa,EAAE,CAAC;IACvC,KAAK,IAAI,CAAC,GAAC,CAAC,EAAE,CAAC,GAAC,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAC/B,MAAM,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;QACpB,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;QACxB,MAAM,OAAO,GAAG,mBAAmB,CAAC,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QACpE,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;YACxB,MAAM,UAAU,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC;YAC1C,IAAI,UAAU,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC;gBAC5C,iBAAiB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACpC,CAAC;QACL,CAAC;IACL,CAAC;IAED,MAAM,OAAO,GAAG,iBAAiB,CAAC,MAAM,KAAK,CAAC;QAC1C,CAAC,CAAC,WAAW,CACT,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAC9D,CAAC,OAAO;QACT,CAAC,CAAC,EAAE,CAAC;IAET,OAAO,EAAE,iBAAiB,EAAE,OAAO,EAAE,OAAmB,EAAE,CAAC;AAC/D,CAAC;AAGD,OAAO,EAAE,gBAAgB,EAAE,CAAA"}
1
+ {"version":3,"file":"find-and-add-3-prong.js","sourceRoot":"","sources":["../../src/find-3-prong/find-and-add-3-prong.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAC;AACnE,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AACxE,OAAO,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AAGjE,IAAI,EAAE,GAAG,CAAC,CAAC;AACX;;;;;;;GAOG;AACH,SAAS,gBAAgB,CACjB,IAAa,EACb,UAAoB;IAExB,MAAM,EAAE,GAAuB,EAAE,CAAC;IAClC,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;QACjC,EAAE,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;IACzC,CAAC;IAED,4BAA4B;IAC5B,2BAA2B;IAC3B,QAAQ;IACR,mBAAmB;IACnB,mBAAmB;IACnB,6DAA6D;IAC7D,mBAAmB;IACnB,6BAA6B;IAC7B,IAAI;IACJ,eAAe;IACf,2DAA2D;IAC3D,eAAe;IACf,iCAAiC;IACjC,2BAA2B;IAE3B,MAAM,cAAc,GAAG,UAAU,CAAC,EAAE,EAAE,IAAI,CAAC,gBAAgB,CAAC,CAAC;IAE7D,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,cAAc,CAAC;IAE7C,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,KAAK,IAAI,CAAC,GAAC,CAAC,EAAE,CAAC,GAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;QACrB,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACtD,CAAC;IAED,MAAM,iBAAiB,GAAa,EAAE,CAAC;IACvC,KAAK,IAAI,CAAC,GAAC,CAAC,EAAE,CAAC,GAAC,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAC/B,MAAM,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;QACpB,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;QACxB,MAAM,OAAO,GAAG,mBAAmB,CAAC,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QACpE,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;YACxB,MAAM,UAAU,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC;YAC1C,IAAI,UAAU,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC;gBAC5C,iBAAiB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACpC,CAAC;QACL,CAAC;IACL,CAAC;IAED,MAAM,OAAO,GAAG,iBAAiB,CAAC,MAAM,KAAK,CAAC;QAC1C,CAAC,CAAC,WAAW,CACT,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAC9D,CAAC,OAAO;QACT,CAAC,CAAC,EAAE,CAAC;IAET,OAAO,EAAE,iBAAiB,EAAE,OAAO,EAAE,OAAmB,EAAE,CAAC;AAC/D,CAAC;AAGD,OAAO,EAAE,gBAAgB,EAAE,CAAA"}
@@ -1,9 +1,6 @@
1
1
  import { findAndAdd3Prongs } from './find-and-add-3-prongs.js';
2
2
  import { getAllOnLoop } from '../cp-node/fs/get-all-on-loop.js';
3
3
  import { removeVertex } from '../vertex/remove-vertex.js';
4
- // import { LlRbTree } from 'flo-ll-rb-tree';
5
- // import { Loop } from 'flo-boolean';
6
- // import { drawFs } from 'flo-draw';
7
4
  import { getAllOnCircle } from '../cp-node/fs/get-all-on-circle.js';
8
5
  /**
9
6
  * @internal
@@ -37,7 +34,7 @@ function findAndAdd3ProngsOnLoop(meta, cpStart) {
37
34
  }
38
35
  cpStart = getFirstItemOfSet(cpNodeGoodSet);
39
36
  }
40
- return getFirstItemOfSet(cpNodeGoodSet);
37
+ return cpStart;
41
38
  }
42
39
  // From https://stackoverflow.com/a/73281564/2010061
43
40
  function getFirstItemOfSet(set) {
@@ -46,23 +43,13 @@ function getFirstItemOfSet(set) {
46
43
  }
47
44
  return undefined;
48
45
  }
49
- // Unfortunately O(n) until Javascript gives us the simple ability to
50
- // retrieve the first or last item of a set
51
- function getLastItemOfSet(set) {
52
- let item;
53
- for (item of set) { }
54
- return item;
55
- }
56
- function replaceCloseBys(
57
- // cpTrees: Map<Loop,LlRbTree<CpNode>>,
58
- meta, closeBysFor3Prong, cpNodeSet, cpNodeGoodSet) {
59
- for (const closeBy of [closeBysFor3Prong[0]]) {
60
- getAllOnCircle(closeBy).forEach(v => {
61
- cpNodeSet.delete(v);
62
- cpNodeGoodSet.delete(v);
63
- });
64
- removeVertex(closeBy, meta);
65
- }
46
+ function replaceCloseBys(meta, closeBysFor3Prong, cpNodeSet, cpNodeGoodSet) {
47
+ const closeBy = closeBysFor3Prong[0];
48
+ getAllOnCircle(closeBy).forEach(v => {
49
+ cpNodeSet.delete(v);
50
+ cpNodeGoodSet.delete(v);
51
+ });
52
+ removeVertex(closeBy, meta);
66
53
  }
67
54
  export { findAndAdd3ProngsOnLoop };
68
55
  //# sourceMappingURL=find-and-add-3-prongs-on-loop.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"find-and-add-3-prongs-on-loop.js","sourceRoot":"","sources":["../../src/find-3-prong/find-and-add-3-prongs-on-loop.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,6CAA6C;AAC7C,sCAAsC;AACtC,qCAAqC;AACrC,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AAGpE;;;;;;IAMI;AACJ,SAAS,uBAAuB,CACxB,IAAa,EACb,OAA2B;IAE/B,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;QAAC,OAAO,SAAU,CAAC;IAAC,CAAC;IAEjD,MAAM,aAAa,GAAG,IAAI,GAAG,EAAU,CAAC;IACxC,IAAI,MAAM,GAAG,IAAI,CAAC;IAClB,OAAO,MAAM,EAAE,CAAC;QACZ,MAAM,GAAG,KAAK,CAAC;QACf,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC;QACjD,KAAK,MAAM,MAAM,IAAI,SAAS,EAAE,CAAC;YAE7B,MAAM,EAAE,iBAAiB,EAAE,YAAY,EAAE,GACrC,iBAAiB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;YAEpC,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAAC,MAAM,GAAG,IAAI,CAAC;YAAC,CAAC;YAE/C,IAAI,iBAAiB,KAAK,SAAS,EAAE,CAAC;gBAClC,aAAa,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YAC9B,CAAC;iBAAM,CAAC;gBACJ,MAAM,GAAG,IAAI,CAAC;gBACd,eAAe,CAAC,IAAI,EAAE,iBAAiB,EAAE,SAAS,EAAE,aAAa,CAAC,CAAC;YACvE,CAAC;YAED,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,aAAa,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QAC1F,CAAC;QACD,OAAO,GAAG,iBAAiB,CAAC,aAAa,CAAE,CAAC;IAChD,CAAC;IAED,OAAO,iBAAiB,CAAC,aAAa,CAAC,CAAC;AAC5C,CAAC;AAGD,oDAAoD;AACpD,SAAS,iBAAiB,CAAI,GAAW;IACrC,KAAK,MAAM,IAAI,IAAI,GAAG,EAAE,CAAC;QACpB,OAAO,IAAI,CAAC;IACjB,CAAC;IAED,OAAO,SAAS,CAAC;AACrB,CAAC;AAGD,qEAAqE;AACrE,2CAA2C;AAC3C,SAAS,gBAAgB,CAAI,GAAW;IACpC,IAAI,IAAI,CAAC;IACT,KAAK,IAAI,IAAI,GAAG,EAAE,CAAC,CAAA,CAAC;IAEpB,OAAO,IAAI,CAAC;AAChB,CAAC;AAGD,SAAS,eAAe;AAChB,uCAAuC;AACvC,IAAa,EACb,iBAA2B,EAC3B,SAAsB,EACtB,aAA0B;IAE9B,KAAK,MAAM,OAAO,IAAI,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC3C,cAAc,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;YAChC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;YACpB,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QAC5B,CAAC,CAAC,CAAC;QACH,YAAY,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAChC,CAAC;AACL,CAAC;AAGD,OAAO,EAAE,uBAAuB,EAAE,CAAA"}
1
+ {"version":3,"file":"find-and-add-3-prongs-on-loop.js","sourceRoot":"","sources":["../../src/find-3-prong/find-and-add-3-prongs-on-loop.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AAGpE;;;;;;IAMI;AACJ,SAAS,uBAAuB,CACxB,IAAa,EACb,OAA2B;IAE/B,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;QAAC,OAAO,SAAU,CAAC;IAAC,CAAC;IAEjD,MAAM,aAAa,GAAG,IAAI,GAAG,EAAU,CAAC;IACxC,IAAI,MAAM,GAAG,IAAI,CAAC;IAClB,OAAO,MAAM,EAAE,CAAC;QACZ,MAAM,GAAG,KAAK,CAAC;QACf,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC;QACjD,KAAK,MAAM,MAAM,IAAI,SAAS,EAAE,CAAC;YAC7B,MAAM,EAAE,iBAAiB,EAAE,YAAY,EAAE,GACrC,iBAAiB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;YAEpC,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAAC,MAAM,GAAG,IAAI,CAAC;YAAC,CAAC;YAE/C,IAAI,iBAAiB,KAAK,SAAS,EAAE,CAAC;gBAClC,aAAa,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YAC9B,CAAC;iBAAM,CAAC;gBACJ,MAAM,GAAG,IAAI,CAAC;gBACd,eAAe,CAAC,IAAI,EAAE,iBAAiB,EAAE,SAAS,EAAE,aAAa,CAAC,CAAC;YACvE,CAAC;YAED,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,aAAa,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QAC1F,CAAC;QACD,OAAO,GAAG,iBAAiB,CAAC,aAAa,CAAE,CAAC;IAChD,CAAC;IAED,OAAO,OAAO,CAAC;AACnB,CAAC;AAGD,oDAAoD;AACpD,SAAS,iBAAiB,CAAI,GAAW;IACrC,KAAK,MAAM,IAAI,IAAI,GAAG,EAAE,CAAC;QACpB,OAAO,IAAI,CAAC;IACjB,CAAC;IAED,OAAO,SAAS,CAAC;AACrB,CAAC;AAGD,SAAS,eAAe,CAChB,IAAa,EACb,iBAA2B,EAC3B,SAAsB,EACtB,aAA0B;IAE9B,MAAM,OAAO,GAAG,iBAAiB,CAAC,CAAC,CAAC,CAAC;IACrC,cAAc,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;QAChC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QACpB,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IAC5B,CAAC,CAAC,CAAC;IACH,YAAY,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;AAChC,CAAC;AAGD,OAAO,EAAE,uBAAuB,EAAE,CAAA"}
@@ -15,10 +15,7 @@ import { MatMeta } from '../mat/mat-meta.js';
15
15
  * @internal
16
16
  */
17
17
  declare function findAndAdd3Prongs(meta: MatMeta, cpStart: CpNode): {
18
- closeBysFor3Prong: CpNode[];
19
- addedCpNodes: CpNode[][];
20
- } | {
21
- closeBysFor3Prong: undefined;
18
+ closeBysFor3Prong: CpNode[] | undefined;
22
19
  addedCpNodes: CpNode[][];
23
20
  };
24
21
  export { findAndAdd3Prongs };
@@ -21,7 +21,6 @@ function findAndAdd3Prongs(meta, cpStart) {
21
21
  return { closeBysFor3Prong: undefined, addedCpNodes: [] };
22
22
  }
23
23
  const addedCpNodes = [];
24
- let closeBysFor3Prong = undefined;
25
24
  do {
26
25
  if (cpStart === undefined) {
27
26
  continue;
@@ -41,7 +40,7 @@ function findAndAdd3Prongs(meta, cpStart) {
41
40
  }
42
41
  }
43
42
  } while (true);
44
- return { closeBysFor3Prong, addedCpNodes };
43
+ return { closeBysFor3Prong: undefined, addedCpNodes };
45
44
  }
46
45
  export { findAndAdd3Prongs };
47
46
  //# sourceMappingURL=find-and-add-3-prongs.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"find-and-add-3-prongs.js","sourceRoot":"","sources":["../../src/find-3-prong/find-and-add-3-prongs.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAE1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,0CAA0C,CAAC;AAC5E,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAG7D,IAAI,EAAE,GAAG,CAAC,CAAC;AACX;;;;;;;;;;;;;GAaG;AACH,SAAS,iBAAiB,CAClB,IAAa,EACb,OAAe;IAEnB,IAAI,gBAAgB,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC;QACzC,OAAO,EAAE,iBAAiB,EAAE,SAAS,EAAE,YAAY,EAAE,EAAE,EAAE,CAAC;IAC9D,CAAC;IAED,MAAM,YAAY,GAAe,EAAE,CAAC;IACpC,IAAI,iBAAiB,GAAyB,SAAS,CAAC;IACxD,GAAG,CAAC;QACA,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;YAAC,SAAS;QAAC,CAAC;QACxC,MAAM,UAAU,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC;QAEvC,IAAI,UAAU,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;YAAC,MAAM;QAAC,CAAC;QAEtC,MAAM,EAAE,iBAAiB,EAAE,OAAO,EAAE,GAAG,gBAAgB,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QAE1E,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC3B,IAAI,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC/B,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAAE,CAAC;QAC/C,CAAC;QAED,IAAI,OAAO,OAAO,KAAK,WAAW,EAAE,CAAC;YACjC,IAAI,EAAE,EAAE,KAAK,OAAO,CAAC,UAAU,CAAC,uBAAuB,EAAE,CAAC;gBACtD,OAAO,SAAU,CAAC;YACtB,CAAC;QACL,CAAC;IACL,CAAC,QAAQ,IAAI,EAAE;IAEf,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAAE,CAAC;AAC/C,CAAC;AAGD,OAAO,EAAE,iBAAiB,EAAE,CAAA"}
1
+ {"version":3,"file":"find-and-add-3-prongs.js","sourceRoot":"","sources":["../../src/find-3-prong/find-and-add-3-prongs.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAE1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,0CAA0C,CAAC;AAC5E,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAG7D,IAAI,EAAE,GAAG,CAAC,CAAC;AACX;;;;;;;;;;;;;GAaG;AACH,SAAS,iBAAiB,CAClB,IAAa,EACb,OAAe;IAKnB,IAAI,gBAAgB,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC;QACzC,OAAO,EAAE,iBAAiB,EAAE,SAAS,EAAE,YAAY,EAAE,EAAE,EAAE,CAAC;IAC9D,CAAC;IAED,MAAM,YAAY,GAAe,EAAE,CAAC;IACpC,GAAG,CAAC;QACA,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;YAAC,SAAS;QAAC,CAAC;QACxC,MAAM,UAAU,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC;QAEvC,IAAI,UAAU,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;YAAC,MAAM;QAAC,CAAC;QAEtC,MAAM,EAAE,iBAAiB,EAAE,OAAO,EAAE,GAAG,gBAAgB,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QAE1E,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC3B,IAAI,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC/B,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAAE,CAAC;QAC/C,CAAC;QAED,IAAI,OAAO,OAAO,KAAK,WAAW,EAAE,CAAC;YACjC,IAAI,EAAE,EAAE,KAAK,OAAO,CAAC,UAAU,CAAC,uBAAuB,EAAE,CAAC;gBACtD,OAAO,SAAU,CAAC;YACtB,CAAC;QACL,CAAC;IACL,CAAC,QAAQ,IAAI,EAAE;IAEf,OAAO,EAAE,iBAAiB,EAAE,SAAS,EAAE,YAAY,EAAE,CAAC;AAC1D,CAAC;AAGD,OAAO,EAAE,iBAAiB,EAAE,CAAA"}
@@ -6,5 +6,5 @@ import type { CurvePiece } from '../mat/curve-piece.js';
6
6
  *
7
7
  * @internal
8
8
  */
9
- declare function getClosestPoints(maxCoordPowerOf2: number, x: number[], curvePiece3s: CurvePiece[][]): import("../point-on-shape/point-on-shape.js").PrePointOnShape[];
9
+ declare function getClosestPoints(x: number[], curvePiece3s: CurvePiece[][]): import("../point-on-shape/point-on-shape.js").PrePointOnShape[];
10
10
  export { getClosestPoints };
@@ -6,9 +6,9 @@ import { getCloseBoundaryPointsCertified } from '../closest-boundary-point/get-c
6
6
  *
7
7
  * @internal
8
8
  */
9
- function getClosestPoints(maxCoordPowerOf2, x, curvePiece3s) {
9
+ function getClosestPoints(x, curvePiece3s) {
10
10
  return curvePiece3s.map(curvePieces => {
11
- return getCloseBoundaryPointsCertified(maxCoordPowerOf2, curvePieces, x)[0];
11
+ return getCloseBoundaryPointsCertified(curvePieces, x)[0];
12
12
  });
13
13
  }
14
14
  export { getClosestPoints };
@@ -1 +1 @@
1
- {"version":3,"file":"get-closest-points.js","sourceRoot":"","sources":["../../src/find-3-prong/get-closest-points.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,+BAA+B,EAAE,MAAM,kEAAkE,CAAC;AAGnH;;;;;;GAMG;AACH,SAAS,gBAAgB,CACjB,gBAAwB,EACxB,CAAW,EACX,YAA4B;IAEhC,OAAO,YAAY,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE;QAClC,OAAO,+BAA+B,CAClC,gBAAgB,EAChB,WAAW,EACX,CAAC,CACJ,CAAC,CAAC,CAAC,CAAC;IACT,CAAC,CAAC,CAAC;AACP,CAAC;AAGD,OAAO,EAAE,gBAAgB,EAAE,CAAA"}
1
+ {"version":3,"file":"get-closest-points.js","sourceRoot":"","sources":["../../src/find-3-prong/get-closest-points.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,+BAA+B,EAAE,MAAM,kEAAkE,CAAC;AAGnH;;;;;;GAMG;AACH,SAAS,gBAAgB,CACjB,CAAW,EACX,YAA4B;IAEhC,OAAO,YAAY,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE;QAClC,OAAO,+BAA+B,CAClC,WAAW,EACX,CAAC,CACJ,CAAC,CAAC,CAAC,CAAC;IACT,CAAC,CAAC,CAAC;AACP,CAAC;AAGD,OAAO,EAAE,gBAAgB,EAAE,CAAA"}
@@ -0,0 +1,3 @@
1
+ import { circumCenter } from 'flo-vector2d';
2
+ declare const timeCircumCenter: typeof circumCenter;
3
+ export { timeCircumCenter as circumCenter };
@@ -0,0 +1,5 @@
1
+ import { circumCenter } from 'flo-vector2d';
2
+ // const timeCircumCenter = timeFunctionCalls(circumCenter);
3
+ const timeCircumCenter = circumCenter;
4
+ export { timeCircumCenter as circumCenter };
5
+ //# sourceMappingURL=timed-cc.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"timed-cc.js","sourceRoot":"","sources":["../../src/find-3-prong/timed-cc.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAI5C,4DAA4D;AAC5D,MAAM,gBAAgB,GAAG,YAAY,CAAC;AAGtC,OAAO,EAAE,gBAAgB,IAAI,YAAY,EAAE,CAAA"}
@@ -1,7 +1,7 @@
1
1
  import type { Loop } from 'flo-boolean';
2
2
  import type { CpNode } from '../cp-node/cp-node.js';
3
3
  import type { PrePointOnShape } from '../point-on-shape/point-on-shape.js';
4
- import { LlRbTree } from 'flo-ll-rb-tree';
4
+ import { RbTree } from 'flo-ll-rb-tree';
5
5
  /**
6
6
  * Creates the initial ContactPoint loops from the given sharp corners.
7
7
  *
@@ -16,5 +16,5 @@ import { LlRbTree } from 'flo-ll-rb-tree';
16
16
  */
17
17
  declare function createInitialCpTree(loops: Loop[], sharpCornerss: PrePointOnShape[][], lastInsertId: {
18
18
  id: number;
19
- }): Map<Loop, LlRbTree<CpNode>>;
19
+ }): Map<Loop, RbTree<CpNode>>;
20
20
  export { createInitialCpTree };
@@ -1,4 +1,4 @@
1
- import { LlRbTree } from 'flo-ll-rb-tree';
1
+ import { RbTree } from 'flo-ll-rb-tree';
2
2
  import { insertCpNode } from '../cp-node/fs/insert-cp-node.js';
3
3
  import { cpNodeComparator } from '../cp-node/fs/cp-node-comparator.js';
4
4
  /**
@@ -16,7 +16,7 @@ import { cpNodeComparator } from '../cp-node/fs/cp-node-comparator.js';
16
16
  function createInitialCpTree(loops, sharpCornerss, lastInsertId) {
17
17
  const cpTrees = new Map();
18
18
  for (let k = 0; k < sharpCornerss.length; k++) {
19
- const cpTree = new LlRbTree(cpNodeComparator, false);
19
+ const cpTree = new RbTree(cpNodeComparator);
20
20
  cpTrees.set(loops[k], cpTree);
21
21
  const sharpCorners = sharpCornerss[k];
22
22
  let cpNode1 = undefined;
@@ -1 +1 @@
1
- {"version":3,"file":"create-initial-cp-tree.js","sourceRoot":"","sources":["../../src/find-mat/create-initial-cp-tree.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AAGvE;;;;;;;;;;;GAWG;AACH,SAAS,mBAAmB,CACpB,KAAa,EACb,aAAkC,EAClC,YAA4B;IAEhC,MAAM,OAAO,GAAgC,IAAI,GAAG,EAAE,CAAC;IAEvD,KAAK,IAAI,CAAC,GAAC,CAAC,EAAE,CAAC,GAAC,aAAa,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACxC,MAAM,MAAM,GAAG,IAAI,QAAQ,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAC;QACrD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;QAE9B,MAAM,YAAY,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC;QAEtC,IAAI,OAAO,GAAgC,SAAS,CAAC;QACrD,IAAI,OAAO,GAAgC,SAAS,CAAC;QACrD,KAAK,MAAM,IAAI,IAAI,YAAY,EAAE,CAAC;YAC9B,MAAM,MAAM,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC;YAC7C,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;YAEvB,MAAM,IAAI,GAAiB,EAAE,GAAG,IAAI,EAAE,KAAK,EAAc,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC;YAC9F,MAAM,IAAI,GAAiB,EAAE,GAAG,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC;YAE9F,OAAO,GAAG,YAAY,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,YAAY,CAAE,CAAC;YACjF,OAAO,GAAG,YAAY,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,YAAY,CAAE,CAAC;YAEjF,OAAO,CAAC,YAAY,GAAG,OAAO,CAAC;YAC/B,OAAO,CAAC,YAAY,GAAG,OAAO,CAAC;YAC/B,OAAO,CAAC,YAAY,GAAG,OAAO,CAAC;YAC/B,OAAO,CAAC,YAAY,GAAG,OAAO,CAAC;QACnC,CAAC;IACL,CAAC;IAED,OAAO,OAAO,CAAC;AACnB,CAAC;AAGD,OAAO,EAAE,mBAAmB,EAAE,CAAA"}
1
+ {"version":3,"file":"create-initial-cp-tree.js","sourceRoot":"","sources":["../../src/find-mat/create-initial-cp-tree.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACxC,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AAGvE;;;;;;;;;;;GAWG;AACH,SAAS,mBAAmB,CACpB,KAAa,EACb,aAAkC,EAClC,YAA4B;IAEhC,MAAM,OAAO,GAA8B,IAAI,GAAG,EAAE,CAAC;IAErD,KAAK,IAAI,CAAC,GAAC,CAAC,EAAE,CAAC,GAAC,aAAa,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACxC,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,gBAAgB,CAAC,CAAC;QAC5C,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;QAE9B,MAAM,YAAY,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC;QAEtC,IAAI,OAAO,GAAgC,SAAS,CAAC;QACrD,IAAI,OAAO,GAAgC,SAAS,CAAC;QACrD,KAAK,MAAM,IAAI,IAAI,YAAY,EAAE,CAAC;YAC9B,MAAM,MAAM,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC;YAC7C,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;YAEvB,MAAM,IAAI,GAAiB,EAAE,GAAG,IAAI,EAAE,KAAK,EAAc,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC;YAC9F,MAAM,IAAI,GAAiB,EAAE,GAAG,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC;YAE9F,OAAO,GAAG,YAAY,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,YAAY,CAAE,CAAC;YACjF,OAAO,GAAG,YAAY,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,YAAY,CAAE,CAAC;YAEjF,OAAO,CAAC,YAAY,GAAG,OAAO,CAAC;YAC/B,OAAO,CAAC,YAAY,GAAG,OAAO,CAAC;YAC/B,OAAO,CAAC,YAAY,GAAG,OAAO,CAAC;YAC/B,OAAO,CAAC,YAAY,GAAG,OAAO,CAAC;QACnC,CAAC;IACL,CAAC;IAED,OAAO,OAAO,CAAC;AACnB,CAAC;AAGD,OAAO,EAAE,mBAAmB,EAAE,CAAA"}
@@ -1,7 +1,7 @@
1
- import { CpNode } from '../cp-node/cp-node.js';
2
- import { Loop } from 'flo-boolean';
3
- import { MatOptions } from './mat-options.js';
4
- import { MatMeta } from '../mat/mat-meta.js';
1
+ import type { CpNode } from '../cp-node/cp-node.js';
2
+ import type { Loop } from 'flo-boolean';
3
+ import type { MatOptions } from './mat-options.js';
4
+ import type { MatMeta } from '../mat/mat-meta.js';
5
5
  /**
6
6
  * @internal
7
7
  * Find the MAT of the given loops.
@@ -1 +1 @@
1
- {"version":3,"file":"find-mat.js","sourceRoot":"","sources":["../../src/find-mat/find-mat.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"find-mat.js","sourceRoot":"","sources":["../../src/find-mat/find-mat.ts"],"names":[],"mappings":"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"}
@@ -55,8 +55,8 @@ function findMats(bezierLoops, options) {
55
55
  }
56
56
  mats.push(mat);
57
57
  }
58
- // console.log(structuredClone(find3Prong.getStats()));
59
- // find3Prong.resetStats();
58
+ // console.log(structuredClone(circumCenter.getStats()));
59
+ // circumCenter.resetStats();
60
60
  return mats;
61
61
  }
62
62
  /**
@@ -1 +1 @@
1
- {"version":3,"file":"find-mats.js","sourceRoot":"","sources":["../../src/find-mat/find-mats.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAEhE,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,OAAO,EAAG,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,iBAAiB,EAAc,MAAM,kBAAkB,CAAC;AAEjE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC;AAG5B;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,SAAS,QAAQ,CACT,WAA2B,EAC3B,OAAoB;IAExB,+EAA+E;IAC/E,MAAM,EAAE,aAAa,EAAE,GAAG,eAAe,CAAC,WAAW,CAAC,CAAC;IACvD,MAAM,gBAAgB,GAAG,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC;IAEnD,MAAM,QAAQ,GAAyB,WAAW,CAC9C,gBAAgB,EAAE;QAClB,GAAG,iBAAiB;QACpB,GAAG,CAAC,OAAO,IAAI,EAAE,CAAC;KACrB,CAAC,CAAC;IAEH,MAAM,EACF,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,iBAAiB,EAC9B,GAAG,QAAQ,CAAC;IAGb,MAAM,MAAM,GAAG,aAAa,CAAC,WAAW,EAAE,SAAS,EAAE,EAAE,wBAAwB,EAAE,IAAI,EAAE,CAAC,CAAC;IAEzF,+CAA+C;IAE/C,MAAM,IAAI,GAAU,EAAE,CAAC;IACvB,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QACzB,IAAI,GAAG,GAAG,OAAO,CAAC,KAAK,EAAE,gBAAgB,EAAE,QAAQ,CAAC,CAAC;QACrD,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;YAAC,SAAS;QAAC,CAAC;QAEpC,IAAI,QAAQ,EAAE,CAAC;YACX,GAAG,GAAG,WAAW,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QACrC,CAAC;QAED,IAAI,QAAQ,EAAE,CAAC;YACX,GAAG,GAAG,WAAW,CAAC,GAAG,EAAE,iBAAiB,EAAE,EAAE,CAAC,CAAA;QACjD,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACnB,CAAC;IAED,uDAAuD;IACvD,2BAA2B;IAE3B,OAAO,IAAI,CAAC;AAChB,CAAC;AAID;;;;GAIG;AACH,SAAS,iBAAiB,CAClB,KAAqB;IAEzB,IAAI,GAAG,GAAG,EAAE,CAAC;IACb,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACvB,GAAG,GAAG,GAAG,GAAG,mBAAmB,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IACjD,CAAC;IAED,OAAO,GAAG,CAAC;AACf,CAAC;AAGD,OAAO,EAAE,QAAQ,EAAE,CAAA"}
1
+ {"version":3,"file":"find-mats.js","sourceRoot":"","sources":["../../src/find-mat/find-mats.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAEhE,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,OAAO,EAAG,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,iBAAiB,EAAc,MAAM,kBAAkB,CAAC;AAIjE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC;AAG5B;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,SAAS,QAAQ,CACT,WAA2B,EAC3B,OAAoB;IAExB,+EAA+E;IAC/E,MAAM,EAAE,aAAa,EAAE,GAAG,eAAe,CAAC,WAAW,CAAC,CAAC;IACvD,MAAM,gBAAgB,GAAG,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC;IAEnD,MAAM,QAAQ,GAAyB,WAAW,CAC9C,gBAAgB,EAAE;QAClB,GAAG,iBAAiB;QACpB,GAAG,CAAC,OAAO,IAAI,EAAE,CAAC;KACrB,CAAC,CAAC;IAEH,MAAM,EACF,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,iBAAiB,EAC9B,GAAG,QAAQ,CAAC;IAGb,MAAM,MAAM,GAAG,aAAa,CAAC,WAAW,EAAE,SAAS,EAAE,EAAE,wBAAwB,EAAE,IAAI,EAAE,CAAC,CAAC;IAEzF,+CAA+C;IAE/C,MAAM,IAAI,GAAU,EAAE,CAAC;IACvB,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QACzB,IAAI,GAAG,GAAG,OAAO,CAAC,KAAK,EAAE,gBAAgB,EAAE,QAAQ,CAAC,CAAC;QACrD,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;YAAC,SAAS;QAAC,CAAC;QAEpC,IAAI,QAAQ,EAAE,CAAC;YACX,GAAG,GAAG,WAAW,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QACrC,CAAC;QAED,IAAI,QAAQ,EAAE,CAAC;YACX,GAAG,GAAG,WAAW,CAAC,GAAG,EAAE,iBAAiB,EAAE,EAAE,CAAC,CAAA;QACjD,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACnB,CAAC;IAED,yDAAyD;IACzD,6BAA6B;IAE7B,OAAO,IAAI,CAAC;AAChB,CAAC;AAID;;;;GAIG;AACH,SAAS,iBAAiB,CAClB,KAAqB;IAEzB,IAAI,GAAG,GAAG,EAAE,CAAC;IACb,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACvB,GAAG,GAAG,GAAG,GAAG,mBAAmB,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IACjD,CAAC;IAED,OAAO,GAAG,CAAC;AACf,CAAC;AAGD,OAAO,EAAE,QAAQ,EAAE,CAAA"}
@@ -2,9 +2,9 @@ import type { Loop } from 'flo-boolean';
2
2
  import type { CpNode } from '../cp-node/cp-node.js';
3
3
  import type { TriMap } from '../utils/tri-map.js';
4
4
  import type { MatMeta } from '../mat/mat-meta.js';
5
- import { LlRbTree } from 'flo-ll-rb-tree';
5
+ import { RbTree } from 'flo-ll-rb-tree';
6
6
  /** @internal */
7
- declare function getPointToCpNode(loops: Loop[], cpTrees: Map<Loop, LlRbTree<CpNode>>): TriMap<Loop, number, number, CpNode>;
7
+ declare function getPointToCpNode(loops: Loop[], cpTrees: Map<Loop, RbTree<CpNode>>): TriMap<Loop, number, number, CpNode>;
8
8
  /** @internal */
9
9
  declare function getPartialMeta(loops: Loop[]): Omit<MatMeta, 'cpTrees' | 'loops' | 'maxCoordPowerOf2' | 'squaredDiagonalLength' | 'lastInsertId'>;
10
10
  /** @internal */
@@ -1,3 +1,4 @@
1
+ // import { TriMapFs } from '../utils/tri-map.js';
1
2
  import { getBoundingHull, getBoundingBoxTight } from 'flo-bezier3';
2
3
  import { getBoundingBox$ } from '../geometry/get-bounding-box-.js';
3
4
  import { getCorner } from '../corner/get-corner.js';