@itwin/core-geometry 4.1.0-dev.8 → 4.1.0-dev.81

package/lib/cjs/curve/CurveCurveIntersectXYZ.js

@@ -12,29 +12,20 @@ const BSplineCurve_1 = require("../bspline/BSplineCurve");
 const Geometry_1 = require("../Geometry");
 const GeometryHandler_1 = require("../geometry3d/GeometryHandler");
 const Plane3dByOriginAndUnitNormal_1 = require("../geometry3d/Plane3dByOriginAndUnitNormal");
-// import { Arc3d } from "./Arc3d";
 const Point2dVector2d_1 = require("../geometry3d/Point2dVector2d");
-// import { XYAndZ } from "../geometry3d/XYZProps";
 const Point3dVector3d_1 = require("../geometry3d/Point3dVector3d");
-// import { LineString3d } from "./LineString3d";
 const Polynomials_1 = require("../numerics/Polynomials");
-// import { Point4d } from "../geometry4d/Point4d";
-// import { Transform } from "../geometry3d/Transform";
-// import { Matrix3d } from "../geometry3d/Matrix3d";
 const Arc3d_1 = require("./Arc3d");
-// import { Range3d } from "../geometry3d/Range";
 const CurveCurveIntersectXY_1 = require("./CurveCurveIntersectXY");
 const CurveLocationDetail_1 = require("./CurveLocationDetail");
 const LineSegment3d_1 = require("./LineSegment3d");
 const LineString3d_1 = require("./LineString3d");
 // cspell:word XYRR
 /**
- * * Handler class for XYZ intersections.
+ * Handler class for XYZ intersections between _geometryB and another geometry.
+ * * **NOTE:** GeometryQuery input (_geometryB) should really be AnyCurve.
  * * Instances are initialized and called from CurveCurve.
- * * Constructor is told two geometry items A and B
- *   * geometryB is saved for later reference
- *   * type-specific handler methods will "see" geometry A repeatedly.
- *   * Hence geometryA is NOT saved by the constructor.
+ * * geometryB is saved for later reference.
  * @internal
  */
 class CurveCurveIntersectXYZ extends GeometryHandler_1.NullGeometryHandler {
@@ -42,15 +33,12 @@ class CurveCurveIntersectXYZ extends GeometryHandler_1.NullGeometryHandler {
         this._results = new CurveCurveIntersectXY_1.CurveLocationDetailArrayPair();
     }
     /**
-     *
-     * @param _geometryA first curve for intersection.  This is NOT saved.
-     * @param extendA flag to enable using extension of geometryA.
+     * @param extendA flag to enable using extension of the other geometry.
      * @param geometryB second curve for intersection.  Saved for reference by specific handler methods.
      * @param extendB flag for extension of geometryB.
      */
-    constructor(_geometryA, extendA, geometryB, extendB) {
+    constructor(extendA, geometryB, extendB) {
         super();
-        // this.geometryA = _geometryA;
         this._extendA = extendA;
         this._geometryB = geometryB;
         this._extendB = extendB;
@@ -59,7 +47,6 @@ class CurveCurveIntersectXYZ extends GeometryHandler_1.NullGeometryHandler {
     /**
      * * Return the results structure for the intersection calculation.
      * @param reinitialize if true, a new results structure is created for use by later calls.
-     *
      */
     grabResults(reinitialize = false) {
         const result = this._results;
@@ -74,10 +61,11 @@ class CurveCurveIntersectXYZ extends GeometryHandler_1.NullGeometryHandler {
             return false;
         return true;
     }
-    /** compute intersection of two line segments.
-     * filter by extension rules.
-     * reject if evaluated points do not match coordinates (e.g. close approach point)
-     * record with fraction mapping.
+    /**
+     * Compute intersection of two line segments.
+     * Filter by extension rules.
+     * Reject if evaluated points do not match coordinates (e.g. close approach point).
+     * Record with fraction mapping.
      */
     recordPointWithLocalFractions(localFractionA, cpA, fractionA0, fractionA1, localFractionB, // Computed intersection fraction
     cpB, fractionB0, fractionB1, reversed) {
@@ -89,11 +77,13 @@ class CurveCurveIntersectXYZ extends GeometryHandler_1.NullGeometryHandler {
             const topFractionA = this._results.dataA[numPrevious - 1].fraction;
             const topFractionB = this._results.dataB[numPrevious - 1].fraction;
             if (reversed) {
-                if (Geometry_1.Geometry.isAlmostEqualNumber(topFractionA, globalFractionB) && Geometry_1.Geometry.isAlmostEqualNumber(topFractionB, globalFractionA))
+                if (Geometry_1.Geometry.isAlmostEqualNumber(topFractionA, globalFractionB) &&
+                    Geometry_1.Geometry.isAlmostEqualNumber(topFractionB, globalFractionA))
                     return;
             }
             else {
-                if (Geometry_1.Geometry.isAlmostEqualNumber(topFractionA, globalFractionA) && Geometry_1.Geometry.isAlmostEqualNumber(topFractionB, globalFractionB))
+                if (Geometry_1.Geometry.isAlmostEqualNumber(topFractionA, globalFractionA) &&
+                    Geometry_1.Geometry.isAlmostEqualNumber(topFractionB, globalFractionB))
                     return;
             }
         }
@@ -114,15 +104,15 @@ class CurveCurveIntersectXYZ extends GeometryHandler_1.NullGeometryHandler {
             this._results.dataB.push(detailB);
         }
     }
-    /** compute intersection of two line segments.
-     * filter by extension rules.
-     * record with fraction mapping.
+    /**
+     * Compute intersection of two line segments.
+     * Filter by extension rules.
+     * Record with fraction mapping.
      */
     computeSegmentSegment3D(cpA, extendA0, pointA0, fractionA0, pointA1, fractionA1, extendA1, cpB, extendB0, pointB0, fractionB0, pointB1, fractionB1, extendB1, reversed) {
         const uv = CurveCurveIntersectXYZ._workVector2dA;
-        if (Polynomials_1.SmallSystem.lineSegment3dClosestApproachUnbounded(pointA0, pointA1, pointB0, pointB1, uv)
-            && this.acceptFraction(extendA0, uv.x, extendA1)
-            && this.acceptFraction(extendB0, uv.y, extendB1)) {
+        if (Polynomials_1.SmallSystem.lineSegment3dClosestApproachUnbounded(pointA0, pointA1, pointB0, pointB1, uv) &&
+            this.acceptFraction(extendA0, uv.x, extendA1) && this.acceptFraction(extendB0, uv.y, extendB1)) {
             this.recordPointWithLocalFractions(uv.x, cpA, fractionA0, fractionA1, uv.y, cpB, fractionB0, fractionB1, reversed);
         }
     }
@@ -134,14 +124,16 @@ class CurveCurveIntersectXYZ extends GeometryHandler_1.NullGeometryHandler {
         this.computeSegmentSegment3D(cpA, extendA0, pointA0, fractionA0, pointA1, fractionA1, extendA1, cpB, extendB0, pointB0, fractionB0, pointB1, fractionB1, extendB1, reversed);
     }
     /**
-     * Create a plane whose normal is the "better" cross product: `vectorA.crossProduct(vectorB)` or `vectorA.crossProduct(vectorC)`
+     * Create a plane whose normal is the "better" cross product: `vectorA.crossProduct(vectorB)` or
+     * `vectorA.crossProduct(vectorC)`
      * * The heuristic for "better" is:
-     *   * first choice is cross product with `vectorB`, if `vectorA` and `vectorB` are sufficiently far from parallel (or anti-parallel).
+     *   * first choice is cross product with `vectorB`, if `vectorA` and `vectorB` are sufficiently far from parallel
+     * (or anti-parallel).
      *   * otherwise use vectorC
      * @param origin plane origin
      * @param vectorA vector which must be in the plane.
-     * @param cosineValue largest cosine of the angle theta between vectorA and vectorB to prefer their cross product,
-     *                    e.g. passing 0.94 ~ cos(20deg) will switch to using vectorC in the cross product if theta < ~20deg or theta > ~160deg.
+     * @param cosineValue largest cosine of the angle theta between vectorA and vectorB to prefer their cross product, e.g.
+     *  passing 0.94 ~ cos(20deg) will switch to using vectorC in the cross product if theta < ~20deg or theta > ~160deg.
      * @param vectorB first candidate for additional in-plane vector
      * @param vectorC second candidate for additional in-plane vector
      */
@@ -239,7 +231,7 @@ class CurveCurveIntersectXYZ extends GeometryHandler_1.NullGeometryHandler {
     // Caller accesses data from two arcs.
     // Selects the best conditioned arc (in xy parts) as "circle after inversion"
     // Solves the arc-arc equations
-    dispatchArcBsplineCurve3d(_, _extendA, _cpB, _extendB, _reversed) {
+    dispatchArcBsplineCurve3d(_arc, _extendA, _cpB, _extendB, _reversed) {
         /*
         // Arc: X = C + cU + sV
         // implicitize the arc as viewed.  This "3d" matrix is homogeneous "XYW" not "xyz"
@@ -299,7 +291,7 @@ class CurveCurveIntersectXYZ extends GeometryHandler_1.NullGeometryHandler {
             }
           }
         }
-         */
+        */
     }
     /*
     // apply the transformation to bezier curves. optionally construct ranges.
@@ -310,7 +302,7 @@ class CurveCurveIntersectXYZ extends GeometryHandler_1.NullGeometryHandler {
         for (const bezier of beziers) bezier.tryMultiplyMatrix4dInPlace(this._worldToLocalPerspective);
       }
     }
-     */
+    */
     /*
     private getRanges(beziers: BezierCurveBase[]): Range3d[] {
       const ranges: Range3d[] = [];
@@ -338,23 +330,20 @@ class CurveCurveIntersectXYZ extends GeometryHandler_1.NullGeometryHandler {
       if (!this._xyzwA1) this._xyzwA1 = Point4d.create();
       if (!this._xyzwPlane) this._xyzwPlane = Point4d.create();
       if (!this._xyzwB) this._xyzwB = Point4d.create();
-      /-*
-  
-                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.radiansToSignedPeriodicFraction(Math.atan2(s, c));
-                    if (this.acceptFraction(extendA, arcFraction, extendA) && this.acceptFraction(extendB, fractionB, extendB)) {
-                      this.recordPointWithLocalFractions(arcFraction, cpA, 0, 1,
-                        fractionB, cpB, 0, 1, reversed);
-                    }
-                  }
-     *-/
+      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.radiansToSignedPeriodicFraction(Math.atan2(s, c));
+          if (this.acceptFraction(extendA, arcFraction, extendA) && this.acceptFraction(extendB, fractionB, extendB)) {
+            this.recordPointWithLocalFractions(arcFraction, cpA, 0, 1,
+              fractionB, cpB, 0, 1, reversed);
+          }
+        }
       bezierA.fractionToPoint4d(0.0, this._xyzwA0);
       let f0 = 0.0;
       let f1 = 1.0;
@@ -382,10 +371,9 @@ class CurveCurveIntersectXYZ extends GeometryHandler_1.NullGeometryHandler {
                 bezierAFraction = newtonSearcher.getU();
                 bezierBFraction = newtonSearcher.getV();
               }
-               *-/
-                // We have a near intersection at fractions on the two beziers !!!
-                // Iterate on the curves for a true intersection ....
-                // NEEDS WORK -- just accept . . .
+              // We have a near intersection at fractions on the two beziers !!!
+              // Iterate on the curves for a true intersection ....
+              // NEEDS WORK -- just accept . . .
               const bcurveAFraction = bezierA.fractionToParentFraction(bezierAFraction);
               const bcurveBFraction = bezierB.fractionToParentFraction(bezierBFraction);
               const xyzA0 = bezierA.fractionToPoint(bezierAFraction);
@@ -408,38 +396,39 @@ class CurveCurveIntersectXYZ extends GeometryHandler_1.NullGeometryHandler {
           }
       }
     }
-               */
+    */
     // Caller accesses data from two arcs.
     // Selects the best conditioned arc (in xy parts) as "circle after inversion"
     // Solves the arc-arc equations
     dispatchBSplineCurve3dBSplineCurve3d(_bcurveA, _bcurveB, _reversed) {
         /*
-      const bezierSpanA = bcurveA.collectBezierSpans(true) as BezierCurve3dH[];
-      const bezierSpanB = bcurveB.collectBezierSpans(true) as BezierCurve3dH[];
-      const numA = bezierSpanA.length;
-      const numB = bezierSpanB.length;
-      this.transformBeziers(bezierSpanA);
-      this.transformBeziers(bezierSpanB);
-      const rangeA = this.getRanges(bezierSpanA);
-      const rangeB = this.getRanges(bezierSpanB);
-      const orderA = bcurveA.order;
-      const orderB = bcurveB.order;
-      const univariateCoffsA = new UnivariateBezier(orderA);
-      const univariateCoffsB = new UnivariateBezier(orderB);
-      for (let a = 0; a < numA; a++) {
-        for (let b = 0; b < numB; b++) {
-          if (rangeA[a].intersectsRangeXY(rangeB[b])) {
-            const strokeCountA = bezierSpanA[a].computeStrokeCountForOptions();
-            const strokeCountB = bezierSpanB[b].computeStrokeCountForOptions();
-            if (strokeCountA < strokeCountB)
-              this.dispatchBezierBezierStrokeFirst(bezierSpanA[a], bcurveA, strokeCountA, bezierSpanB[b], bcurveB, strokeCountB, univariateCoffsB, !_reversed);
-            else
-              this.dispatchBezierBezierStrokeFirst(bezierSpanB[b], bcurveB, strokeCountB, bezierSpanA[a], bcurveA, strokeCountA, univariateCoffsA, _reversed);
+        const bezierSpanA = bcurveA.collectBezierSpans(true) as BezierCurve3dH[];
+        const bezierSpanB = bcurveB.collectBezierSpans(true) as BezierCurve3dH[];
+        const numA = bezierSpanA.length;
+        const numB = bezierSpanB.length;
+        this.transformBeziers(bezierSpanA);
+        this.transformBeziers(bezierSpanB);
+        const rangeA = this.getRanges(bezierSpanA);
+        const rangeB = this.getRanges(bezierSpanB);
+        const orderA = bcurveA.order;
+        const orderB = bcurveB.order;
+        const univariateCoffsA = new UnivariateBezier(orderA);
+        const univariateCoffsB = new UnivariateBezier(orderB);
+        for (let a = 0; a < numA; a++) {
+          for (let b = 0; b < numB; b++) {
+            if (rangeA[a].intersectsRangeXY(rangeB[b])) {
+              const strokeCountA = bezierSpanA[a].computeStrokeCountForOptions();
+              const strokeCountB = bezierSpanB[b].computeStrokeCountForOptions();
+              if (strokeCountA < strokeCountB)
+                this.dispatchBezierBezierStrokeFirst(bezierSpanA[a], bcurveA, strokeCountA, bezierSpanB[b], bcurveB, strokeCountB, univariateCoffsB, !_reversed);
+              else
+                this.dispatchBezierBezierStrokeFirst(bezierSpanB[b], bcurveB, strokeCountB, bezierSpanA[a], bcurveA, strokeCountA, univariateCoffsA, _reversed);
+            }
           }
         }
-      }
-                   */
+        */
     }
+    /*
     /**
      * Apply the projection transform (if any) to (xyz, w)
      * @param xyz xyz parts of input point.
@@ -467,7 +456,7 @@ class CurveCurveIntersectXYZ extends GeometryHandler_1.NullGeometryHandler {
         npcPlane.clone(worldPlane);
       }
     }
-     */
+    */
     // Caller accesses data from segment and bsplineCurve
     // Selects the best conditioned arc (in xy parts) as "circle after inversion"
     // Solves the arc-arc equations
@@ -492,9 +481,9 @@ class CurveCurveIntersectXYZ extends GeometryHandler_1.NullGeometryHandler {
               fractionB, bcurve, 0, 1, reversed);
           }
         }
-           */
+        */
     }
-    /** low lever bspline curve -- STUB  .. */
+    /** Low level dispatch of linestring with (beziers of) a bspline curve */
     dispatchLineStringBSplineCurve(_lsA, _extendA, _curveB, _extendB, _reversed) {
         /*
         const numA = lsA.numPoints();
@@ -515,9 +504,9 @@ class CurveCurveIntersectXYZ extends GeometryHandler_1.NullGeometryHandler {
           }
         }
         return undefined;
-         */
+        */
     }
-    /** low lever segment intersect linestring .. */
+    /** Detail computation for segment intersecting linestring. */
     computeSegmentLineString(lsA, extendA, lsB, extendB, reversed) {
         const pointA0 = lsA.point0Ref;
         const pointA1 = lsA.point1Ref;
@@ -538,7 +527,7 @@ class CurveCurveIntersectXYZ extends GeometryHandler_1.NullGeometryHandler {
         }
         return undefined;
     }
-    /** low lever arc intersect linestring .. */
+    /** Detail computation for arc intersecting linestring. */
     computeArcLineString(arcA, extendA, lsB, extendB, reversed) {
         const pointB0 = CurveCurveIntersectXYZ._workPointBB0;
         const pointB1 = CurveCurveIntersectXYZ._workPointBB1;
@@ -557,7 +546,7 @@ class CurveCurveIntersectXYZ extends GeometryHandler_1.NullGeometryHandler {
         }
         return undefined;
     }
-    /** double dispatch handler for strongly typed segment.. */
+    /** Double dispatch handler for strongly typed segment. */
     handleLineSegment3d(segmentA) {
         if (this._geometryB instanceof LineSegment3d_1.LineSegment3d) {
             const segmentB = this._geometryB;
@@ -588,9 +577,7 @@ class CurveCurveIntersectXYZ extends GeometryHandler_1.NullGeometryHandler {
                 const dfA = 1.0 / (numA - 1);
                 const dfB = 1.0 / (numB - 1);
                 let fA0 = 0.0;
-                let fB0;
-                let fA1;
-                let fB1;
+                let fA1, fB0, fB1;
                 const extendA = this._extendA;
                 const extendB = this._extendB;
                 lsA.pointAt(0, pointA0);
@@ -618,7 +605,7 @@ class CurveCurveIntersectXYZ extends GeometryHandler_1.NullGeometryHandler {
         }
         return undefined;
     }
-    /** double dispatch handler for strongly typed arc .. */
+    /** Double dispatch handler for strongly typed arc. */
     handleArc3d(arc0) {
         if (this._geometryB instanceof LineSegment3d_1.LineSegment3d) {
             this.dispatchSegmentArc(this._geometryB, this._extendB, this._geometryB.point0Ref, 0.0, this._geometryB.point1Ref, 1.0, this._extendB, arc0, this._extendA, this._extendA, true);
@@ -634,7 +621,7 @@ class CurveCurveIntersectXYZ extends GeometryHandler_1.NullGeometryHandler {
         }
         return undefined;
     }
-    /** double dispatch handler for strongly typed bspline curve.. */
+    /** Double dispatch handler for strongly typed bspline curve.. */
     handleBSplineCurve3d(curve) {
         if (this._geometryB instanceof LineSegment3d_1.LineSegment3d) {
             this.dispatchSegmentBsplineCurve(this._geometryB, this._extendB, this._geometryB.point0Ref, 0.0, this._geometryB.point1Ref, 1.0, this._extendB, curve, this._extendA, true);
@@ -650,9 +637,11 @@ class CurveCurveIntersectXYZ extends GeometryHandler_1.NullGeometryHandler {
         }
         return undefined;
     }
-    /** double dispatch handler for strongly typed homogeneous bspline curve. */
+    /** Double dispatch handler for strongly typed homogeneous bspline curve. */
     handleBSplineCurve3dH(_curve) {
-        /* NEEDS WORK -- make "dispatch" methods tolerant of both 3d and 3dH ..."easy" if both present BezierCurve3dH span loaders
+        /*
+        // NEEDS WORK -- make "dispatch" methods tolerant of both 3d and 3dH
+        // "easy" if both present BezierCurve3dH span loaders
         if (this._geometryB instanceof LineSegment3d) {
           this.dispatchSegmentBsplineCurve(
             this._geometryB, this._extendB, this._geometryB.point0Ref, 0.0, this._geometryB.point1Ref, 1.0, this._extendB,
@@ -662,7 +651,7 @@ class CurveCurveIntersectXYZ extends GeometryHandler_1.NullGeometryHandler {
         } else if (this._geometryB instanceof Arc3d) {
           this.dispatchArcBsplineCurve3d(this._geometryB, this._extendB, curve, this._extendA, true);
         }
-         */
+        */
         return undefined;
     }
 }