@itwin/core-geometry 4.7.0-dev.6 → 4.7.0-dev.8

package/lib/esm/serialization/BGFBReader.d.ts

@@ -55,30 +55,28 @@ export declare class BGFBReader {
      * @param variant read position in the flat buffer.
      */
     readPointStringFromVariant(variant: BGFBAccessors.VariantGeometry): PointString3d | undefined;
-    /**
-   * Extract auxData for a mesh
-   * @param variant read position in the flat buffer.
-   */
+    /** Extract auxData channel data for a mesh */
     readPolyfaceAuxChannelData(channelDataHeader: BGFBAccessors.PolyfaceAuxChannelData | null): AuxChannelData | undefined;
-    /**
-   * Extract auxData for a mesh
-   * @param variant read position in the flat buffer.
-   */
+    /** Extract auxData channel for a mesh */
     readPolyfaceAuxChannel(channelHeader: BGFBAccessors.PolyfaceAuxChannel | null): AuxChannel | undefined;
-    /**
-   * Extract auxData for a mesh
-   * @param variant read position in the flat buffer.
-   */
-    readPolyfaceAuxData(auxDataHeader: BGFBAccessors.PolyfaceAuxData | null): PolyfaceAuxData | undefined;
-    /**
-   * Extract auxData for a mesh
-   * @param variant read position in the flat buffer.
-   */
+    /** Compute the number of logical entries in every flat data array in the AuxData */
+    private static channelDataLength;
+    /** Examine int array for range and zero count  */
+    private countIntArray;
+    /**
+     * Extract auxData for a mesh.
+     * Typescript object format for Polyface/PolyfaceAuxData indices is 0-based, unterminated.
+     * FlatBuffer format for Polyface/PolyfaceAuxData indices is 1-based, 0-terminated/padded.
+     * Typescript API previously wrote FlatBuffer PolyfaceAuxData indices as 0-based, unterminated;
+     * heuristics are used herein to identify this legacy format so it can still be read.
+     */
+    readPolyfaceAuxData(fbPolyface: BGFBAccessors.Polyface | null, fbAuxData: BGFBAccessors.PolyfaceAuxData | null): PolyfaceAuxData | undefined;
+    /** Extract tagged numeric data for a mesh */
     readTaggedNumericData(accessor: BGFBAccessors.TaggedNumericData | undefined): TaggedNumericData | undefined;
     /**
-   * Extract a mesh
-   * @param variant read position in the flat buffer.
-   */
+     * Extract a mesh
+     * @param variant read position in the flat buffer.
+     */
     readPolyfaceFromVariant(variant: BGFBAccessors.VariantGeometry): IndexedPolyface | undefined;
     readCurveCollectionFromCurveVectorTable(cvTable: BGFBAccessors.CurveVector): CurveCollection;
     /**

package/lib/esm/serialization/BGFBReader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BGFBReader.d.ts","sourceRoot":"","sources":["../../../src/serialization/BGFBReader.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"BGFBReader.d.ts","sourceRoot":"","sources":["../../../src/serialization/BGFBReader.ts"],"names":[],"mappings":"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"}

package/lib/esm/serialization/BGFBReader.js

@@ -3,6 +3,7 @@
 * See LICENSE.md in the project root for license terms and full copyright notice.
 *--------------------------------------------------------------------------------------------*/
 import { flatbuffers } from "flatbuffers";
+import { assert } from "@itwin/core-bentley";
 import { AkimaCurve3d, AkimaCurve3dOptions } from "../bspline/AkimaCurve3d";
 import { BSplineCurve3d } from "../bspline/BSplineCurve";
 import { BSplineCurve3dH } from "../bspline/BSplineCurve3dH";
@@ -250,10 +251,7 @@ export class BGFBReader {
         }
         return undefined;
     }
-    /**
-   * Extract auxData for a mesh
-   * @param variant read position in the flat buffer.
-   */
+    /** Extract auxData channel data for a mesh */
     readPolyfaceAuxChannelData(channelDataHeader) {
         if (channelDataHeader !== null) {
             const input = channelDataHeader.input();
@@ -263,10 +261,7 @@ export class BGFBReader {
         }
         return undefined;
     }
-    /**
-   * Extract auxData for a mesh
-   * @param variant read position in the flat buffer.
-   */
+    /** Extract auxData channel for a mesh */
     readPolyfaceAuxChannel(channelHeader) {
         if (channelHeader) {
             const dataType = channelHeader.dataType();
@@ -283,36 +278,100 @@ export class BGFBReader {
         }
         return undefined;
     }
+    /** Compute the number of logical entries in every flat data array in the AuxData */
+    static channelDataLength(fbAuxData) {
+        if (fbAuxData.channelsLength() <= 0)
+            return 0;
+        const fbChannel0 = nullToUndefined(fbAuxData.channels(0));
+        if (!fbChannel0)
+            return 0;
+        const numChannel0Data = fbChannel0.dataLength();
+        if (numChannel0Data <= 0)
+            return 0;
+        const fbChannel0Data0 = nullToUndefined(fbChannel0.data(0));
+        if (!fbChannel0Data0)
+            return 0;
+        const numChannelDataValues = fbChannel0Data0.valuesLength();
+        if (numChannelDataValues <= 0)
+            return 0;
+        return numChannelDataValues / AuxChannel.entriesPerValue(fbChannel0.dataType());
+    }
+    /** Examine int array for range and zero count  */
+    countIntArray(ints) {
+        let min = Infinity;
+        let max = -Infinity;
+        let numZeroes = 0;
+        for (const i of ints) {
+            if (min > i)
+                min = i;
+            if (max < i)
+                max = i;
+            if (0 === i)
+                ++numZeroes;
+        }
+        return { min, max, numZeroes };
+    }
     /**
-   * Extract auxData for a mesh
-   * @param variant read position in the flat buffer.
-   */
-    readPolyfaceAuxData(auxDataHeader) {
-        if (auxDataHeader) {
-            const channelsLength = auxDataHeader.channelsLength();
-            const indicesArray = auxDataHeader.indicesArray();
-            const indices = [];
-            const channels = [];
-            if (null !== indicesArray) {
-                for (const i of indicesArray)
-                    indices.push(i);
-            }
-            if (0 !== channelsLength) {
-                for (let i = 0; i < channelsLength; i++) {
-                    const channelHeader = auxDataHeader.channels(i);
-                    const channelContent = this.readPolyfaceAuxChannel(channelHeader);
-                    if (channelContent)
-                        channels.push(channelContent);
-                }
+     * Extract auxData for a mesh.
+     * Typescript object format for Polyface/PolyfaceAuxData indices is 0-based, unterminated.
+     * FlatBuffer format for Polyface/PolyfaceAuxData indices is 1-based, 0-terminated/padded.
+     * Typescript API previously wrote FlatBuffer PolyfaceAuxData indices as 0-based, unterminated;
+     * heuristics are used herein to identify this legacy format so it can still be read.
+     */
+    readPolyfaceAuxData(fbPolyface, fbAuxData) {
+        if (!fbPolyface || !fbAuxData)
+            return undefined;
+        const fbPointIndices = nullToUndefined(fbPolyface.pointIndexArray());
+        const fbAuxIndices = nullToUndefined(fbAuxData.indicesArray());
+        const numChannels = fbAuxData.channelsLength();
+        const fbNumData = BGFBReader.channelDataLength(fbAuxData);
+        if (!fbPointIndices || !fbPointIndices.length || !fbAuxIndices || !fbAuxIndices.length || numChannels <= 0 || fbNumData <= 0)
+            return undefined;
+        const numPerFace = fbPolyface.numPerFace();
+        // HEURISTICS to detect legacy AuxData indices, previously mistakenly serialized by BGFBWriter.writePolyfaceAsFBVariantGeometry as 0-based unblocked indices
+        let isLegacy = false;
+        const pointIndicesPadCount = fbPointIndices.filter((index) => index === 0).length;
+        if (numPerFace > 1) {
+            const auxIndexCounts = this.countIntArray(fbAuxIndices);
+            if (auxIndexCounts.max > fbNumData) // auxIndices invalid
+                return undefined;
+            if (auxIndexCounts.max === fbNumData) // auxIndices 1-based
+                isLegacy = false;
+            else if (auxIndexCounts.max <= 0 || auxIndexCounts.min < 0) // auxIndices 1-based (signed)
+                isLegacy = false;
+            else if (auxIndexCounts.min === 0) // auxIndices likely legacy 0-based index, but could be modern with padding
+                isLegacy = pointIndicesPadCount !== auxIndexCounts.numZeroes;
+            else if (auxIndexCounts.min > 0) // auxIndices likely modern without padding, but could be legacy if first datum not indexed
+                isLegacy = pointIndicesPadCount > 0;
+        }
+        else {
+            isLegacy = (fbAuxIndices.length < fbPointIndices.length) && (fbAuxIndices.length + pointIndicesPadCount === fbPointIndices.length);
+        }
+        if (!isLegacy && fbAuxIndices.length !== fbPointIndices.length)
+            return undefined; // auxIndices invalid
+        const indices = [];
+        if (isLegacy)
+            SerializationHelpers.announceZeroBasedIndicesWithExternalBlocking(fbAuxIndices, fbPointIndices, numPerFace, (i0) => { indices.push(i0); });
+        else
+            SerializationHelpers.announceZeroBasedIndicesFromSignedOneBasedIndices(fbAuxIndices, numPerFace, (i0) => { indices.push(i0); });
+        if (indices.length + pointIndicesPadCount !== fbPointIndices.length)
+            return undefined;
+        const maxIndex = Math.max(...indices);
+        const channels = [];
+        for (let i = 0; i < numChannels; i++) {
+            const channelHeader = fbAuxData.channels(i);
+            const channelContent = this.readPolyfaceAuxChannel(channelHeader);
+            if (channelContent) {
+                if (maxIndex >= channelContent.valueCount)
+                    return undefined; // invalid index
+                channels.push(channelContent);
             }
-            return new PolyfaceAuxData(channels, indices);
         }
-        return undefined;
+        if (!channels.length)
+            return undefined;
+        return new PolyfaceAuxData(channels, indices);
     }
-    /**
-   * Extract auxData for a mesh
-   * @param variant read position in the flat buffer.
-   */
+    /** Extract tagged numeric data for a mesh */
     readTaggedNumericData(accessor) {
         if (accessor) {
             const taggedNumericData = new TaggedNumericData(accessor.tagA(), accessor.tagB());
@@ -333,9 +392,9 @@ export class BGFBReader {
         return undefined;
     }
     /**
-   * Extract a mesh
-   * @param variant read position in the flat buffer.
-   */
+     * Extract a mesh
+     * @param variant read position in the flat buffer.
+     */
     readPolyfaceFromVariant(variant) {
         const geometryType = variant.geometryType();
         if (geometryType === BGFBAccessors.VariantGeometryUnion.tagPolyface) {
@@ -354,59 +413,35 @@ export class BGFBReader {
                 const normalIndexI32 = nullToUndefined(polyfaceHeader.normalIndexArray());
                 const colorIndexI32 = nullToUndefined(polyfaceHeader.colorIndexArray());
                 const taggedNumericDataOffset = polyfaceHeader.taggedNumericData();
+                assert(meshStyle === 1, "Unrecognized flatbuffer mesh style");
+                // The flatbuffer data is one based.
+                // If numPerFace is less than 2, facets are variable size and zero terminated
+                // If numPerFace is 2 or more, indices are blocked
                 if (meshStyle === 1 && pointF64 && pointIndexI32) {
-                    const polyface = IndexedPolyface.create(normalF64 !== undefined, paramF64 !== undefined, intColorU32 !== undefined, twoSided);
+                    const polyface = IndexedPolyface.create();
+                    polyface.twoSided = twoSided;
                     polyface.expectedClosure = expectedClosure;
-                    for (let i = 0; i + 2 < pointF64?.length; i += 3)
-                        polyface.data.point.pushXYZ(pointF64[i], pointF64[i + 1], pointF64[i + 2]);
-                    if (paramF64) {
-                        for (let i = 0; i + 1 < paramF64?.length; i += 2)
-                            polyface.data.param.pushXY(paramF64[i], paramF64[i + 1]);
+                    if (normalF64 && normalIndexI32) {
+                        for (let i = 0; i + 2 < normalF64.length; i += 3)
+                            polyface.addNormalXYZ(normalF64[i], normalF64[i + 1], normalF64[i + 2]);
+                        SerializationHelpers.announceZeroBasedIndicesFromSignedOneBasedIndices(normalIndexI32, numPerFace, (i) => { polyface.addNormalIndex(i); });
                     }
-                    if (normalF64) {
-                        for (let i = 0; i + 2 < normalF64?.length; i += 3)
-                            polyface.data.normal.pushXYZ(normalF64[i], normalF64[i + 1], normalF64[i + 2]);
+                    if (paramF64 && paramIndexI32) {
+                        for (let i = 0; i + 1 < paramF64.length; i += 2)
+                            polyface.addParamUV(paramF64[i], paramF64[i + 1]);
+                        SerializationHelpers.announceZeroBasedIndicesFromSignedOneBasedIndices(paramIndexI32, numPerFace, (i) => { polyface.addParamIndex(i); });
                     }
-                    if (intColorU32) {
+                    if (intColorU32 && colorIndexI32) {
                         for (const c of intColorU32)
-                            polyface.data.color.push(c);
-                    }
-                    // The flatbuffer data is one based.
-                    // If numPerFace is less than 2, facets are variable size and zero terminated
-                    // If numPerFace is 2 or more, indices are blocked
-                    const numIndex = pointIndexI32.length;
-                    const addIndicesInBlock = (k0, k1) => {
-                        for (let k = k0; k < k1; k++) {
-                            const q = pointIndexI32[k];
-                            polyface.addPointIndex(Math.abs(q) - 1, q > 0);
-                            if (normalF64 && normalIndexI32) {
-                                polyface.addNormalIndex(Math.abs(normalIndexI32[k]) - 1);
-                            }
-                            if (paramF64 && paramIndexI32) {
-                                polyface.addParamIndex(Math.abs(paramIndexI32[k]) - 1);
-                            }
-                            if (intColorU32 && colorIndexI32) {
-                                polyface.addColorIndex(Math.abs(colorIndexI32[k]) - 1);
-                            }
-                        }
-                    };
-                    if (numPerFace > 1) {
-                        for (let i0 = 0; i0 + numPerFace <= numIndex; i0 += numPerFace) {
-                            addIndicesInBlock(i0, i0 + numPerFace);
-                            polyface.terminateFacet(true);
-                        }
-                    }
-                    else {
-                        let i0 = 0;
-                        for (let i1 = i0; i1 < numIndex; i1++) {
-                            if (pointIndexI32[i1] === 0) {
-                                addIndicesInBlock(i0, i1);
-                                polyface.terminateFacet(true);
-                                i0 = i1 + 1;
-                            }
-                        }
+                            polyface.addColor(c);
+                        SerializationHelpers.announceZeroBasedIndicesFromSignedOneBasedIndices(colorIndexI32, numPerFace, (i) => { polyface.addColorIndex(i); });
                     }
-                    polyface.data.auxData = this.readPolyfaceAuxData(polyfaceHeader.auxData());
+                    for (let i = 0; i + 2 < pointF64.length; i += 3)
+                        polyface.addPointXYZ(pointF64[i], pointF64[i + 1], pointF64[i + 2]);
+                    SerializationHelpers.announceZeroBasedIndicesFromSignedOneBasedIndices(pointIndexI32, numPerFace, (i, v) => { polyface.addPointIndex(i, v); }, () => { polyface.terminateFacet(false); });
+                    if (!polyface.validateAllIndices())
+                        return undefined;
+                    polyface.data.auxData = this.readPolyfaceAuxData(polyfaceHeader, polyfaceHeader.auxData());
                     if (taggedNumericDataOffset) {
                         const taggedNumericDataAccessor = nullToUndefined(taggedNumericDataOffset);
                         if (taggedNumericDataAccessor !== undefined) {