@itwin/core-geometry 4.5.0-dev.9 → 4.5.0

package/lib/esm/polyface/PolyfaceBuilder.js

@@ -85,8 +85,8 @@ class FacetSector {
      */
     loadIndexedPointAndDerivativeCoordinatesFromPackedArrays(i, packedXYZ, packedDerivatives, fractions, v) {
         packedXYZ.getPoint3dAtCheckedPointIndex(i, this.xyz);
-        if (fractions && v !== undefined)
-            this.uv = Point2d.create(fractions.atUncheckedIndex(i), v);
+        if (this.uv && fractions && v !== undefined)
+            this.uv.set(fractions.atUncheckedIndex(i), v);
         this.xyzIndex = -1;
         this.normalIndex = -1;
         this.uvIndex = -1;
@@ -771,8 +771,7 @@ class PolyfaceBuilder extends NullGeometryHandler {
                 this.addIndexedTriangleNormalIndexes(sectorA0.normalIndex, sectorA1.normalIndex, sectorA2.normalIndex);
             if (this._options.needParams)
                 this.addIndexedTriangleParamIndexes(sectorA0.uvIndex, sectorA1.uvIndex, sectorA2.uvIndex);
-            this.addIndexedTrianglePointIndexes(sectorA0.xyzIndex, sectorA1.xyzIndex, sectorA2.xyzIndex);
-            this._polyface.terminateFacet();
+            this.addIndexedTrianglePointIndexes(sectorA0.xyzIndex, sectorA1.xyzIndex, sectorA2.xyzIndex, true);
         }
     }
     addSectorQuadA01B01(sectorA0, sectorA1, sectorB0, sectorB1) {
@@ -788,8 +787,7 @@ class PolyfaceBuilder extends NullGeometryHandler {
                 this.addIndexedQuadNormalIndexes(sectorA0.normalIndex, sectorA1.normalIndex, sectorB0.normalIndex, sectorB1.normalIndex);
             if (this._options.needParams)
                 this.addIndexedQuadParamIndexes(sectorA0.uvIndex, sectorA1.uvIndex, sectorB0.uvIndex, sectorB1.uvIndex);
-            this.addIndexedQuadPointIndexes(sectorA0.xyzIndex, sectorA1.xyzIndex, sectorB0.xyzIndex, sectorB1.xyzIndex);
-            this._polyface.terminateFacet();
+            this.addIndexedQuadPointIndexes(sectorA0.xyzIndex, sectorA1.xyzIndex, sectorB0.xyzIndex, sectorB1.xyzIndex, true);
         }
     }
     /** Add facets between lineStrings with matched point counts.
@@ -861,14 +859,14 @@ class PolyfaceBuilder extends NullGeometryHandler {
         for (let i = 1; i < numPoints; i++) {
             if (this.options.shouldTriangulate) {
                 if (distinctIndices(pointA.atUncheckedIndex(i - 1), pointA.atUncheckedIndex(i), pointB.atUncheckedIndex(i))) {
-                    this.addIndexedTrianglePointIndexes(pointA.atUncheckedIndex(i - 1), pointA.atUncheckedIndex(i), pointB.atUncheckedIndex(i));
+                    this.addIndexedTrianglePointIndexes(pointA.atUncheckedIndex(i - 1), pointA.atUncheckedIndex(i), pointB.atUncheckedIndex(i), false);
                     if (normalA && normalB)
                         this.addIndexedTriangleNormalIndexes(normalA.atUncheckedIndex(i - 1), normalA.atUncheckedIndex(i), normalB.atUncheckedIndex(i - 1));
                     if (paramA && paramB)
                         this.addIndexedTriangleParamIndexes(paramA.atUncheckedIndex(i - 1), paramA.atUncheckedIndex(i), paramB.atUncheckedIndex(i - 1));
                 }
                 if (distinctIndices(pointB.atUncheckedIndex(i), pointB.atUncheckedIndex(i - 1), pointA.atUncheckedIndex(i - 1))) {
-                    this.addIndexedTrianglePointIndexes(pointA.atUncheckedIndex(i - 1), pointB.atUncheckedIndex(i), pointB.atUncheckedIndex(i - 1));
+                    this.addIndexedTrianglePointIndexes(pointA.atUncheckedIndex(i - 1), pointB.atUncheckedIndex(i), pointB.atUncheckedIndex(i - 1), false);
                     if (normalA && normalB)
                         this.addIndexedTriangleNormalIndexes(normalA.atUncheckedIndex(i - 1), normalB.atUncheckedIndex(i), normalB.atUncheckedIndex(i - 1));
                     if (paramA && paramB)
@@ -877,14 +875,14 @@ class PolyfaceBuilder extends NullGeometryHandler {
             }
             else {
                 if (pointA.atUncheckedIndex(i - 1) !== pointA.atUncheckedIndex(i) || pointB.atUncheckedIndex(i - 1) !== pointB.atUncheckedIndex(i)) {
-                    this.addIndexedQuadPointIndexes(pointA.atUncheckedIndex(i - 1), pointA.atUncheckedIndex(i), pointB.atUncheckedIndex(i - 1), pointB.atUncheckedIndex(i));
+                    this.addIndexedQuadPointIndexes(pointA.atUncheckedIndex(i - 1), pointA.atUncheckedIndex(i), pointB.atUncheckedIndex(i - 1), pointB.atUncheckedIndex(i), false);
                     if (normalA && normalB)
                         this.addIndexedQuadNormalIndexes(normalA.atUncheckedIndex(i - 1), normalA.atUncheckedIndex(i), normalB.atUncheckedIndex(i - 1), normalB.atUncheckedIndex(i));
                     if (paramA && paramB)
                         this.addIndexedQuadParamIndexes(paramA.atUncheckedIndex(i - 1), paramA.atUncheckedIndex(i), paramB.atUncheckedIndex(i - 1), paramB.atUncheckedIndex(i));
                 }
-                this._polyface.terminateFacet();
             }
+            this._polyface.terminateFacet();
         }
     }
     /** Add facets between lineStrings with matched point counts.
@@ -1528,11 +1526,14 @@ class PolyfaceBuilder extends NullGeometryHandler {
     /** add facets for a GeometryQuery object.   This is double dispatch through `dispatchToGeometryHandler(this)` */
     addGeometryQuery(g) { g.dispatchToGeometryHandler(this); }
     /**
-     *
-     * * Visit all faces
-     * * Test each face with f(node) for any node on the face.
-     * * For each face that passes, pass its coordinates to the builder.
-     * * Rely on the builder's compress step to find common vertex coordinates
+     * Add a graph to the builder.
+     * * Visit one node per face
+     * * If `acceptFaceFunction(node)` returns true, pass face coordinates to the builder
+     * * Accepted face edge visibility is determined by `isEdgeVisibleFunction`.
+     * * Rely on the builder's compress step to find common vertex coordinates.
+     * @param graph faces to add as facets
+     * @param acceptFaceFunction optional test for whether to add a given face. Default: ignore exterior faces
+     * @param isEdgeVisibleFunction optional test for whether to hide an edge. Default: hide interior edges
      * @internal
      */
     addGraph(graph, acceptFaceFunction = (node) => HalfEdge.testNodeMaskNotExterior(node), isEdgeVisibleFunction = (node) => HalfEdge.testMateMaskExterior(node)) {
@@ -1571,7 +1572,7 @@ class PolyfaceBuilder extends NullGeometryHandler {
      *  * terminate the facet
      * @internal
      */
-    addGraphFaces(_graph, faces) {
+    addGraphFaces(faces) {
         let index = 0;
         for (const seed of faces) {
             let node = seed;
@@ -1583,21 +1584,26 @@ class PolyfaceBuilder extends NullGeometryHandler {
             this._polyface.terminateFacet();
         }
     }
-    /** Create a polyface containing the faces of a HalfEdgeGraph, with test function to filter faces.
+    /**
+     * Create a polyface containing the faces of a HalfEdgeGraph, with test functions to filter faces and hide edges.
+     * * This is a static wrapper of [[addGraph]].
+     * @param graph faces to add as facets
+     * @param acceptFaceFunction optional test for whether to add a given face. Default: ignore exterior faces
+     * @param isEdgeVisibleFunction optional test for whether to hide an edge. Default: hide interior edges
      * @internal
      */
-    static graphToPolyface(graph, options, acceptFaceFunction = (node) => HalfEdge.testNodeMaskNotExterior(node)) {
+    static graphToPolyface(graph, options, acceptFaceFunction = (node) => HalfEdge.testNodeMaskNotExterior(node), isEdgeVisibleFunction = (node) => HalfEdge.testMateMaskExterior(node)) {
         const builder = PolyfaceBuilder.create(options);
-        builder.addGraph(graph, acceptFaceFunction);
+        builder.addGraph(graph, acceptFaceFunction, isEdgeVisibleFunction);
         builder.endFace();
         return builder.claimPolyface();
     }
     /** Create a polyface containing the faces of a HalfEdgeGraph that are specified by the HalfEdge array.
      * @internal
      */
-    static graphFacesToPolyface(graph, faces) {
+    static graphFacesToPolyface(faces) {
         const builder = PolyfaceBuilder.create();
-        builder.addGraphFaces(graph, faces);
+        builder.addGraphFaces(faces);
         builder.endFace();
         return builder.claimPolyface();
     }