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

package/src/i3s-converter/helpers/geometry-converter.ts

@@ -1,13 +1,20 @@
-import type {Image, MeshPrimitive} from 'modules/gltf/src/lib/types/gltf-postprocessed-schema';
 import type {B3DMContent, FeatureTableJson} from '@loaders.gl/3d-tiles';
-import type {GLTF_EXT_feature_metadata} from '@loaders.gl/gltf';
+import type {
+  GLTF_EXT_feature_metadata,
+  GLTFAccessorPostprocessed,
+  GLTFMaterialPostprocessed,
+  GLTFNodePostprocessed,
+  GLTFImagePostprocessed,
+  GLTFMeshPrimitivePostprocessed,
+  GLTFMeshPostprocessed,
+  GLTFTexturePostprocessed
+} from '@loaders.gl/gltf';
 
 import {Vector3, Matrix4, Vector4} from '@math.gl/core';
 import {Ellipsoid} from '@math.gl/geospatial';
 
 import {DracoWriterWorker} from '@loaders.gl/draco';
 import {assert, encode} from '@loaders.gl/core';
-import {Tile3D} from '@loaders.gl/tiles';
 import {concatenateArrayBuffers, concatenateTypedArrays} from '@loaders.gl/loader-utils';
 import md5 from 'md5';
 import {generateAttributes} from './geometry-attributes';
@@ -18,7 +25,6 @@ import {
   I3SMaterialWithTexture,
   SharedResourcesArrays
 } from '../types';
-import {GLTFMaterialPostprocessed, GLTFNodePostprocessed} from '@loaders.gl/gltf';
 import {
   AttributeStorageInfo,
   I3SMaterialDefinition,
@@ -27,12 +33,8 @@ import {
 } from '@loaders.gl/i3s';
 import {TypedArray} from '@loaders.gl/schema';
 import {Geoid} from '@math.gl/geoid';
-import {
-  GLTFAccessorPostprocessed,
-  GLTFMeshPostprocessed,
-  GLTFTexturePostprocessed
-} from 'modules/gltf/src/lib/types/gltf-types';
-import {B3DMAttributesData /*transformI3SAttributesOnWorker */} from '../../i3s-attributes-worker';
+/** Usage of worker here brings more overhead than advantage */
+import {B3DMAttributesData /*, transformI3SAttributesOnWorker*/} from '../../i3s-attributes-worker';
 import {prepareDataForAttributesConversion} from './gltf-attributes';
 import {handleBatchIdsExtensions} from './batch-ids-extensions';
 import {checkPropertiesLength, flattenPropertyTableByFeatureIds} from './feature-attributes';
@@ -65,7 +67,7 @@ let scratchVector = new Vector3();
  * Convert binary data from b3dm file to i3s resources
  *
  * @param tileContent - 3d tile content
- * @param nodeId - target nodeId. If a few nodes will be created - ids will be nodeId+n where n - index in the resulting array
+ * @param addNodeToNodePage - function to add new node to node pages
  * @param featuresHashArray - hash array of features that is needed to not to mix up same features in parent and child nodes
  * @param attributeStorageInfo - attributes metadata from 3DSceneLayer json
  * @param draco - is converter should create draco compressed geometry
@@ -75,7 +77,7 @@ let scratchVector = new Vector3();
  */
 export default async function convertB3dmToI3sGeometry(
   tileContent: B3DMContent,
-  nodeId: number,
+  addNodeToNodePage: () => number,
   propertyTable: FeatureTableJson | null,
   featuresHashArray: string[],
   attributeStorageInfo: AttributeStorageInfo[] | undefined,
@@ -83,7 +85,7 @@ export default async function convertB3dmToI3sGeometry(
   generateBoundingVolumes: boolean,
   geoidHeightModel: Geoid,
   workerSource: {[key: string]: string}
-) {
+): Promise<I3SConvertedResources[] | null> {
   const useCartesianPositions = generateBoundingVolumes;
   const materialAndTextureList: I3SMaterialWithTexture[] = convertMaterials(
     tileContent.gltf?.materials
@@ -95,14 +97,14 @@ export default async function convertB3dmToI3sGeometry(
     dataForAttributesConversion,
     useCartesianPositions
   );
-  // TODO uncomment it when worker will be published on CDN.
-  /*
-  const convertedAttributesMap: Map<string, ConvertedAttributes> =
-    await transformI3SAttributesOnWorker(dataForAttributesConversion, {
-      useCartesianPositions,
-      source: workerSource.I3SAttributes
-    });
-  */
+  /** Usage of worker here brings more overhead than advantage */
+  // const convertedAttributesMap: Map<string, ConvertedAttributes> =
+  //   await transformI3SAttributesOnWorker(dataForAttributesConversion, {
+  //     reuseWorkers: true,
+  //     _nodeWorkers: true,
+  //     useCartesianPositions,
+  //     source: workerSource.I3SAttributes
+  //   });
 
   if (generateBoundingVolumes) {
     _generateBoundingVolumesFromGeometry(convertedAttributesMap, geoidHeightModel);
@@ -115,7 +117,6 @@ export default async function convertB3dmToI3sGeometry(
   }
 
   const result: I3SConvertedResources[] = [];
-  let nodesCounter = nodeId;
   let {materials = []} = tileContent.gltf || {materials: []};
   if (!materials?.length) {
     materials.push({id: 'default'});
@@ -130,13 +131,14 @@ export default async function convertB3dmToI3sGeometry(
       continue;
     }
     const {material, texture} = materialAndTextureList[i];
+    const nodeId = addNodeToNodePage();
     result.push(
       await _makeNodeResources({
         convertedAttributes,
         material,
         texture,
         tileContent,
-        nodeId: nodesCounter,
+        nodeId,
         featuresHashArray,
         propertyTable,
         attributeStorageInfo,
@@ -144,7 +146,6 @@ export default async function convertB3dmToI3sGeometry(
         workerSource
       })
     );
-    nodesCounter++;
   }
 
   if (!result.length) {
@@ -274,6 +275,7 @@ async function _makeNodeResources({
   }
 
   return {
+    nodeId,
     geometry: fileBuffer,
     compressedGeometry,
     texture,
@@ -297,7 +299,7 @@ export async function convertAttributes(
   attributesData: B3DMAttributesData,
   useCartesianPositions: boolean
 ): Promise<Map<string, ConvertedAttributes>> {
-  const {gltfMaterials, nodes, cartographicOrigin, cartesianModelMatrix} = attributesData;
+  const {gltfMaterials, nodes, images, cartographicOrigin, cartesianModelMatrix} = attributesData;
   const attributesMap = new Map<string, ConvertedAttributes>();
 
   for (const material of gltfMaterials || [{id: 'default'}]) {
@@ -314,6 +316,7 @@ export async function convertAttributes(
 
   convertNodes(
     nodes,
+    images,
     cartographicOrigin,
     cartesianModelMatrix,
     attributesMap,
@@ -344,6 +347,7 @@ export async function convertAttributes(
  * Gltf has hierarchical structure of nodes. This function converts nodes starting from those which are in gltf scene object.
  *   The goal is applying tranformation matrix for all children. Functions "convertNodes" and "convertNode" work together recursively.
  * @param nodes - gltf nodes array
+ * @param images - gltf images array
  * @param tileContent - 3d tile content
  * @param attributesMap - for recursive concatenation of attributes
  * @param useCartesianPositions - convert positions to absolute cartesian coordinates instead of cartographic offsets.
@@ -353,6 +357,7 @@ export async function convertAttributes(
  */
 function convertNodes(
   nodes: GLTFNodePostprocessed[],
+  images: GLTFImagePostprocessed[],
   cartographicOrigin: Vector3,
   cartesianModelMatrix: Matrix4,
   attributesMap: Map<string, ConvertedAttributes>,
@@ -363,6 +368,7 @@ function convertNodes(
     for (const node of nodes) {
       convertNode(
         node,
+        images,
         cartographicOrigin,
         cartesianModelMatrix,
         attributesMap,
@@ -406,6 +412,7 @@ function getCompositeTransformationMatrix(node, matrix) {
 /**
  * Convert all primitives of node and all children nodes
  * @param node - gltf node
+ * @param images - gltf images array
  * @param {Object} tileContent - 3d tile content
  * @param {Map} attributesMap Map<{positions: Float32Array, normals: Float32Array, texCoords: Float32Array, colors: Uint8Array, featureIndices: Array}> - for recursive concatenation of
  *   attributes
@@ -415,6 +422,7 @@ function getCompositeTransformationMatrix(node, matrix) {
  */
 function convertNode(
   node: GLTFNodePostprocessed,
+  images: GLTFImagePostprocessed[],
   cartographicOrigin: Vector3,
   cartesianModelMatrix: Matrix4,
   attributesMap: Map<string, ConvertedAttributes>,
@@ -424,7 +432,6 @@ function convertNode(
   const transformationMatrix = getCompositeTransformationMatrix(node, matrix);
 
   const mesh = node.mesh;
-  const images = node.images;
 
   if (mesh) {
     convertMesh(
@@ -440,6 +447,7 @@ function convertNode(
 
   convertNodes(
     node.children || [],
+    images,
     cartographicOrigin,
     cartesianModelMatrix,
     attributesMap,
@@ -461,7 +469,7 @@ function convertNode(
  */
 function convertMesh(
   mesh: GLTFMeshPostprocessed,
-  images: Image[],
+  images: GLTFImagePostprocessed[],
   cartographicOrigin: Vector3,
   cartesianModelMatrix: Matrix4,
   attributesMap: Map<string, ConvertedAttributes>,
@@ -695,8 +703,8 @@ function getBatchIds(
   attributes: {
     [key: string]: GLTFAccessorPostprocessed;
   },
-  primitive: MeshPrimitive,
-  images: Image[]
+  primitive: GLTFMeshPrimitivePostprocessed,
+  images: GLTFImagePostprocessed[]
 ): number[] {
   const batchIds: number[] = handleBatchIdsExtensions(attributes, primitive, images);
 
@@ -1293,15 +1301,16 @@ function generateFeatureIndexAttribute(featureIndex, faceRange) {
  * Find property table in tile
  * For example it can be batchTable for b3dm files or property table in gLTF extension.
  * @param sourceTile
+ * @return batch table from b3dm / feature properties from EXT_FEATURE_METADATA
  */
-export function getPropertyTable(sourceTile: Tile3D): FeatureTableJson | null {
-  const batchTableJson = sourceTile?.content?.batchTableJson;
+export function getPropertyTable(tileContent: B3DMContent): FeatureTableJson | null {
+  const batchTableJson = tileContent?.batchTableJson;
 
   if (batchTableJson) {
     return batchTableJson;
   }
 
-  const {extensionName, extension} = getPropertyTableExtension(sourceTile);
+  const {extensionName, extension} = getPropertyTableExtension(tileContent);
 
   switch (extensionName) {
     case EXT_MESH_FEATURES: {
@@ -1320,9 +1329,9 @@ export function getPropertyTable(sourceTile: Tile3D): FeatureTableJson | null {
  * Check extensions which can be with property table inside.
  * @param sourceTile
  */
-function getPropertyTableExtension(sourceTile: Tile3D) {
+function getPropertyTableExtension(tileContent: B3DMContent) {
   const extensionsWithPropertyTables = [EXT_FEATURE_METADATA, EXT_MESH_FEATURES];
-  const extensionsUsed = sourceTile?.content?.gltf?.extensionsUsed;
+  const extensionsUsed = tileContent?.gltf?.extensionsUsed;
 
   if (!extensionsUsed) {
     return {extensionName: null, extension: null};
@@ -1330,14 +1339,14 @@ function getPropertyTableExtension(sourceTile: Tile3D) {
 
   let extensionName: string = '';
 
-  for (const extensionItem of sourceTile?.content?.gltf?.extensionsUsed) {
+  for (const extensionItem of tileContent?.gltf?.extensionsUsed || []) {
     if (extensionsWithPropertyTables.includes(extensionItem)) {
       extensionName = extensionItem;
       break;
     }
   }
 
-  const extension = sourceTile?.content?.gltf?.extensions?.[extensionName];
+  const extension = tileContent?.gltf?.extensions?.[extensionName];
 
   return {extensionName, extension};
 }

package/src/i3s-converter/helpers/gltf-attributes.ts

@@ -1,9 +1,9 @@
 import type {B3DMContent} from '@loaders.gl/3d-tiles';
-import type {Accessor} from 'modules/gltf/src/lib/types/gltf-postprocessed-schema';
+import type {GLTFAccessorPostprocessed, GLTFNodePostprocessed} from '@loaders.gl/gltf';
 import type {B3DMAttributesData} from '../../i3s-attributes-worker';
 
 type AttributesObject = {
-  [k: string]: Accessor;
+  [k: string]: GLTFAccessorPostprocessed;
 };
 
 /**
@@ -38,46 +38,67 @@ export function prepareDataForAttributesConversion(tileContent: B3DMContent): B3
   const images =
     tileContent.gltf?.images?.map((imageObject) => {
       // Need data only for uncompressed images because we can't get batchIds from compressed textures.
-      const data = imageObject?.image?.compressed ? null : imageObject?.image?.data.subarray();
-      return {
-        data,
-        compressed: Boolean(imageObject?.image?.compressed),
-        height: imageObject.image.height,
-        width: imageObject.image.width,
-        components: imageObject.image.components,
-        mimeType: imageObject.mimeType
-      };
+      if (imageObject?.image?.compressed) {
+        return {
+          data: null,
+          compressed: true
+        };
+      } else {
+        const data = imageObject?.image?.data;
+        const dataCopy = new Uint8Array(data.length);
+        dataCopy.set(data);
+        return {
+          data: dataCopy,
+          compressed: false,
+          height: imageObject.image.height,
+          width: imageObject.image.width,
+          components: imageObject.image.components,
+          mimeType: imageObject.mimeType
+        };
+      }
     }) || [];
 
-  const prepearedNodes = nodes.map((node) => {
-    if (!node.mesh) {
-      return node;
-    }
-
-    return {
-      ...node,
-      images,
-      mesh: {
-        ...node.mesh,
-        primitives: node.mesh?.primitives.map((primitive) => ({
-          ...primitive,
-          indices: {value: primitive?.indices?.value},
-          attributes: getB3DMAttributesWithoutBufferView(primitive.attributes),
-          material: {
-            id: primitive?.material?.id
-          }
-        }))
-      }
-    };
-  });
+  prepareNodes(nodes);
 
   const cartographicOrigin = tileContent.cartographicOrigin;
   const cartesianModelMatrix = tileContent.cartesianModelMatrix;
 
   return {
     gltfMaterials,
-    nodes: prepearedNodes,
+    nodes,
+    images,
     cartographicOrigin,
     cartesianModelMatrix
   };
 }
+
+/**
+ * Traverse all nodes to replace all sensible data with copy to avoid data corruption in worker.
+ * @param nodes
+ */
+function prepareNodes(nodes: GLTFNodePostprocessed[]): void {
+  for (let index = 0; index < nodes.length; index++) {
+    const node = nodes[index] as any;
+
+    if (node.mesh) {
+      nodes[index] = {
+        ...node,
+        mesh: {
+          ...node.mesh,
+          primitives: node.mesh?.primitives.map((primitive) => ({
+            ...primitive,
+            indices: {value: primitive?.indices?.value},
+            attributes: getB3DMAttributesWithoutBufferView(primitive.attributes),
+            material: {
+              id: primitive?.material?.id
+            }
+          }))
+        }
+      };
+    }
+
+    if (node.children) {
+      prepareNodes(node.children);
+    }
+  }
+}

package/src/i3s-converter/helpers/node-pages.ts

@@ -79,6 +79,14 @@ export default class NodePages {
     return this.nodePages[pageIndex].nodes[nodeIndex];
   }
 
+  /**
+   * Update all fields in the node excluding id
+   */
+  updateAll(id: number, data: NodeInPage): void {
+    const node = this.getNodeById(id);
+    Object.assign(node, data, {index: node.index});
+  }
+
   /**
    * Update material in node.mesh object by node id
    * @param id - end-to-end index of the node
@@ -114,7 +122,7 @@ export default class NodePages {
    */
   updateNodeAttributeByNodeId(id: number): void {
     const node = this.getNodeById(id);
-    if (!node.mesh) {
+    if (!node.mesh || !node.index) {
       return;
     }
     node.mesh.attribute.resource = node.index;
@@ -164,7 +172,7 @@ export default class NodePages {
    * @param node - node object
    */
   updateResourceInMesh(node: NodeInPage): void {
-    if (node.mesh) {
+    if (node.mesh && isFinite(node.index)) {
       node.mesh.geometry.resource = node.index;
     }
   }