@itwin/core-geometry 5.0.0-dev.4 → 5.0.0-dev.5

package/lib/cjs/polyface/PolyfaceBuilder.js

@@ -1080,17 +1080,28 @@ class PolyfaceBuilder extends GeometryHandler_1.NullGeometryHandler {
     }
     /** Construct facets for a rotational sweep. */
     addRotationalSweep(surface) {
-        const contour = surface.getCurves();
-        const section0 = StrokeCountChain_1.StrokeCountSection.createForParityRegionOrChain(contour, this._options);
+        const contour = surface.getSweepContourRef();
+        const section0 = StrokeCountChain_1.StrokeCountSection.createForParityRegionOrChain(contour.getCurves(), this._options);
         const baseStrokes = section0.getStrokes();
+        // ensure sweep is positive for buildRotationalNormalsInLineStrings
         const axis = surface.cloneAxisRay();
+        const sweepAngle = surface.getSweep();
+        if (sweepAngle.radians < 0.0) {
+            axis.direction.scaleInPlace(-1);
+            sweepAngle.setRadians(-sweepAngle.radians);
+        }
+        // swingVector points in the direction of positive sweep
         const perpendicularVector = CylindricalRange_1.CylindricalRangeQuery.computeMaxVectorFromRay(axis, baseStrokes);
         const swingVector = axis.direction.crossProduct(perpendicularVector);
+        // ensure contour computed normal is aligned with swingVector for buildRotationalNormalsInLineStrings
+        const contourNormalAgreesWithSwingDir = contour.localToWorld.matrix.dotColumnZ(swingVector) > 0;
+        if (!contourNormalAgreesWithSwingDir)
+            baseStrokes.reverseInPlace();
         if (this._options.needNormals)
             CylindricalRange_1.CylindricalRangeQuery.buildRotationalNormalsInLineStrings(baseStrokes, axis, swingVector);
         const maxDistance = perpendicularVector.magnitude();
-        const maxPath = Math.abs(maxDistance * surface.getSweep().radians);
-        let numStep = StrokeOptions_1.StrokeOptions.applyAngleTol(this._options, 1, surface.getSweep().radians, undefined);
+        const maxPath = Math.abs(maxDistance * sweepAngle.radians);
+        let numStep = StrokeOptions_1.StrokeOptions.applyAngleTol(this._options, 1, sweepAngle.radians, undefined);
         numStep = StrokeOptions_1.StrokeOptions.applyMaxEdgeLength(this._options, numStep, maxPath);
         for (let i = 1; i <= numStep; i++) {
             const transformA = surface.getFractionalRotationTransform((i - 1) / numStep);
@@ -1098,11 +1109,10 @@ class PolyfaceBuilder extends GeometryHandler_1.NullGeometryHandler {
             this.addBetweenRotatedStrokeSets(baseStrokes, transformA, i - 1, transformB, i);
         }
         if (surface.capped) {
-            const capContour = surface.getSweepContourRef();
-            capContour.purgeFacets();
-            capContour.emitFacets(this, true, undefined);
-            // final loop pass left transformA at end
-            capContour.emitFacets(this, false, surface.getFractionalRotationTransform(1.0));
+            contour.purgeFacets();
+            const reverseNearCap = contourNormalAgreesWithSwingDir;
+            contour.emitFacets(this, reverseNearCap, undefined);
+            contour.emitFacets(this, !reverseNearCap, surface.getFractionalRotationTransform(1.0));
         }
     }
     /** Construct facets for any planar region. */
@@ -1166,9 +1176,9 @@ class PolyfaceBuilder extends GeometryHandler_1.NullGeometryHandler {
             const normalIndices = ls.ensureEmptyNormalIndices();
             const normalIndex0 = this.findOrAddNormalInLineString(ls, 0, transform);
             normalIndices.push(normalIndex0);
-            let normalIndexA = normalIndex0;
-            let normalIndexB;
             if (n > 1) {
+                let normalIndexA = normalIndex0;
+                let normalIndexB;
                 for (let i = 1; i + 1 < n; i++) {
                     normalIndexB = this.findOrAddNormalInLineString(ls, i, transform, normalIndexA);
                     normalIndices.push(normalIndexB);
@@ -1183,9 +1193,9 @@ class PolyfaceBuilder extends GeometryHandler_1.NullGeometryHandler {
             const uvIndices = ls.ensureEmptyUVIndices();
             const uvIndex0 = this.findOrAddParamInLineString(ls, 0, vParam);
             uvIndices.push(uvIndex0);
-            let uvIndexA = uvIndex0;
-            let uvIndexB;
             if (n > 1) {
+                let uvIndexA = uvIndex0;
+                let uvIndexB;
                 for (let i = 1; i + 1 < n; i++) {
                     uvIndexB = this.findOrAddParamInLineString(ls, i, vParam, uvIndexA);
                     uvIndices.push(uvIndexB);