@loaders.gl/tile-converter 3.3.0-alpha.4 → 3.3.0-alpha.5

package/dist/3d-tiles-converter/helpers/b3dm-converter.d.ts

@@ -17,7 +17,7 @@ export default class B3dmConverter {
      * @param i3sTile - Tile3D instance for I3S node
      * @returns - encoded glb content
      */
-    buildGltf(i3sAttributesData: I3SAttributesData): Promise<ArrayBuffer>;
+    buildGltf(i3sAttributesData: I3SAttributesData, featureAttributes: any): Promise<ArrayBuffer>;
     /**
      * Update gltfBuilder with texture from I3S tile
      * @param {object} i3sTile - Tile3D object
@@ -44,11 +44,11 @@ export default class B3dmConverter {
      */
     _generateTransformMatrix(cartesianOrigin: any): Matrix4;
     /**
-     * Generate batchId attribute from faceRanges.
-     * @param {Uint32Array} faceRanges - the source array
-     * @returns {Float32Array} batchId list.
+     * Create _BATCHID attribute
+     * @param {Object} i3sContent - the source object
+     * @returns {void}
      */
-    _generateBatchId(faceRanges: any): Float32Array;
+    _createBatchIds(i3sContent: any, featureAttributes: any): void;
     /**
      * luma.gl can not work without indices now:
      * https://github.com/visgl/luma.gl/blob/d8cad75b9f8ca3e578cf078ed9d19e619c2ddbc9/modules/experimental/src/gltf/gltf-instantiator.js#L115

package/dist/3d-tiles-converter/helpers/b3dm-converter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"b3dm-converter.d.ts","sourceRoot":"","sources":["../../../src/3d-tiles-converter/helpers/b3dm-converter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,kCAAkC,CAAC;AAKxE,OAAO,EAAC,OAAO,EAAU,MAAM,eAAe,CAAC;AAO/C;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,aAAa;IAEhC,SAAS,EAAE,YAAY,CAAC;IACxB,OAAO,EAAE,GAAG,CAAC;IAEb;;;;OAIG;IACG,OAAO,CACX,iBAAiB,EAAE,iBAAiB,EACpC,iBAAiB,GAAE,GAAU,GAC5B,OAAO,CAAC,WAAW,CAAC;IAcvB;;;;OAIG;IACG,SAAS,CAAC,iBAAiB,EAAE,iBAAiB,GAAG,OAAO,CAAC,WAAW,CAAC;IAuD3E;;;;;OAKG;IACG,oBAAoB,CAAC,WAAW,KAAA,EAAE,aAAa,KAAA,EAAE,WAAW,KAAA;IAmBlE;;;;;;;OAOG;IACH,mBAAmB,CAAC,cAAc,KAAA,EAAE,eAAe,KAAA,EAAE,kBAAkB,KAAA,EAAE,WAAW,KAAA;IAepF;;;;;;;OAOG;IACH,wBAAwB,CAAC,eAAe,KAAA;IAMxC;;;;OAIG;IACH,gBAAgB,CAAC,UAAU,KAAA;IAiB3B;;;;;;OAMG;IACH,wBAAwB,CAAC,WAAW,KAAA;IAQpC;;;;;OAKG;IACH,yBAAyB,CAAC,MAAM,KAAA;IAchC;;;;;OAKG;IACH,iCAAiC,CAAC,QAAQ,KAAA,EAAE,YAAY,KAAA;IAgCxD;;;;;OAKG;IACH,eAAe,CAAC,kBAAkB,KAAA,EAAE,YAAY,KAAA;IA+ChD,kBAAkB,CAAC,UAAU,KAAA;IAY7B,aAAa,CAAC,OAAO,KAAA;CAItB"}
+{"version":3,"file":"b3dm-converter.d.ts","sourceRoot":"","sources":["../../../src/3d-tiles-converter/helpers/b3dm-converter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,kCAAkC,CAAC;AAKxE,OAAO,EAAC,OAAO,EAAU,MAAM,eAAe,CAAC;AAO/C;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,aAAa;IAEhC,SAAS,EAAE,YAAY,CAAC;IACxB,OAAO,EAAE,GAAG,CAAC;IAEb;;;;OAIG;IACG,OAAO,CACX,iBAAiB,EAAE,iBAAiB,EACpC,iBAAiB,GAAE,GAAU,GAC5B,OAAO,CAAC,WAAW,CAAC;IAcvB;;;;OAIG;IACG,SAAS,CACb,iBAAiB,EAAE,iBAAiB,EACpC,iBAAiB,EAAE,GAAG,GACrB,OAAO,CAAC,WAAW,CAAC;IAwDvB;;;;;OAKG;IACG,oBAAoB,CAAC,WAAW,KAAA,EAAE,aAAa,KAAA,EAAE,WAAW,KAAA;IAmBlE;;;;;;;OAOG;IACH,mBAAmB,CAAC,cAAc,KAAA,EAAE,eAAe,KAAA,EAAE,kBAAkB,KAAA,EAAE,WAAW,KAAA;IAepF;;;;;;;OAOG;IACH,wBAAwB,CAAC,eAAe,KAAA;IAMxC;;;;OAIG;IACH,eAAe,CAAC,UAAU,KAAA,EAAE,iBAAiB,KAAA;IAoB7C;;;;;;OAMG;IACH,wBAAwB,CAAC,WAAW,KAAA;IAQpC;;;;;OAKG;IACH,yBAAyB,CAAC,MAAM,KAAA;IAchC;;;;;OAKG;IACH,iCAAiC,CAAC,QAAQ,KAAA,EAAE,YAAY,KAAA;IAgCxD;;;;;OAKG;IACH,eAAe,CAAC,kBAAkB,KAAA,EAAE,YAAY,KAAA;IA+ChD,kBAAkB,CAAC,UAAU,KAAA;IAY7B,aAAa,CAAC,OAAO,KAAA;CAItB"}

package/dist/3d-tiles-converter/helpers/b3dm-converter.js

@@ -18,7 +18,7 @@ class B3dmConverter {
      * @returns - encoded content
      */
     async convert(i3sAttributesData, featureAttributes = null) {
-        const gltf = await this.buildGltf(i3sAttributesData);
+        const gltf = await this.buildGltf(i3sAttributesData, featureAttributes);
         const b3dm = (0, core_1.encodeSync)({
             gltfEncoded: new Uint8Array(gltf),
             type: 'b3dm',
@@ -32,7 +32,7 @@ class B3dmConverter {
      * @param i3sTile - Tile3D instance for I3S node
      * @returns - encoded glb content
      */
-    async buildGltf(i3sAttributesData) {
+    async buildGltf(i3sAttributesData, featureAttributes) {
         const { tileContent, textureFormat } = i3sAttributesData;
         const { material, attributes, indices: originalIndices, cartesianOrigin, cartographicOrigin, modelMatrix } = tileContent;
         const gltfBuilder = new gltf_1.GLTFScenegraph();
@@ -45,6 +45,7 @@ class B3dmConverter {
             attributes.texCoords.value = (0, texture_atlas_1.convertTextureAtlas)(attributes.texCoords.value, attributes.uvRegions.value);
         }
         attributes.positions.value = this._normalizePositions(positionsValue, cartesianOrigin, cartographicOrigin, modelMatrix);
+        this._createBatchIds(tileContent, featureAttributes);
         if (attributes.normals && !this._checkNormals(attributes.normals.value)) {
             delete attributes.normals;
         }
@@ -123,23 +124,26 @@ class B3dmConverter {
         return result;
     }
     /**
-     * Generate batchId attribute from faceRanges.
-     * @param {Uint32Array} faceRanges - the source array
-     * @returns {Float32Array} batchId list.
+     * Create _BATCHID attribute
+     * @param {Object} i3sContent - the source object
+     * @returns {void}
      */
-    _generateBatchId(faceRanges) {
-        const batchIdArraySize = (faceRanges[faceRanges.length - 1] + 1) * 3;
-        const batchId = new Float32Array(batchIdArraySize);
-        let rangeIndex = 0;
-        let currentBatchId = 0;
-        for (let index = 0; index < faceRanges.length / 2; index++) {
-            const fromIndex = faceRanges[rangeIndex] * 3;
-            const untilPosition = (faceRanges[rangeIndex + 1] + 1) * 3;
-            batchId.fill(currentBatchId, fromIndex, untilPosition);
-            rangeIndex += 2;
-            currentBatchId += 1;
+    _createBatchIds(i3sContent, featureAttributes) {
+        const { featureIds } = i3sContent;
+        const { OBJECTID: objectIds } = featureAttributes || {};
+        if (!featureIds || !objectIds) {
+            return;
+        }
+        for (let i = 0; i < featureIds.length; i++) {
+            const featureId = featureIds[i];
+            const batchId = objectIds.indexOf(featureId);
+            featureIds[i] = batchId;
         }
-        return batchId;
+        i3sContent.attributes._BATCHID = {
+            size: 1,
+            byteOffset: 0,
+            value: featureIds
+        };
     }
     /**
      * luma.gl can not work without indices now: