@itwin/core-geometry 5.3.0-dev.4 → 5.3.0-dev.6

package/lib/esm/curve/internalContexts/CurveCurveIntersectXY.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CurveCurveIntersectXY.d.ts","sourceRoot":"","sources":["../../../../src/curve/internalContexts/CurveCurveIntersectXY.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,cAAc,EAAsB,MAAM,4BAA4B,CAAC;AAChF,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAGhE,OAAO,EAAE,8BAA8B,EAAE,MAAM,kCAAkC,CAAC;AAOlF,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAMrD,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACjC,OAAO,EAAE,2BAA2B,EAAE,MAAM,gCAAgC,CAAC;AAE7E,OAAO,EAA0C,uBAAuB,EAAE,MAAM,wBAAwB,CAAC;AACzG,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAM/C;;;;;GAKG;AACH,qBAAa,qBAAsB,SAAQ,8BAA8B;IACvE,OAAO,CAAC,SAAS,CAAU;IAC3B,OAAO,CAAC,SAAS,CAAU;IAC3B,OAAO,CAAC,UAAU,CAAuB;IACzC,OAAO,CAAC,SAAS,CAAU;IAC3B,OAAO,CAAC,SAAS,CAAU;IAC3B,OAAO,CAAC,QAAQ,CAA4B;IAC5C,OAAO,CAAC,wBAAwB,CAAuB;IACvD,OAAO,CAAC,mBAAmB,CAAwB;IACnD,OAAO,CAAC,0BAA0B,CAA0B;IAC5D,OAAO,CAAC,MAAM,CAAC,aAAa,CAAoB;IAChD,OAAO,CAAC,MAAM,CAAC,aAAa,CAAoB;IAChD,OAAO,CAAC,MAAM,CAAC,aAAa,CAAoB;IAChD,OAAO,CAAC,MAAM,CAAC,aAAa,CAAoB;IAChD,OAAO,CAAC,MAAM,CAAC,aAAa,CAAoB;IAChD,OAAO,CAAC,MAAM,CAAC,aAAa,CAAoB;IAChD,OAAO,CAAC,MAAM,CAAC,aAAa,CAAoB;IAChD,OAAO,CAAC,MAAM,CAAC,aAAa,CAAoB;IAChD,OAAO,CAAC,MAAM,CAAC,YAAY,CAAoB;IAC/C,OAAO,CAAC,MAAM,CAAC,YAAY,CAAoB;IAC/C,OAAO,CAAC,MAAM,CAAC,YAAY,CAAoB;IAC/C,OAAO,CAAC,MAAM,CAAC,YAAY,CAAoB;IAC/C,OAAO,CAAC,OAAO,CAAC,CAAU;IAC1B,OAAO,CAAC,OAAO,CAAC,CAAU;IAC1B,OAAO,CAAC,UAAU,CAAC,CAAU;IAC7B,OAAO,CAAC,MAAM,CAAC,CAAU;IACzB;;;;;;;OAOG;gBAED,YAAY,EAAE,QAAQ,GAAG,SAAS,EAClC,OAAO,EAAE,OAAO,EAChB,SAAS,EAAE,QAAQ,GAAG,SAAS,EAC/B,OAAO,EAAE,OAAO,EAChB,SAAS,GAAE,MAAqC;IAkBlD,wGAAwG;IACjG,aAAa,CAAC,SAAS,EAAE,QAAQ,GAAG,IAAI;IAG/C,iFAAiF;IACjF,OAAO,CAAC,cAAc;IAQtB,yFAAyF;IACzF,OAAO,CAAC,oBAAoB;IAc5B;;;OAGG;IACI,iBAAiB,CAAC,YAAY,GAAE,OAAe,GAAG,uBAAuB,EAAE;IAMlF;;;;;;;;;;;;OAYG;IACH,OAAO,CAAC,6BAA6B;IA4DrC;;;;;;OAMG;IACI,WAAW,CAChB,GAAG,EAAE,cAAc,EAAE,GAAG,EAAE,cAAc,EAAE,KAAK,EAAE,uBAAuB,EAAE,GAAG,SAAS,EAAE,QAAQ,EAAE,OAAO,GACxG,IAAI;IASP,0GAA0G;IAC1G,OAAO,CAAC,uBAAuB;IAsC/B;;;OAGG;IACH,OAAO,CAAC,wBAAwB;IAyChC,OAAO,CAAC,sBAAsB;IA4C9B,OAAO,CAAC,kBAAkB;IA6F1B;;;;OAIG;IACH,OAAO,CAAC,uBAAuB;IAkC/B;;;;;;;OAOG;IACH,OAAO,CAAC,cAAc;IAwCtB,OAAO,CAAC,yBAAyB;IA0EjC,8EAA8E;IAC9E,OAAO,CAAC,gBAAgB;IAOxB,OAAO,CAAC,SAAS;IAQjB,OAAO,CAAC,+BAA+B;IA6FvC,OAAO,CAAC,oCAAoC;IAgC5C;;;;OAIG;IACH,OAAO,CAAC,YAAY;IAOpB,OAAO,CAAC,kBAAkB;IAiB1B,OAAO,CAAC,2BAA2B;IAmCnC,0EAA0E;IACnE,8BAA8B,CACnC,GAAG,EAAE,YAAY,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,EACvD,MAAM,EAAE,cAAc,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,GAC9E,GAAG;IAoBN,8DAA8D;IACvD,wBAAwB,CAC7B,GAAG,EAAE,aAAa,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,EACxD,GAAG,EAAE,YAAY,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,EACvD,QAAQ,EAAE,OAAO,GAChB,GAAG;IAwBN,0DAA0D;IACnD,oBAAoB,CACzB,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,EACjD,GAAG,EAAE,YAAY,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,EACvD,QAAQ,EAAE,OAAO,GAChB,GAAG;IAqBN,iEAAiE;IACjE,OAAO,CAAC,2BAA2B;IAiCnC,OAAO,CAAC,MAAM,CAAC,wBAAwB;IAQvC;;;OAGG;IACH,OAAO,CAAC,uBAAuB;IAyB/B;;;OAGG;IACH,OAAO,CAAC,mCAAmC;IAe3C;;;OAGG;IACa,cAAc,CAAC,CAAC,EAAE,aAAa,GAAG,GAAG;IAqBrD,0DAA0D;IAC1C,mBAAmB,CAAC,QAAQ,EAAE,aAAa,GAAG,GAAG;IA6BjE,6DAA6D;IAC7C,kBAAkB,CAAC,GAAG,EAAE,YAAY,GAAG,GAAG;IAuB1D,sDAAsD;IACtC,WAAW,CAAC,IAAI,EAAE,KAAK,GAAG,GAAG;IAuB7C,gEAAgE;IAChD,oBAAoB,CAAC,KAAK,EAAE,cAAc,GAAG,GAAG;IAsBhE,8EAA8E;IAC9D,iCAAiC,CAAC,KAAK,EAAE,2BAA2B,GAAG,GAAG;IAK1F,4EAA4E;IAC5D,qBAAqB,CAAC,MAAM,EAAE,eAAe,GAAG,GAAG;CAgBpE"}
+{"version":3,"file":"CurveCurveIntersectXY.d.ts","sourceRoot":"","sources":["../../../../src/curve/internalContexts/CurveCurveIntersectXY.ts"],"names":[],"mappings":"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"}

package/lib/esm/curve/internalContexts/CurveCurveIntersectXY.js

@@ -262,7 +262,9 @@ export class CurveCurveIntersectXY extends RecurseToCurvesGeometryHandler {
     // The fraction and extend parameters allow all combinations to be passed in.
     dispatchSegmentArc(cpA, extendA0, pointA0, fractionA0, pointA1, fractionA1, extendA1, arc, extendB0, extendB1, reversed) {
         const tol2 = this._coincidentGeometryContext.tolerance * this._coincidentGeometryContext.tolerance;
-        let dist2;
+        const cosines = new GrowableFloat64Array(2);
+        const sines = new GrowableFloat64Array(2);
+        const radians = new GrowableFloat64Array(2);
         // Arc: X = C + cU + sV
         // Line:  contains points A0,A1
         // Arc point colinear with line if det (A0, A1, X) = 0
@@ -282,27 +284,30 @@ export class CurveCurveIntersectXY extends RecurseToCurvesGeometryHandler {
             const alpha = Geometry.tripleProductPoint4dXYW(pointA0H, pointA1H, data.center);
             const beta = Geometry.tripleProductPoint4dXYW(pointA0H, pointA1H, data.vector0);
             const gamma = Geometry.tripleProductPoint4dXYW(pointA0H, pointA1H, data.vector90);
-            const cosines = new GrowableFloat64Array(2);
-            const sines = new GrowableFloat64Array(2);
-            const radians = new GrowableFloat64Array(2);
-            const numRoots = AnalyticRoots.appendImplicitLineUnitCircleIntersections(alpha, beta, gamma, cosines, sines, radians);
-            if (numRoots <= 0)
-                return;
+            let numRoots = AnalyticRoots.appendImplicitLineUnitCircleIntersections(alpha, beta, gamma, cosines, sines, radians);
+            const closeApproach = (0 === numRoots);
+            if (closeApproach)
+                numRoots = 1; // we returned the arc's closest approach as the first "root"; if within tolerance and at endpoints, we record it
+            const acceptSolution = (iRoot, checkOnlyEndPointDistance = false) => {
+                const arcPoint = data.center.plus2Scaled(data.vector0, cosines.atUncheckedIndex(iRoot), data.vector90, sines.atUncheckedIndex(iRoot));
+                let fArc = data.sweep.radiansToSignedFraction(radians.atUncheckedIndex(iRoot), extendB0);
+                let fLine = SmallSystem.lineSegment3dHXYClosestPointUnbounded(pointA0H, pointA1H, arcPoint);
+                if (fLine === undefined)
+                    return undefined;
+                if (!checkOnlyEndPointDistance && this.acceptFraction(extendA0, fLine, extendA1) && this.acceptFraction(extendB0, fArc, extendB1))
+                    return { fLine, fArc };
+                // check for an endpoint intersection that is beyond parametric tolerance but within point tolerance
+                fLine = fLine < 0.5 ? 0 : 1;
+                fArc = data.sweep.fractionToSignedPeriodicFraction(fArc) < 0.5 ? 0 : 1;
+                const pointAH = fLine ? pointA1H : pointA0H;
+                const pointBH = fArc ? pointB1H : pointB0H;
+                const dist2 = pointAH.realDistanceSquaredXY(pointBH);
+                return (dist2 !== undefined && Geometry.isDistanceWithinTol(dist2, tol2)) ? { fLine, fArc } : undefined;
+            };
             for (let i = 0; i < numRoots; i++) {
-                const arcPoint = data.center.plus2Scaled(data.vector0, cosines.atUncheckedIndex(i), data.vector90, sines.atUncheckedIndex(i));
-                let arcFraction = data.sweep.radiansToSignedFraction(radians.atUncheckedIndex(i), extendB0);
-                const lineFraction = SmallSystem.lineSegment3dHXYClosestPointUnbounded(pointA0H, pointA1H, arcPoint);
-                if (lineFraction !== undefined) {
-                    if (this.acceptFraction(extendA0, lineFraction, extendA1) && this.acceptFraction(extendB0, arcFraction, extendB1)) {
-                        this.recordPointWithLocalFractions(lineFraction, cpA, fractionA0, fractionA1, arcFraction, arc, 0, 1, reversed);
-                    }
-                    else { // check for endpoint intersections beyond parametric tolerance but within point tolerance
-                        const pointAH = lineFraction < 0.5 ? pointA0H : pointA1H;
-                        const pointBH = (arcFraction = data.sweep.fractionToSignedPeriodicFraction(arcFraction)) < 0.5 ? pointB0H : pointB1H;
-                        if ((dist2 = pointAH.realDistanceSquaredXY(pointBH)) !== undefined && Geometry.isDistanceWithinTol(dist2, tol2))
-                            this.recordPointWithLocalFractions(lineFraction < 0.5 ? 0 : 1, cpA, fractionA0, fractionA1, arcFraction < 0.5 ? 0 : 1, arc, 0, 1, reversed);
-                    }
-                }
+                const result = acceptSolution(i, closeApproach);
+                if (result)
+                    this.recordPointWithLocalFractions(result.fLine, cpA, fractionA0, fractionA1, result.fArc, arc, 0, 1, reversed);
             }
         }
         else {
@@ -320,27 +325,30 @@ export class CurveCurveIntersectXY extends RecurseToCurvesGeometryHandler {
             const alpha = Geometry.tripleProductXYW(pointA0Local, 1, pointA1Local, 1, data.center, 1);
             const beta = Geometry.tripleProductXYW(pointA0Local, 1, pointA1Local, 1, data.vector0, 0);
             const gamma = Geometry.tripleProductXYW(pointA0Local, 1, pointA1Local, 1, data.vector90, 0);
-            const cosines = new GrowableFloat64Array(2);
-            const sines = new GrowableFloat64Array(2);
-            const radians = new GrowableFloat64Array(2);
-            const numRoots = AnalyticRoots.appendImplicitLineUnitCircleIntersections(alpha, beta, gamma, cosines, sines, radians);
-            if (numRoots <= 0)
-                return;
+            let numRoots = AnalyticRoots.appendImplicitLineUnitCircleIntersections(alpha, beta, gamma, cosines, sines, radians);
+            const closeApproach = (0 === numRoots);
+            if (closeApproach)
+                numRoots = 1; // we returned the arc's closest approach as the first "root"; if within tolerance and at endpoints, we record it
+            const acceptSolution = (iRoot, checkOnlyEndPointDistance = false) => {
+                const arcPoint = data.center.plus2Scaled(data.vector0, cosines.atUncheckedIndex(iRoot), data.vector90, sines.atUncheckedIndex(iRoot));
+                let fArc = data.sweep.radiansToSignedFraction(radians.atUncheckedIndex(iRoot), extendB0);
+                let fLine = SmallSystem.lineSegment3dXYClosestPointUnbounded(pointA0Local, pointA1Local, arcPoint);
+                if (fLine === undefined)
+                    return undefined;
+                if (!checkOnlyEndPointDistance && this.acceptFraction(extendA0, fLine, extendA1) && this.acceptFraction(extendB0, fArc, extendB1))
+                    return { fLine, fArc };
+                // check for an endpoint intersection that is beyond parametric tolerance but within point tolerance
+                fLine = fLine < 0.5 ? 0 : 1;
+                fArc = data.sweep.fractionToSignedPeriodicFraction(fArc) < 0.5 ? 0 : 1;
+                const pointALocal = fLine ? pointA1Local : pointA0Local;
+                const pointBLocal = fArc ? pointB1Local : pointB0Local;
+                const dist2 = pointALocal.distanceSquaredXY(pointBLocal);
+                return Geometry.isDistanceWithinTol(dist2, tol2) ? { fLine, fArc } : undefined;
+            };
             for (let i = 0; i < numRoots; i++) {
-                const arcPoint = data.center.plus2Scaled(data.vector0, cosines.atUncheckedIndex(i), data.vector90, sines.atUncheckedIndex(i));
-                let arcFraction = data.sweep.radiansToSignedFraction(radians.atUncheckedIndex(i), extendB0);
-                const lineFraction = SmallSystem.lineSegment3dXYClosestPointUnbounded(pointA0Local, pointA1Local, arcPoint);
-                if (lineFraction !== undefined) {
-                    if (this.acceptFraction(extendA0, lineFraction, extendA1) && this.acceptFraction(extendB0, arcFraction, extendB1)) {
-                        this.recordPointWithLocalFractions(lineFraction, cpA, fractionA0, fractionA1, arcFraction, arc, 0, 1, reversed);
-                    }
-                    else { // check for endpoint intersections beyond parametric tolerance but within point tolerance
-                        const pointALocal = lineFraction < 0.5 ? pointA0Local : pointA1Local;
-                        const pointBLocal = (arcFraction = data.sweep.fractionToSignedPeriodicFraction(arcFraction)) < 0.5 ? pointB0Local : pointB1Local;
-                        if ((dist2 = pointALocal.distanceSquaredXY(pointBLocal)) !== undefined && Geometry.isDistanceWithinTol(dist2, tol2))
-                            this.recordPointWithLocalFractions(lineFraction < 0.5 ? 0 : 1, cpA, fractionA0, fractionA1, arcFraction < 0.5 ? 0 : 1, arc, 0, 1, reversed);
-                    }
-                }
+                const result = acceptSolution(i, closeApproach);
+                if (result)
+                    this.recordPointWithLocalFractions(result.fLine, cpA, fractionA0, fractionA1, result.fArc, arc, 0, 1, reversed);
             }
         }
     }
@@ -363,12 +371,23 @@ export class CurveCurveIntersectXY extends RecurseToCurvesGeometryHandler {
             localB.coffs[0], localB.coffs[3], localB.coffs[6], // vector0 xyw
             localB.coffs[1], localB.coffs[4], localB.coffs[7], // vector90 xyw
             ellipseRadians, circleRadians);
+            const tol2 = this._coincidentGeometryContext.tolerance * this._coincidentGeometryContext.tolerance;
             // the intersections are transform-invariant, so the solution angles apply directly to the input arcs
             for (let i = 0; i < ellipseRadians.length; i++) {
-                const fractionA = cpA.sweep.radiansToSignedFraction(circleRadians[i], extendA0);
-                const fractionB = cpB.sweep.radiansToSignedFraction(ellipseRadians[i], extendB0);
-                if (this.acceptFraction(extendA0, fractionA, extendA1) && this.acceptFraction(extendB0, fractionB, extendB1))
+                let fractionA = cpA.sweep.radiansToSignedFraction(circleRadians[i], extendA0);
+                let fractionB = cpB.sweep.radiansToSignedFraction(ellipseRadians[i], extendB0);
+                if (this.acceptFraction(extendA0, fractionA, extendA1) && this.acceptFraction(extendB0, fractionB, extendB1)) {
                     this.recordPointWithLocalFractions(fractionA, cpA, 0, 1, fractionB, cpB, 0, 1, reversed);
+                }
+                else { // check for endpoint intersection beyond angular tolerance but within point tolerance
+                    fractionA = cpA.sweep.fractionToSignedPeriodicFraction(fractionA) < 0.5 ? 0 : 1;
+                    fractionB = cpB.sweep.fractionToSignedPeriodicFraction(fractionB) < 0.5 ? 0 : 1;
+                    const endPointA = cpA.fractionToPoint(fractionA, CurveCurveIntersectXY._workPointAA0);
+                    const endPointB = cpB.fractionToPoint(fractionB, CurveCurveIntersectXY._workPointBB0);
+                    const dist2 = endPointA.distanceSquaredXY(endPointB);
+                    if (Geometry.isDistanceWithinTol(dist2, tol2))
+                        this.recordPointWithLocalFractions(fractionA, cpA, 0, 1, fractionB, cpB, 0, 1, reversed);
+                }
             }
         }
     }
@@ -381,6 +400,15 @@ export class CurveCurveIntersectXY extends RecurseToCurvesGeometryHandler {
      * 5- Convert intersection angles to fractions and record intersections.
      */
     dispatchArcArc(cpA, extendA0, extendA1, cpB, extendB0, extendB1, reversed) {
+        // overlap handling. perspective is not handled.
+        if (this._coincidentGeometryContext && !this._worldToLocalPerspective && !this._worldToLocalAffine) {
+            const pairs = this._coincidentGeometryContext.coincidentArcIntersectionXY(cpA, cpB, true);
+            if (pairs) {
+                this.recordPairs(cpA, cpB, pairs, reversed);
+                return;
+            }
+        }
+        // look for isolated intersections
         let matrixA;
         let matrixB;
         if (this._worldToLocalPerspective) {
@@ -397,27 +425,13 @@ export class CurveCurveIntersectXY extends RecurseToCurvesGeometryHandler {
         }
         const conditionA = matrixA.conditionNumber();
         const conditionB = matrixB.conditionNumber();
-        // pick the arc that is closest to circular.
+        // order the arcs so that the first one we pass in is closer to circular
         if (conditionA > conditionB)
             this.dispatchArcArcThisOrder(cpA, matrixA, extendA0, extendA1, cpB, matrixB, extendB0, extendB1, reversed);
         else
             this.dispatchArcArcThisOrder(cpB, matrixB, extendB0, extendB1, cpA, matrixA, extendA0, extendA1, !reversed);
-        // overlap handling. perspective is not handled.
-        if (!this._coincidentGeometryContext) {
-            // do nothing
-        }
-        else if (this._worldToLocalPerspective) {
-            // do nothing
-        }
-        else if (this._worldToLocalAffine) {
-            // do nothing
-        }
-        else {
-            const pairs = this._coincidentGeometryContext.coincidentArcIntersectionXY(cpA, cpB, true);
-            if (pairs !== undefined)
-                this.recordPairs(cpA, cpB, pairs, reversed);
-        }
     }
+    /** Compute the intersection of an arc and a B-spline curve. */
     dispatchArcBsplineCurve3d(cpA, extendA0, extendA1, cpB, extendB0, extendB1, reversed) {
         // Arc: X = C + cU + sV
         // implicitize the arc as viewed.  This "3d" matrix is homogeneous "XYW" not "xyz"
@@ -432,8 +446,6 @@ export class CurveCurveIntersectXY extends RecurseToCurvesGeometryHandler {
         }
         // The worldToLocal has moved the arc vectors into local space.
         // matrixA captures the xyw parts (ignoring z)
-        // for any point in world space,
-        // THIS CODE ONLY WORKS FOR
         const matrixAInverse = matrixA.inverse();
         if (matrixAInverse) {
             const orderF = cpB.order; // order of the beziers for simple coordinates
@@ -452,36 +464,34 @@ export class CurveCurveIntersectXY extends RecurseToCurvesGeometryHandler {
             const awy = matrixAInverse.at(2, 1);
             const awz = 0.0;
             const aww = matrixAInverse.at(2, 2);
-            if (matrixAInverse) {
-                let bezier;
-                for (let spanIndex = 0;; spanIndex++) {
-                    bezier = cpB.getSaturatedBezierSpan3dH(spanIndex, bezier);
-                    if (!bezier)
-                        break;
-                    if (this._worldToLocalPerspective)
-                        bezier.tryMultiplyMatrix4dInPlace(this._worldToLocalPerspective);
-                    else if (this._worldToLocalAffine)
-                        bezier.tryTransformInPlace(this._worldToLocalAffine);
-                    univariateBezierG.zero();
-                    bezier.poleProductsXYZW(coffF, axx, axy, axz, axw);
-                    univariateBezierG.addSquaredSquaredBezier(coffF, 1.0);
-                    bezier.poleProductsXYZW(coffF, ayx, ayy, ayz, ayw);
-                    univariateBezierG.addSquaredSquaredBezier(coffF, 1.0);
-                    bezier.poleProductsXYZW(coffF, awx, awy, awz, aww);
-                    univariateBezierG.addSquaredSquaredBezier(coffF, -1.0);
-                    const roots = univariateBezierG.roots(0.0, true);
-                    if (roots) {
-                        for (const root of roots) {
-                            const fractionB = bezier.fractionToParentFraction(root);
-                            // The univariate bezier (which has been transformed by the view transform) evaluates into xyw space
-                            const bcurvePoint4d = bezier.fractionToPoint4d(root);
-                            const c = bcurvePoint4d.dotProductXYZW(axx, axy, axz, axw);
-                            const s = bcurvePoint4d.dotProductXYZW(ayx, ayy, ayz, ayw);
-                            const arcFraction = cpA.sweep.radiansToSignedFraction(Math.atan2(s, c), extendA0);
-                            if (this.acceptFraction(extendA0, arcFraction, extendA1) &&
-                                this.acceptFraction(extendB0, fractionB, extendB1)) {
-                                this.recordPointWithLocalFractions(arcFraction, cpA, 0, 1, fractionB, cpB, 0, 1, reversed);
-                            }
+            let bezier;
+            for (let spanIndex = 0;; spanIndex++) {
+                bezier = cpB.getSaturatedBezierSpan3dH(spanIndex, bezier);
+                if (!bezier)
+                    break;
+                if (this._worldToLocalPerspective)
+                    bezier.tryMultiplyMatrix4dInPlace(this._worldToLocalPerspective);
+                else if (this._worldToLocalAffine)
+                    bezier.tryTransformInPlace(this._worldToLocalAffine);
+                univariateBezierG.zero();
+                bezier.poleProductsXYZW(coffF, axx, axy, axz, axw);
+                univariateBezierG.addSquaredSquaredBezier(coffF, 1.0);
+                bezier.poleProductsXYZW(coffF, ayx, ayy, ayz, ayw);
+                univariateBezierG.addSquaredSquaredBezier(coffF, 1.0);
+                bezier.poleProductsXYZW(coffF, awx, awy, awz, aww);
+                univariateBezierG.addSquaredSquaredBezier(coffF, -1.0);
+                const roots = univariateBezierG.roots(0.0, true);
+                if (roots) {
+                    for (const root of roots) {
+                        const fractionB = bezier.fractionToParentFraction(root);
+                        // The univariate bezier (which has been transformed by the view transform) evaluates into xyw space
+                        const bcurvePoint4d = bezier.fractionToPoint4d(root);
+                        const c = bcurvePoint4d.dotProductXYZW(axx, axy, axz, axw);
+                        const s = bcurvePoint4d.dotProductXYZW(ayx, ayy, ayz, ayw);
+                        const arcFraction = cpA.sweep.radiansToSignedFraction(Math.atan2(s, c), extendA0);
+                        if (this.acceptFraction(extendA0, arcFraction, extendA1) &&
+                            this.acceptFraction(extendB0, fractionB, extendB1)) {
+                            this.recordPointWithLocalFractions(arcFraction, cpA, 0, 1, fractionB, cpB, 0, 1, reversed);
                         }
                     }
                 }