fix(geom-splines): fix seg count in cubicFromArc(), minor optimizations

thi-ng · Jul 30, 2019 · e289ade · e289ade
1 parent 0e751b5
commit e289ade
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/packages/geom-splines/src/cubic-arc.ts b/packages/geom-splines/src/cubic-arc.ts
@@ -47,15 +47,15 @@ export const cubicFromArc = (
     };
 
     const res: Vec[][] = [];
-    const n = Math.max(roundEps(Math.abs(delta) / HALF_PI, 1e-3), 1);
+    const n = Math.ceil(roundEps(Math.abs(delta) / HALF_PI, 1e-3));
     const d = delta / n;
     const t = (8 / 6) * Math.tan(0.25 * d);
     if (!isFinite(t)) {
         return [cubicFromLine(p, q)];
     }
-    for (let i = n, theta = start; i > 0; i--, theta += d) {
-        const [s1, c1] = sincos(theta);
-        const [s2, c2] = sincos(theta + d);
+    for (let i = n, theta = start, sc = sincos(theta); i > 0; i--, theta += d) {
+        const [s1, c1] = sc;
+        const [s2, c2] = (sc = sincos(theta + d));
         res.push([
             mapP(c1, s1),
             mapP(c1 - s1 * t, s1 + c1 * t),