@loaders.gl/tile-converter 3.1.8 → 3.2.0-alpha.3

package/dist/esm/i3s-converter/helpers/geometry-converter.js

@@ -1,11 +1,12 @@
 import { Vector3, Matrix4, Vector4 } from '@math.gl/core';
 import { Ellipsoid } from '@math.gl/geospatial';
-import { DracoWriter } from '@loaders.gl/draco';
-import { encode, assert } from '@loaders.gl/core';
+import { DracoWriterWorker } from '@loaders.gl/draco';
+import { assert, encode } from '@loaders.gl/core';
 import { concatenateArrayBuffers, concatenateTypedArrays } from '@loaders.gl/loader-utils';
 import md5 from 'md5';
 import { generateAttributes } from './geometry-attributes';
 import { createBoundingVolumesFromGeometry } from './coordinate-converter';
+import { prepareDataForAttributesConversion } from './gltf-attributes';
 const DEFAULT_ROUGHNESS_FACTOR = 1;
 const DEFAULT_METALLIC_FACTOR = 1;
 const VALUES_PER_VERTEX = 3;
@@ -17,10 +18,13 @@ const DOUBLE_TYPE = 'Float64';
 const OBJECT_ID_TYPE = 'Oid32';
 const BATCHED_ID_POSSIBLE_ATTRIBUTE_NAMES = ['CUSTOM_ATTRIBUTE_2', '_BATCHID', 'BATCHID'];
 let scratchVector = new Vector3();
-export default async function convertB3dmToI3sGeometry(tileContent, nodeId, featuresHashArray, attributeStorageInfo, draco, generateBoundingVolumes, geoidHeightModel) {
+export default async function convertB3dmToI3sGeometry(tileContent, nodeId, featuresHashArray, attributeStorageInfo, draco, generateBoundingVolumes, geoidHeightModel, workerSource) {
+  var _tileContent$gltf;
+
   const useCartesianPositions = generateBoundingVolumes;
-  const materialAndTextureList = convertMaterials(tileContent);
-  const convertedAttributesMap = convertAttributes(tileContent, useCartesianPositions);
+  const materialAndTextureList = convertMaterials((_tileContent$gltf = tileContent.gltf) === null || _tileContent$gltf === void 0 ? void 0 : _tileContent$gltf.materials);
+  const dataForAttributesConversion = prepareDataForAttributesConversion(tileContent);
+  const convertedAttributesMap = await convertAttributes(dataForAttributesConversion, useCartesianPositions);
 
   if (generateBoundingVolumes) {
     _generateBoundingVolumesFromGeometry(convertedAttributesMap, geoidHeightModel);
@@ -36,7 +40,9 @@ export default async function convertB3dmToI3sGeometry(tileContent, nodeId, feat
   let nodesCounter = nodeId;
   let {
     materials = []
-  } = tileContent.gltf;
+  } = tileContent.gltf || {
+    materials: []
+  };
 
   if (!(materials !== null && materials !== void 0 && materials.length)) {
     materials.push({
@@ -52,6 +58,11 @@ export default async function convertB3dmToI3sGeometry(tileContent, nodeId, feat
     }
 
     const convertedAttributes = convertedAttributesMap.get(sourceMaterial.id);
+
+    if (!convertedAttributes) {
+      continue;
+    }
+
     const {
       material,
       texture
@@ -64,7 +75,8 @@ export default async function convertB3dmToI3sGeometry(tileContent, nodeId, feat
       nodeId: nodesCounter,
       featuresHashArray,
       attributeStorageInfo,
-      draco
+      draco,
+      workerSource
     }));
     nodesCounter++;
   }
@@ -100,11 +112,13 @@ async function _makeNodeResources({
   nodeId,
   featuresHashArray,
   attributeStorageInfo,
-  draco
+  draco,
+  workerSource
 }) {
+  var _tileContent$gltf2;
+
   const boundingVolumes = convertedAttributes.boundingVolumes;
   const vertexCount = convertedAttributes.positions.length / VALUES_PER_VERTEX;
-  const triangleCount = vertexCount / 3;
   const {
     faceRange,
     featureIds,
@@ -113,10 +127,7 @@ async function _makeNodeResources({
     colors,
     texCoords,
     featureCount
-  } = generateAttributes({
-    triangleCount,
-    ...convertedAttributes
-  });
+  } = generateAttributes(convertedAttributes);
 
   if (tileContent.batchTableJson) {
     makeFeatureIdsUnique(featureIds, convertedAttributes.featureIndices, featuresHashArray, tileContent.batchTableJson);
@@ -126,20 +137,20 @@ async function _makeNodeResources({
   const typedFeatureIds = generateBigUint64Array(featureIds);
   header.set([vertexCount, featureCount], 0);
   const fileBuffer = new Uint8Array(concatenateArrayBuffers(header.buffer, positions.buffer, normals.buffer, texture ? texCoords.buffer : new ArrayBuffer(0), colors.buffer, typedFeatureIds.buffer, faceRange.buffer));
-  const compressedGeometry = draco ? await generateCompressedGeometry(vertexCount, convertedAttributes, {
+  const compressedGeometry = draco ? generateCompressedGeometry(vertexCount, convertedAttributes, {
     positions,
     normals,
     texCoords: texture ? texCoords : new Float32Array(0),
     colors,
     featureIds,
     faceRange
-  }) : null;
+  }, workerSource.draco) : null;
   const attributes = convertBatchTableToAttributeBuffers(tileContent.batchTableJson, featureIds, attributeStorageInfo);
   return {
     geometry: fileBuffer,
     compressedGeometry,
     texture,
-    sharedResources: getSharedResources(tileContent, nodeId),
+    sharedResources: getSharedResources(((_tileContent$gltf2 = tileContent.gltf) === null || _tileContent$gltf2 === void 0 ? void 0 : _tileContent$gltf2.materials) || [], nodeId),
     meshMaterial: material,
     vertexCount,
     attributes,
@@ -148,12 +159,16 @@ async function _makeNodeResources({
   };
 }
 
-function convertAttributes(tileContent, useCartesianPositions) {
-  var _tileContent$gltf$sce;
-
+export async function convertAttributes(attributesData, useCartesianPositions) {
+  const {
+    gltfMaterials,
+    nodes,
+    cartographicOrigin,
+    cartesianModelMatrix
+  } = attributesData;
   const attributesMap = new Map();
 
-  for (const material of tileContent.gltf.materials || [{
+  for (const material of gltfMaterials || [{
     id: 'default'
   }]) {
     attributesMap.set(material.id, {
@@ -161,32 +176,39 @@ function convertAttributes(tileContent, useCartesianPositions) {
       normals: new Float32Array(0),
       texCoords: new Float32Array(0),
       colors: new Uint8Array(0),
+      featureIndicesGroups: [],
       featureIndices: [],
       boundingVolumes: null
     });
   }
 
-  const nodes = (tileContent.gltf.scene || ((_tileContent$gltf$sce = tileContent.gltf.scenes) === null || _tileContent$gltf$sce === void 0 ? void 0 : _tileContent$gltf$sce[0]) || tileContent.gltf).nodes;
-  convertNodes(nodes, tileContent, attributesMap, useCartesianPositions);
+  convertNodes(nodes, cartographicOrigin, cartesianModelMatrix, attributesMap, useCartesianPositions);
 
   for (const attrKey of attributesMap.keys()) {
     const attributes = attributesMap.get(attrKey);
 
+    if (!attributes) {
+      continue;
+    }
+
     if (attributes.positions.length === 0) {
       attributesMap.delete(attrKey);
       continue;
     }
 
-    attributes.featureIndices = attributes.featureIndices.reduce((acc, value) => acc.concat(value));
+    if (attributes.featureIndicesGroups) {
+      attributes.featureIndices = attributes.featureIndicesGroups.reduce((acc, value) => acc.concat(value));
+      delete attributes.featureIndicesGroups;
+    }
   }
 
   return attributesMap;
 }
 
-function convertNodes(nodes, tileContent, attributesMap, useCartesianPositions, matrix = new Matrix4([1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1])) {
+function convertNodes(nodes, cartographicOrigin, cartesianModelMatrix, attributesMap, useCartesianPositions, matrix = new Matrix4([1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1])) {
   if (nodes) {
     for (const node of nodes) {
-      convertNode(node, tileContent, attributesMap, useCartesianPositions, matrix);
+      convertNode(node, cartographicOrigin, cartesianModelMatrix, attributesMap, useCartesianPositions, matrix);
     }
   }
 }
@@ -204,6 +226,10 @@ function getCompositeTransformationMatrix(node, matrix) {
     transformationMatrix = matrix.multiplyRight(nodeMatrix);
   }
 
+  if (translation) {
+    transformationMatrix = transformationMatrix.translate(translation);
+  }
+
   if (rotation) {
     transformationMatrix = transformationMatrix.rotateXYZ(rotation);
   }
@@ -212,26 +238,24 @@ function getCompositeTransformationMatrix(node, matrix) {
     transformationMatrix = transformationMatrix.scale(scale);
   }
 
-  if (translation) {
-    transformationMatrix = transformationMatrix.translate(translation);
-  }
-
   return transformationMatrix;
 }
 
-function convertNode(node, tileContent, attributesMap, useCartesianPositions, matrix = new Matrix4([1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1])) {
+function convertNode(node, cartographicOrigin, cartesianModelMatrix, attributesMap, useCartesianPositions, matrix = new Matrix4([1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1])) {
   const transformationMatrix = getCompositeTransformationMatrix(node, matrix);
   const mesh = node.mesh;
 
   if (mesh) {
-    convertMesh(mesh, tileContent, attributesMap, useCartesianPositions, transformationMatrix);
+    convertMesh(mesh, cartographicOrigin, cartesianModelMatrix, attributesMap, useCartesianPositions, transformationMatrix);
   }
 
-  convertNodes(node.children, tileContent, attributesMap, useCartesianPositions, transformationMatrix);
+  convertNodes(node.children || [], cartographicOrigin, cartesianModelMatrix, attributesMap, useCartesianPositions, transformationMatrix);
 }
 
-function convertMesh(mesh, content, attributesMap, useCartesianPositions = false, matrix = new Matrix4([1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1])) {
+function convertMesh(mesh, cartographicOrigin, cartesianModelMatrix, attributesMap, useCartesianPositions = false, matrix = new Matrix4([1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1])) {
   for (const primitive of mesh.primitives) {
+    var _primitive$indices, _primitive$indices2, _primitive$indices3, _primitive$indices4, _primitive$indices5;
+
     let outputAttributes = null;
 
     if (primitive.material) {
@@ -242,27 +266,33 @@ function convertMesh(mesh, content, attributesMap, useCartesianPositions = false
 
     assert(outputAttributes !== null, 'Primitive - material mapping failed');
     const attributes = primitive.attributes;
+
+    if (!outputAttributes) {
+      continue;
+    }
+
     outputAttributes.positions = concatenateTypedArrays(outputAttributes.positions, transformVertexArray({
       vertices: attributes.POSITION.value,
-      cartographicOrigin: content.cartographicOrigin,
-      cartesianModelMatrix: content.cartesianModelMatrix,
+      cartographicOrigin,
+      cartesianModelMatrix,
       nodeMatrix: matrix,
-      indices: primitive.indices.value,
+      indices: (_primitive$indices = primitive.indices) === null || _primitive$indices === void 0 ? void 0 : _primitive$indices.value,
       attributeSpecificTransformation: transformVertexPositions,
       useCartesianPositions
     }));
     outputAttributes.normals = concatenateTypedArrays(outputAttributes.normals, transformVertexArray({
       vertices: attributes.NORMAL && attributes.NORMAL.value,
-      cartographicOrigin: content.cartographicOrigin,
-      cartesianModelMatrix: content.cartesianModelMatrix,
+      cartographicOrigin,
+      cartesianModelMatrix,
       nodeMatrix: matrix,
-      indices: primitive.indices.value,
+      indices: (_primitive$indices2 = primitive.indices) === null || _primitive$indices2 === void 0 ? void 0 : _primitive$indices2.value,
       attributeSpecificTransformation: transformVertexNormals,
       useCartesianPositions: false
     }));
-    outputAttributes.texCoords = concatenateTypedArrays(outputAttributes.texCoords, flattenTexCoords(attributes.TEXCOORD_0 && attributes.TEXCOORD_0.value, primitive.indices.value));
-    outputAttributes.colors = concatenateTypedArrays(outputAttributes.colors, flattenColors(attributes.COLOR_0, primitive.indices.value));
-    outputAttributes.featureIndices.push(flattenBatchIds(getBatchIdsByAttributeName(attributes), primitive.indices.value));
+    outputAttributes.texCoords = concatenateTypedArrays(outputAttributes.texCoords, flattenTexCoords(attributes.TEXCOORD_0 && attributes.TEXCOORD_0.value, (_primitive$indices3 = primitive.indices) === null || _primitive$indices3 === void 0 ? void 0 : _primitive$indices3.value));
+    outputAttributes.colors = concatenateTypedArrays(outputAttributes.colors, flattenColors(attributes.COLOR_0, (_primitive$indices4 = primitive.indices) === null || _primitive$indices4 === void 0 ? void 0 : _primitive$indices4.value));
+    outputAttributes.featureIndicesGroups = outputAttributes.featureIndicesGroups || [];
+    outputAttributes.featureIndicesGroups.push(flattenBatchIds(getBatchIdsByAttributeName(attributes), (_primitive$indices5 = primitive.indices) === null || _primitive$indices5 === void 0 ? void 0 : _primitive$indices5.value));
   }
 }
 
@@ -402,9 +432,8 @@ function getBatchIdsByAttributeName(attributes) {
   return batchIds;
 }
 
-function convertMaterials(tileContent) {
+function convertMaterials(sourceMaterials = []) {
   const result = [];
-  const sourceMaterials = tileContent.gltf.materials || [];
 
   for (const sourceMaterial of sourceMaterials) {
     result.push(convertMaterial(sourceMaterial));
@@ -414,12 +443,12 @@ function convertMaterials(tileContent) {
 }
 
 function convertMaterial(sourceMaterial) {
-  var _sourceMaterial$pbrMe, _sourceMaterial$pbrMe2, _sourceMaterial$pbrMe3;
+  var _sourceMaterial$emiss, _sourceMaterial$pbrMe, _sourceMaterial$pbrMe2, _sourceMaterial$pbrMe3;
 
   const material = {
     doubleSided: sourceMaterial.doubleSided,
-    emissiveFactor: sourceMaterial.emissiveFactor.map(c => Math.round(c * 255)),
-    alphaMode: (sourceMaterial.alphaMode || 'OPAQUE').toLowerCase(),
+    emissiveFactor: (_sourceMaterial$emiss = sourceMaterial.emissiveFactor) === null || _sourceMaterial$emiss === void 0 ? void 0 : _sourceMaterial$emiss.map(c => Math.round(c * 255)),
+    alphaMode: convertAlphaMode(sourceMaterial.alphaMode),
     pbrMetallicRoughness: {
       roughnessFactor: (sourceMaterial === null || sourceMaterial === void 0 ? void 0 : (_sourceMaterial$pbrMe = sourceMaterial.pbrMetallicRoughness) === null || _sourceMaterial$pbrMe === void 0 ? void 0 : _sourceMaterial$pbrMe.roughnessFactor) || DEFAULT_ROUGHNESS_FACTOR,
       metallicFactor: (sourceMaterial === null || sourceMaterial === void 0 ? void 0 : (_sourceMaterial$pbrMe2 = sourceMaterial.pbrMetallicRoughness) === null || _sourceMaterial$pbrMe2 === void 0 ? void 0 : _sourceMaterial$pbrMe2.metallicFactor) || DEFAULT_METALLIC_FACTOR
@@ -452,15 +481,33 @@ function convertMaterial(sourceMaterial) {
   };
 }
 
+function convertAlphaMode(gltfAlphaMode) {
+  switch (gltfAlphaMode) {
+    case 'OPAQUE':
+      return 'opaque';
+
+    case 'MASK':
+      return 'mask';
+
+    case 'BLEND':
+      return 'blend';
+
+    default:
+      return 'opaque';
+  }
+}
+
 function getDefaultMaterial() {
   return {
     alphaMode: 'opaque',
-    pbrMetallicRoughness: {}
+    pbrMetallicRoughness: {
+      metallicFactor: 1,
+      roughnessFactor: 1
+    }
   };
 }
 
-function getSharedResources(tileContent, nodeId) {
-  const gltfMaterials = tileContent.gltf.materials;
+function getSharedResources(gltfMaterials, nodeId) {
   const i3sResources = {};
 
   if (!gltfMaterials || !gltfMaterials.length) {
@@ -507,7 +554,7 @@ function convertGLTFMaterialToI3sSharedResources(gltfMaterial, nodeId) {
   }
 
   return {
-    materialDefinitionInfo: extractSharedResourcesMaterialInfo(colorFactor, metallicFactor),
+    materialDefinitionInfo: extractSharedResourcesMaterialInfo(colorFactor || [1, 1, 1, 1], metallicFactor),
     textureDefinitionInfo
   };
 }
@@ -523,27 +570,34 @@ function extractSharedResourcesMaterialInfo(baseColorFactor, metallicFactor = 1)
   dielectricSpecular[3] = 1;
   const specular = dielectricSpecular.lerp(dielectricSpecular, baseColorVector, metallicFactor);
   return {
-    diffuse: diffuse.toArray(),
-    specular: specular.toArray()
+    params: {
+      diffuse: diffuse.toArray(),
+      specular: specular.toArray(),
+      renderMode: 'solid'
+    }
   };
 }
 
 function extractSharedResourcesTextureInfo(texture, nodeId) {
+  var _texture$source, _texture$source2, _texture$source3;
+
   return {
-    encoding: [texture.source.mimeType],
+    encoding: texture !== null && texture !== void 0 && (_texture$source = texture.source) !== null && _texture$source !== void 0 && _texture$source.mimeType ? [texture.source.mimeType] : undefined,
     images: [{
       id: generateImageId(texture, nodeId),
-      size: texture.source.image.width,
-      length: [texture.source.image.data.length]
+      size: (_texture$source2 = texture.source) === null || _texture$source2 === void 0 ? void 0 : _texture$source2.image.width,
+      length: [(_texture$source3 = texture.source) === null || _texture$source3 === void 0 ? void 0 : _texture$source3.image.data.length]
     }]
   };
 }
 
 function generateImageId(texture, nodeId) {
+  var _texture$source4;
+
   const {
     width,
     height
-  } = texture.source.image;
+  } = (_texture$source4 = texture.source) === null || _texture$source4 === void 0 ? void 0 : _texture$source4.image;
   const levelCountOfTexture = 1;
   const indexOfLevel = 0;
   const indexOfTextureInStore = nodeId + 1;
@@ -634,7 +688,9 @@ function convertBatchTableToAttributeBuffers(batchTable, featureIds, attributeSt
           attributeBuffer = generateStringAttributeBuffer(batchTableWithFeatureIds[key]);
       }
 
-      attributeBuffers.push(attributeBuffer);
+      if (attributeBuffer) {
+        attributeBuffers.push(attributeBuffer);
+      }
     }
   }
 
@@ -688,7 +744,7 @@ function generateBigUint64Array(featureIds) {
   return typedFeatureIds;
 }
 
-async function generateCompressedGeometry(vertexCount, convertedAttributes, attributes) {
+async function generateCompressedGeometry(vertexCount, convertedAttributes, attributes, dracoWorkerSoure) {
   const {
     positions,
     normals,
@@ -722,15 +778,18 @@ async function generateCompressedGeometry(vertexCount, convertedAttributes, attr
       'i3s-feature-ids': new Int32Array(featureIds)
     }
   };
-  return new Uint8Array(await encode({
+  return encode({
     attributes: compressedAttributes,
     indices
-  }, DracoWriter, {
+  }, DracoWriterWorker, { ...DracoWriterWorker.options,
+    source: dracoWorkerSoure,
+    reuseWorkers: true,
+    _nodeWorkers: true,
     draco: {
       method: 'MESH_SEQUENTIAL_ENCODING',
       attributesMetadata
     }
-  }));
+  });
 }
 
 function generateFeatureIndexAttribute(featureIndex, faceRange) {