@loaders.gl/tile-converter 3.3.0-alpha.1 → 3.3.0-alpha.10

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

@@ -4,10 +4,13 @@ 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 { v4 as uuidv4 } from 'uuid';
 import { generateAttributes } from './geometry-attributes';
 import { createBoundingVolumesFromGeometry } from './coordinate-converter';
 import { prepareDataForAttributesConversion } from './gltf-attributes';
 import { handleBatchIdsExtensions } from './batch-ids-extensions';
+import { checkPropertiesLength, flattenPropertyTableByFeatureIds } from './feature-attributes';
+
 const DEFAULT_ROUGHNESS_FACTOR = 1;
 const DEFAULT_METALLIC_FACTOR = 1;
 const VALUES_PER_VERTEX = 3;
@@ -18,74 +21,52 @@ const SHORT_INT_TYPE = 'Int32';
 const DOUBLE_TYPE = 'Float64';
 const OBJECT_ID_TYPE = 'Oid32';
 const BATCHED_ID_POSSIBLE_ATTRIBUTE_NAMES = ['CUSTOM_ATTRIBUTE_2', '_BATCHID', 'BATCHID'];
+const EXT_FEATURE_METADATA = 'EXT_feature_metadata';
+const EXT_MESH_FEATURES = 'EXT_mesh_features';
 let scratchVector = new Vector3();
-export default async function convertB3dmToI3sGeometry(tileContent, nodeId, featuresHashArray, attributeStorageInfo, draco, generateBoundingVolumes, geoidHeightModel, workerSource) {
-  var _tileContent$gltf;
 
+export default async function convertB3dmToI3sGeometry(tileContent, addNodeToNodePage, propertyTable, featuresHashArray, attributeStorageInfo, draco, generateBoundingVolumes, shouldMergeMaterials, geoidHeightModel, workerSource) {
+  var _tileContent$gltf;
   const useCartesianPositions = generateBoundingVolumes;
-  const materialAndTextureList = convertMaterials((_tileContent$gltf = tileContent.gltf) === null || _tileContent$gltf === void 0 ? void 0 : _tileContent$gltf.materials);
+  const materialAndTextureList = await convertMaterials((_tileContent$gltf = tileContent.gltf) === null || _tileContent$gltf === void 0 ? void 0 : _tileContent$gltf.materials, shouldMergeMaterials);
   const dataForAttributesConversion = prepareDataForAttributesConversion(tileContent);
-  const convertedAttributesMap = await convertAttributes(dataForAttributesConversion, useCartesianPositions);
+  const convertedAttributesMap = await convertAttributes(dataForAttributesConversion, materialAndTextureList, useCartesianPositions);
 
   if (generateBoundingVolumes) {
     _generateBoundingVolumesFromGeometry(convertedAttributesMap, geoidHeightModel);
   }
-
-  if (convertedAttributesMap.has('default')) {
-    materialAndTextureList.push({
-      material: getDefaultMaterial()
-    });
-  }
-
   const result = [];
-  let nodesCounter = nodeId;
-  let {
-    materials = []
-  } = tileContent.gltf || {
-    materials: []
-  };
-
-  if (!(materials !== null && materials !== void 0 && materials.length)) {
-    materials.push({
-      id: 'default'
-    });
-  }
-
-  for (let i = 0; i < materials.length; i++) {
-    const sourceMaterial = materials[i];
-
-    if (!convertedAttributesMap.has(sourceMaterial.id)) {
+  for (const materialAndTexture of materialAndTextureList) {
+    const originarMaterialId = materialAndTexture.mergedMaterials[0].originalMaterialId;
+    if (!convertedAttributesMap.has(originarMaterialId)) {
       continue;
     }
 
-    const convertedAttributes = convertedAttributesMap.get(sourceMaterial.id);
-
+    const convertedAttributes = convertedAttributesMap.get(originarMaterialId);
     if (!convertedAttributes) {
       continue;
     }
-
     const {
       material,
       texture
-    } = materialAndTextureList[i];
+    } = materialAndTexture;
+    const nodeId = await addNodeToNodePage();
     result.push(await _makeNodeResources({
       convertedAttributes,
       material,
       texture,
       tileContent,
-      nodeId: nodesCounter,
+      nodeId,
       featuresHashArray,
+      propertyTable,
       attributeStorageInfo,
       draco,
       workerSource
     }));
-    nodesCounter++;
   }
-
   if (!result.length) {
     return null;
   }
-
   return result;
 }
 
@@ -94,7 +75,6 @@ function _generateBoundingVolumesFromGeometry(convertedAttributesMap, geoidHeigh
     const boundingVolumes = createBoundingVolumesFromGeometry(attributes.positions, geoidHeightModel);
     attributes.boundingVolumes = boundingVolumes;
     const cartographicOrigin = boundingVolumes.obb.center;
-
     for (let index = 0; index < attributes.positions.length; index += VALUES_PER_VERTEX) {
       const vertex = attributes.positions.subarray(index, index + VALUES_PER_VERTEX);
       Ellipsoid.WGS84.cartesianToCartographic(Array.from(vertex), scratchVector);
@@ -105,19 +85,20 @@ function _generateBoundingVolumesFromGeometry(convertedAttributesMap, geoidHeigh
   }
 }
 
-async function _makeNodeResources({
-  convertedAttributes,
-  material,
-  texture,
-  tileContent,
-  nodeId,
-  featuresHashArray,
-  attributeStorageInfo,
-  draco,
-  workerSource
-}) {
+async function _makeNodeResources(_ref) {
   var _tileContent$gltf2;
-
+  let {
+    convertedAttributes,
+    material,
+    texture,
+    tileContent,
+    nodeId,
+    featuresHashArray,
+    propertyTable,
+    attributeStorageInfo,
+    draco,
+    workerSource
+  } = _ref;
   const boundingVolumes = convertedAttributes.boundingVolumes;
   const vertexCount = convertedAttributes.positions.length / VALUES_PER_VERTEX;
   const {
@@ -126,31 +107,36 @@ async function _makeNodeResources({
     positions,
     normals,
     colors,
+    uvRegions,
     texCoords,
     featureCount
   } = generateAttributes(convertedAttributes);
-
   if (tileContent.batchTableJson) {
     makeFeatureIdsUnique(featureIds, convertedAttributes.featureIndices, featuresHashArray, tileContent.batchTableJson);
   }
-
   const header = new Uint32Array(2);
   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 fileBuffer = new Uint8Array(concatenateArrayBuffers(header.buffer, positions.buffer, normals.buffer, texture ? texCoords.buffer : new ArrayBuffer(0), colors.buffer, uvRegions, typedFeatureIds.buffer, faceRange.buffer));
   const compressedGeometry = draco ? generateCompressedGeometry(vertexCount, convertedAttributes, {
     positions,
     normals,
     texCoords: texture ? texCoords : new Float32Array(0),
     colors,
+    uvRegions,
     featureIds,
     faceRange
   }, workerSource.draco) : null;
-  const attributes = convertBatchTableToAttributeBuffers(tileContent.batchTableJson, featureIds, attributeStorageInfo);
+  let attributes = [];
+  if (attributeStorageInfo && propertyTable) {
+    attributes = convertPropertyTableToAttributeBuffers(featureIds, propertyTable, attributeStorageInfo);
+  }
   return {
+    nodeId,
     geometry: fileBuffer,
     compressedGeometry,
     texture,
+    hasUvRegions: Boolean(uvRegions.length),
     sharedResources: getSharedResources(((_tileContent$gltf2 = tileContent.gltf) === null || _tileContent$gltf2 === void 0 ? void 0 : _tileContent$gltf2.materials) || [], nodeId),
     meshMaterial: material,
     vertexCount,
@@ -160,38 +146,36 @@ async function _makeNodeResources({
   };
 }
 
-export async function convertAttributes(attributesData, useCartesianPositions) {
+export async function convertAttributes(attributesData, materialAndTextureList, useCartesianPositions) {
   const {
-    gltfMaterials,
     nodes,
+    images,
     cartographicOrigin,
     cartesianModelMatrix
   } = attributesData;
   const attributesMap = new Map();
-
-  for (const material of gltfMaterials || [{
-    id: 'default'
-  }]) {
-    attributesMap.set(material.id, {
+  for (const materialAndTexture of materialAndTextureList) {
+    const attributes = {
       positions: new Float32Array(0),
       normals: new Float32Array(0),
       texCoords: new Float32Array(0),
       colors: new Uint8Array(0),
+      uvRegions: new Uint16Array(0),
       featureIndicesGroups: [],
       featureIndices: [],
-      boundingVolumes: null
-    });
+      boundingVolumes: null,
+      mergedMaterials: materialAndTexture.mergedMaterials
+    };
+    for (const mergedMaterial of materialAndTexture.mergedMaterials) {
+      attributesMap.set(mergedMaterial.originalMaterialId, attributes);
+    }
   }
-
-  convertNodes(nodes, cartographicOrigin, cartesianModelMatrix, attributesMap, useCartesianPositions);
-
+  convertNodes(nodes, images, 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;
@@ -202,14 +186,14 @@ export async function convertAttributes(attributesData, useCartesianPositions) {
       delete attributes.featureIndicesGroups;
     }
   }
-
   return attributesMap;
 }
 
-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])) {
+function convertNodes(nodes, images, cartographicOrigin, cartesianModelMatrix, attributesMap, useCartesianPositions) {
+  let matrix = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : 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, cartographicOrigin, cartesianModelMatrix, attributesMap, useCartesianPositions, matrix);
+      convertNode(node, images, cartographicOrigin, cartesianModelMatrix, attributesMap, useCartesianPositions, matrix);
     }
   }
 }
@@ -222,57 +206,56 @@ function getCompositeTransformationMatrix(node, matrix) {
     scale,
     translation
   } = node;
-
   if (nodeMatrix) {
     transformationMatrix = matrix.multiplyRight(nodeMatrix);
   }
-
   if (translation) {
     transformationMatrix = transformationMatrix.translate(translation);
   }
-
   if (rotation) {
     transformationMatrix = transformationMatrix.rotateXYZ(rotation);
   }
-
   if (scale) {
     transformationMatrix = transformationMatrix.scale(scale);
   }
-
   return transformationMatrix;
 }
 
-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])) {
+function convertNode(node, images, cartographicOrigin, cartesianModelMatrix, attributesMap, useCartesianPositions) {
+  let matrix = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : 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;
-  const images = node.images;
-
   if (mesh) {
     convertMesh(mesh, images, cartographicOrigin, cartesianModelMatrix, attributesMap, useCartesianPositions, transformationMatrix);
   }
-
-  convertNodes(node.children || [], cartographicOrigin, cartesianModelMatrix, attributesMap, useCartesianPositions, transformationMatrix);
+  convertNodes(node.children || [], images, cartographicOrigin, cartesianModelMatrix, attributesMap, useCartesianPositions, transformationMatrix);
 }
 
-function convertMesh(mesh, images, cartographicOrigin, cartesianModelMatrix, 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, images, cartographicOrigin, cartesianModelMatrix, attributesMap) {
+  let useCartesianPositions = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : false;
+  let matrix = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : 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;
-
+    var _primitive$indices, _primitive$indices2, _primitive$indices3, _primitive$indices4, _primitive$indices6;
     let outputAttributes = null;
-
+    let materialUvRegion;
     if (primitive.material) {
-      outputAttributes = attributesMap.get(primitive.material.id);
+      var _outputAttributes, _outputAttributes$mer;
+      outputAttributes = attributesMap.get(primitive.material.uniqueId);
+      materialUvRegion = (_outputAttributes = outputAttributes) === null || _outputAttributes === void 0 ? void 0 : (_outputAttributes$mer = _outputAttributes.mergedMaterials.find(_ref2 => {
+        var _primitive$material;
+        let {
+          originalMaterialId
+        } = _ref2;
+        return originalMaterialId === ((_primitive$material = primitive.material) === null || _primitive$material === void 0 ? void 0 : _primitive$material.uniqueId);
+      })) === null || _outputAttributes$mer === void 0 ? void 0 : _outputAttributes$mer.uvRegion;
     } else if (attributesMap.has('default')) {
       outputAttributes = attributesMap.get('default');
     }
-
     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,
@@ -293,8 +276,12 @@ function convertMesh(mesh, images, cartographicOrigin, cartesianModelMatrix, att
     }));
     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));
+    if (materialUvRegion) {
+      var _primitive$indices5;
+      outputAttributes.uvRegions = concatenateTypedArrays(outputAttributes.uvRegions, createUvRegion(materialUvRegion, (_primitive$indices5 = primitive.indices) === null || _primitive$indices5 === void 0 ? void 0 : _primitive$indices5.value));
+    }
     outputAttributes.featureIndicesGroups = outputAttributes.featureIndicesGroups || [];
-    outputAttributes.featureIndicesGroups.push(flattenBatchIds(getBatchIds(attributes, primitive, images), (_primitive$indices5 = primitive.indices) === null || _primitive$indices5 === void 0 ? void 0 : _primitive$indices5.value));
+    outputAttributes.featureIndicesGroups.push(flattenBatchIds(getBatchIds(attributes, primitive, images), (_primitive$indices6 = primitive.indices) === null || _primitive$indices6 === void 0 ? void 0 : _primitive$indices6.value));
   }
 }
 
@@ -305,11 +292,9 @@ function transformVertexArray(args) {
     attributeSpecificTransformation
   } = args;
   const newVertices = new Float32Array(indices.length * VALUES_PER_VERTEX);
-
   if (!vertices) {
     return newVertices;
   }
-
   for (let i = 0; i < indices.length; i++) {
     const coordIndex = indices[i] * VALUES_PER_VERTEX;
     const vertex = vertices.subarray(coordIndex, coordIndex + VALUES_PER_VERTEX);
@@ -319,7 +304,6 @@ function transformVertexArray(args) {
     newVertices[i * VALUES_PER_VERTEX + 1] = vertexVector.y;
     newVertices[i * VALUES_PER_VERTEX + 2] = vertexVector.z;
   }
-
   return newVertices;
 }
 
@@ -330,17 +314,13 @@ function transformVertexPositions(vertexVector, calleeArgs) {
     nodeMatrix,
     useCartesianPositions
   } = calleeArgs;
-
   if (nodeMatrix) {
     vertexVector = vertexVector.transform(nodeMatrix);
   }
-
   vertexVector = vertexVector.transform(cartesianModelMatrix);
-
   if (useCartesianPositions) {
     return vertexVector;
   }
-
   Ellipsoid.WGS84.cartesianToCartographic([vertexVector[0], vertexVector[1], vertexVector[2]], vertexVector);
   vertexVector = vertexVector.subtract(cartographicOrigin);
   return vertexVector;
@@ -351,105 +331,168 @@ function transformVertexNormals(vertexVector, calleeArgs) {
     cartesianModelMatrix,
     nodeMatrix
   } = calleeArgs;
-
   if (nodeMatrix) {
     vertexVector = vertexVector.transformAsVector(nodeMatrix);
   }
-
   vertexVector = vertexVector.transformAsVector(cartesianModelMatrix);
   return vertexVector;
 }
 
 function flattenTexCoords(texCoords, indices) {
   const newTexCoords = new Float32Array(indices.length * VALUES_PER_TEX_COORD);
-
   if (!texCoords) {
     newTexCoords.fill(1);
     return newTexCoords;
   }
-
   for (let i = 0; i < indices.length; i++) {
     const coordIndex = indices[i] * VALUES_PER_TEX_COORD;
     const texCoord = texCoords.subarray(coordIndex, coordIndex + VALUES_PER_TEX_COORD);
     newTexCoords[i * VALUES_PER_TEX_COORD] = texCoord[0];
     newTexCoords[i * VALUES_PER_TEX_COORD + 1] = texCoord[1];
   }
-
   return newTexCoords;
 }
 
 function flattenColors(colorsAttribute, indices) {
   const components = (colorsAttribute === null || colorsAttribute === void 0 ? void 0 : colorsAttribute.components) || VALUES_PER_COLOR_ELEMENT;
   const newColors = new Uint8Array(indices.length * components);
-
   if (!colorsAttribute) {
     newColors.fill(255);
     return newColors;
   }
-
   const colors = colorsAttribute.value;
-
   for (let i = 0; i < indices.length; i++) {
     const colorIndex = indices[i] * components;
     const color = colors.subarray(colorIndex, colorIndex + components);
     const colorUint8 = new Uint8Array(components);
-
     for (let j = 0; j < color.length; j++) {
       colorUint8[j] = color[j] * 255;
     }
-
     newColors.set(colorUint8, i * components);
   }
-
   return newColors;
 }
 
+function createUvRegion(materialUvRegion, indices) {
+  const result = new Uint16Array(indices.length * 4);
+  for (let i = 0; i < result.length; i += 4) {
+    result.set(materialUvRegion, i);
+  }
+  return result;
+}
+
 function flattenBatchIds(batchedIds, indices) {
   if (!batchedIds.length || !indices.length) {
     return [];
   }
-
   const newBatchIds = [];
-
   for (let i = 0; i < indices.length; i++) {
     const coordIndex = indices[i];
     newBatchIds.push(batchedIds[coordIndex]);
   }
-
   return newBatchIds;
 }
 
 function getBatchIds(attributes, primitive, images) {
   const batchIds = handleBatchIdsExtensions(attributes, primitive, images);
-
   if (batchIds.length) {
     return batchIds;
   }
-
   for (let index = 0; index < BATCHED_ID_POSSIBLE_ATTRIBUTE_NAMES.length; index++) {
     const possibleBatchIdAttributeName = BATCHED_ID_POSSIBLE_ATTRIBUTE_NAMES[index];
-
     if (attributes[possibleBatchIdAttributeName] && attributes[possibleBatchIdAttributeName].value) {
       return attributes[possibleBatchIdAttributeName].value;
     }
   }
-
   return [];
 }
 
-function convertMaterials(sourceMaterials = []) {
-  const result = [];
-
+async function convertMaterials() {
+  let sourceMaterials = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  let shouldMergeMaterials = arguments.length > 1 ? arguments[1] : undefined;
+  let materials = [];
   for (const sourceMaterial of sourceMaterials) {
-    result.push(convertMaterial(sourceMaterial));
+    materials.push(convertMaterial(sourceMaterial));
+  }
+  if (shouldMergeMaterials) {
+    materials = await mergeAllMaterials(materials);
   }
+  return materials;
+}
 
+async function mergeAllMaterials(materials) {
+  const result = [];
+  while (materials.length > 0) {
+    let newMaterial = materials.splice(0, 1)[0];
+    const mergedIndices = [];
+    for (let i = 0; i < materials.length; i++) {
+      const material = materials[i];
+      if (newMaterial.texture && material.texture || !newMaterial.texture && !material.texture) {
+        newMaterial = await mergeMaterials(newMaterial, material);
+        mergedIndices.push(i);
+      }
+    }
+    if (newMaterial.texture && mergedIndices.length) {
+      var _newMaterial$mergedMa, _newMaterial$mergedMa2;
+      const newWidth = (_newMaterial$mergedMa = newMaterial.mergedMaterials) === null || _newMaterial$mergedMa === void 0 ? void 0 : _newMaterial$mergedMa.reduce((accum, _ref3) => {
+        let {
+          textureSize
+        } = _ref3;
+        return accum + ((textureSize === null || textureSize === void 0 ? void 0 : textureSize.width) || 0);
+      }, 0);
+      const newHeight = (_newMaterial$mergedMa2 = newMaterial.mergedMaterials) === null || _newMaterial$mergedMa2 === void 0 ? void 0 : _newMaterial$mergedMa2.reduce((accum, _ref4) => {
+        let {
+          textureSize
+        } = _ref4;
+        return Math.max(accum, (textureSize === null || textureSize === void 0 ? void 0 : textureSize.height) || 0);
+      }, 0);
+      let currentX = -1;
+      for (const aTextureMetadata of newMaterial.mergedMaterials) {
+        if (aTextureMetadata.textureSize) {
+          const newX = currentX + 1 + aTextureMetadata.textureSize.width / newWidth * 2 ** (Uint16Array.BYTES_PER_ELEMENT * 8) - 1;
+          aTextureMetadata.uvRegion = new Uint16Array([currentX + 1, 0, newX, aTextureMetadata.textureSize.height / newHeight * 2 ** (Uint16Array.BYTES_PER_ELEMENT * 8) - 1]);
+          currentX = newX;
+        }
+      }
+      newMaterial.texture.image.width = newWidth;
+      newMaterial.texture.image.height = newHeight;
+    }
+    for (const index of mergedIndices.reverse()) {
+      materials.splice(index, 1);
+    }
+    result.push(newMaterial);
+  }
+  if (!result.length) {
+    result.push({
+      material: getDefaultMaterial(),
+      mergedMaterials: [{
+        originalMaterialId: 'default'
+      }]
+    });
+  }
   return result;
 }
 
+async function mergeMaterials(material1, material2) {
+  var _material1$texture, _material2$texture;
+  if ((_material1$texture = material1.texture) !== null && _material1$texture !== void 0 && _material1$texture.bufferView && (_material2$texture = material2.texture) !== null && _material2$texture !== void 0 && _material2$texture.bufferView && material1.mergedMaterials && material2.mergedMaterials) {
+    const buffer1 = Buffer.from(material1.texture.bufferView.data);
+    const buffer2 = Buffer.from(material2.texture.bufferView.data);
+    const {
+      joinImages
+    } = await import('join-images');
+    const sharpData = await joinImages([buffer1, buffer2], {
+      direction: 'horizontal'
+    });
+    material1.texture.bufferView.data = await sharpData.toFormat(material1.texture.mimeType === 'image/png' ? 'png' : 'jpeg').toBuffer();
+    material1.material.pbrMetallicRoughness.baseColorTexture.textureSetDefinitionId = 1;
+  }
+  material1.mergedMaterials = material1.mergedMaterials.concat(material2.mergedMaterials);
+  return material1;
+}
+
 function convertMaterial(sourceMaterial) {
   var _sourceMaterial$emiss, _sourceMaterial$pbrMe, _sourceMaterial$pbrMe2, _sourceMaterial$pbrMe3;
-
   const material = {
     doubleSided: sourceMaterial.doubleSided,
     emissiveFactor: (_sourceMaterial$emiss = sourceMaterial.emissiveFactor) === null || _sourceMaterial$emiss === void 0 ? void 0 : _sourceMaterial$emiss.map(c => Math.round(c * 255)),
@@ -460,7 +503,6 @@ function convertMaterial(sourceMaterial) {
     }
   };
   let texture;
-
   if (sourceMaterial !== null && sourceMaterial !== void 0 && (_sourceMaterial$pbrMe3 = sourceMaterial.pbrMetallicRoughness) !== null && _sourceMaterial$pbrMe3 !== void 0 && _sourceMaterial$pbrMe3.baseColorTexture) {
     texture = sourceMaterial.pbrMetallicRoughness.baseColorTexture.texture.source;
     material.pbrMetallicRoughness.baseColorTexture = {
@@ -472,17 +514,25 @@ function convertMaterial(sourceMaterial) {
       textureSetDefinitionId: 0
     };
   }
-
+  const uniqueId = uuidv4();
+  sourceMaterial.uniqueId = uniqueId;
+  let mergedMaterials = [{
+    originalMaterialId: uniqueId
+  }];
   if (!texture) {
     var _sourceMaterial$pbrMe4;
-
     const baseColorFactor = sourceMaterial === null || sourceMaterial === void 0 ? void 0 : (_sourceMaterial$pbrMe4 = sourceMaterial.pbrMetallicRoughness) === null || _sourceMaterial$pbrMe4 === void 0 ? void 0 : _sourceMaterial$pbrMe4.baseColorFactor;
     material.pbrMetallicRoughness.baseColorFactor = baseColorFactor && baseColorFactor.map(c => Math.round(c * 255)) || undefined;
+  } else {
+    mergedMaterials[0].textureSize = {
+      width: texture.image.width,
+      height: texture.image.height
+    };
   }
-
   return {
     material,
-    texture
+    texture,
+    mergedMaterials
   };
 }
 
@@ -490,13 +540,10 @@ function convertAlphaMode(gltfAlphaMode) {
   switch (gltfAlphaMode) {
     case 'OPAQUE':
       return 'opaque';
-
     case 'MASK':
       return 'mask';
-
     case 'BLEND':
       return 'blend';
-
     default:
       return 'opaque';
   }
@@ -514,57 +561,48 @@ function getDefaultMaterial() {
 
 function getSharedResources(gltfMaterials, nodeId) {
   const i3sResources = {};
-
   if (!gltfMaterials || !gltfMaterials.length) {
     return i3sResources;
   }
-
   i3sResources.materialDefinitionInfos = [];
-
   for (const gltfMaterial of gltfMaterials) {
     const {
       materialDefinitionInfo,
       textureDefinitionInfo
     } = convertGLTFMaterialToI3sSharedResources(gltfMaterial, nodeId);
     i3sResources.materialDefinitionInfos.push(materialDefinitionInfo);
-
     if (textureDefinitionInfo) {
       i3sResources.textureDefinitionInfos = i3sResources.textureDefinitionInfos || [];
       i3sResources.textureDefinitionInfos.push(textureDefinitionInfo);
     }
   }
-
   return i3sResources;
 }
 
 function convertGLTFMaterialToI3sSharedResources(gltfMaterial, nodeId) {
   var _gltfMaterial$pbrMeta;
-
   const texture = (gltfMaterial === null || gltfMaterial === void 0 ? void 0 : (_gltfMaterial$pbrMeta = gltfMaterial.pbrMetallicRoughness) === null || _gltfMaterial$pbrMeta === void 0 ? void 0 : _gltfMaterial$pbrMeta.baseColorTexture) || gltfMaterial.emissiveTexture;
   let textureDefinitionInfo = null;
-
   if (texture) {
     textureDefinitionInfo = extractSharedResourcesTextureInfo(texture.texture, nodeId);
   }
-
   const {
     baseColorFactor,
     metallicFactor
   } = (gltfMaterial === null || gltfMaterial === void 0 ? void 0 : gltfMaterial.pbrMetallicRoughness) || {};
   let colorFactor = baseColorFactor;
-
   if ((!baseColorFactor || baseColorFactor[3] === 0) && gltfMaterial.emissiveFactor) {
     colorFactor = gltfMaterial.emissiveFactor;
     colorFactor[3] = colorFactor[3] || 1;
   }
-
   return {
     materialDefinitionInfo: extractSharedResourcesMaterialInfo(colorFactor || [1, 1, 1, 1], metallicFactor),
     textureDefinitionInfo
   };
 }
 
-function extractSharedResourcesMaterialInfo(baseColorFactor, metallicFactor = 1) {
+function extractSharedResourcesMaterialInfo(baseColorFactor) {
+  let metallicFactor = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 1;
   const matDielectricColorComponent = 0.04 / 255;
   const black = new Vector4(0, 0, 0, 1);
   const unitVector = new Vector4(1, 1, 1, 1);
@@ -585,7 +623,6 @@ function extractSharedResourcesMaterialInfo(baseColorFactor, metallicFactor = 1)
 
 function extractSharedResourcesTextureInfo(texture, nodeId) {
   var _texture$source, _texture$source2, _texture$source3;
-
   return {
     encoding: texture !== null && texture !== void 0 && (_texture$source = texture.source) !== null && _texture$source !== void 0 && _texture$source.mimeType ? [texture.source.mimeType] : undefined,
     images: [{
@@ -598,7 +635,6 @@ function extractSharedResourcesTextureInfo(texture, nodeId) {
 
 function generateImageId(texture, nodeId) {
   var _texture$source4;
-
   const {
     width,
     height
@@ -625,34 +661,28 @@ function makeFeatureIdsUnique(featureIds, featureIndices, featuresHashArray, bat
 
 function getFeaturesReplaceMap(featureIds, batchTable, featuresHashArray) {
   const featureMap = {};
-
   for (let index = 0; index < featureIds.length; index++) {
     const oldFeatureId = featureIds[index];
     const uniqueFeatureId = getOrCreateUniqueFeatureId(index, batchTable, featuresHashArray);
     featureMap[oldFeatureId.toString()] = uniqueFeatureId;
   }
-
   return featureMap;
 }
 
 function generateStringFromBatchTableByIndex(batchTable, index) {
   let str = '';
-
   for (const key in batchTable) {
     str += batchTable[key][index];
   }
-
   return str;
 }
 
 function getOrCreateUniqueFeatureId(index, batchTable, featuresHashArray) {
   const batchTableStr = generateStringFromBatchTableByIndex(batchTable, index);
   const hash = md5(batchTableStr);
-
   if (featuresHashArray.includes(hash)) {
     return featuresHashArray.indexOf(hash);
   }
-
   return featuresHashArray.push(hash) - 1;
 }
 
@@ -662,46 +692,42 @@ function replaceIndicesByUnique(indicesArray, featureMap) {
   }
 }
 
-function convertBatchTableToAttributeBuffers(batchTable, featureIds, attributeStorageInfo) {
+function convertPropertyTableToAttributeBuffers(featureIds, propertyTable, attributeStorageInfo) {
   const attributeBuffers = [];
-
-  if (batchTable) {
-    const batchTableWithFeatureIds = {
-      OBJECTID: featureIds,
-      ...batchTable
-    };
-
-    for (const key in batchTableWithFeatureIds) {
-      const type = getAttributeType(key, attributeStorageInfo);
-      let attributeBuffer = null;
-
-      switch (type) {
-        case OBJECT_ID_TYPE:
-        case SHORT_INT_TYPE:
-          attributeBuffer = generateShortIntegerAttributeBuffer(batchTableWithFeatureIds[key]);
-          break;
-
-        case DOUBLE_TYPE:
-          attributeBuffer = generateDoubleAttributeBuffer(batchTableWithFeatureIds[key]);
-          break;
-
-        case STRING_TYPE:
-          attributeBuffer = generateStringAttributeBuffer(batchTableWithFeatureIds[key]);
-          break;
-
-        default:
-          attributeBuffer = generateStringAttributeBuffer(batchTableWithFeatureIds[key]);
-      }
-
-      if (attributeBuffer) {
-        attributeBuffers.push(attributeBuffer);
-      }
-    }
+  const needFlattenPropertyTable = checkPropertiesLength(featureIds, propertyTable);
+  const properties = needFlattenPropertyTable ? flattenPropertyTableByFeatureIds(featureIds, propertyTable) : propertyTable;
+  const propertyTableWithObjectIds = {
+    OBJECTID: featureIds,
+    ...properties
+  };
+  for (const propertyName in propertyTableWithObjectIds) {
+    const type = getAttributeType(propertyName, attributeStorageInfo);
+    const value = propertyTableWithObjectIds[propertyName];
+    const attributeBuffer = generateAttributeBuffer(type, value);
+    attributeBuffers.push(attributeBuffer);
   }
-
   return attributeBuffers;
 }
 
+function generateAttributeBuffer(type, value) {
+  let attributeBuffer;
+  switch (type) {
+    case OBJECT_ID_TYPE:
+    case SHORT_INT_TYPE:
+      attributeBuffer = generateShortIntegerAttributeBuffer(value);
+      break;
+    case DOUBLE_TYPE:
+      attributeBuffer = generateDoubleAttributeBuffer(value);
+      break;
+    case STRING_TYPE:
+      attributeBuffer = generateStringAttributeBuffer(value);
+      break;
+    default:
+      attributeBuffer = generateStringAttributeBuffer(value);
+  }
+  return attributeBuffer;
+}
+
 function getAttributeType(key, attributeStorageInfo) {
   const attribute = attributeStorageInfo.find(attr => attr.name === key);
   return attribute.attributeValues.valueType;
@@ -725,7 +751,6 @@ function generateStringAttributeBuffer(batchAttributes) {
   let totalNumberOfBytes = 0;
   const stringSizesArray = new Uint32Array(batchAttributes.length);
   const stringBufferArray = [];
-
   for (let index = 0; index < batchAttributes.length; index++) {
     const currentString = "".concat(String(batchAttributes[index]), "\0");
     const currentStringBuffer = Buffer.from(currentString);
@@ -734,18 +759,15 @@ function generateStringAttributeBuffer(batchAttributes) {
     stringSizesArray[index] = currentStringSize;
     stringBufferArray.push(currentStringBuffer);
   }
-
   const totalBytes = new Uint32Array([totalNumberOfBytes]);
   return concatenateArrayBuffers(stringCountArray.buffer, totalBytes.buffer, stringSizesArray.buffer, ...stringBufferArray);
 }
 
 function generateBigUint64Array(featureIds) {
   const typedFeatureIds = new BigUint64Array(featureIds.length);
-
   for (let index = 0; index < featureIds.length; index++) {
     typedFeatureIds[index] = BigInt(featureIds[index]);
   }
-
   return typedFeatureIds;
 }
 
@@ -755,15 +777,14 @@ async function generateCompressedGeometry(vertexCount, convertedAttributes, attr
     normals,
     texCoords,
     colors,
+    uvRegions,
     featureIds,
     faceRange
   } = attributes;
   const indices = new Uint32Array(vertexCount);
-
   for (let index = 0; index < indices.length; index++) {
     indices.set([index], index);
   }
-
   const featureIndices = new Uint32Array(convertedAttributes.featureIndices.length ? convertedAttributes.featureIndices : vertexCount);
   const featureIndex = generateFeatureIndexAttribute(featureIndices, faceRange);
   const compressedAttributes = {
@@ -772,21 +793,26 @@ async function generateCompressedGeometry(vertexCount, convertedAttributes, attr
     colors,
     'feature-index': featureIndex
   };
-
   if (texCoords.length) {
     compressedAttributes.texCoords = texCoords;
   }
-
   const attributesMetadata = {
     'feature-index': {
       'i3s-attribute-type': 'feature-index',
       'i3s-feature-ids': new Int32Array(featureIds)
     }
   };
+  if (uvRegions.length) {
+    compressedAttributes['uv-region'] = uvRegions;
+    attributesMetadata['uv-region'] = {
+      'i3s-attribute-type': 'uv-region'
+    };
+  }
   return encode({
     attributes: compressedAttributes,
     indices
-  }, DracoWriterWorker, { ...DracoWriterWorker.options,
+  }, DracoWriterWorker, {
+    ...DracoWriterWorker.options,
     source: dracoWorkerSoure,
     reuseWorkers: true,
     _nodeWorkers: true,
@@ -801,14 +827,82 @@ function generateFeatureIndexAttribute(featureIndex, faceRange) {
   const orderedFeatureIndices = new Uint32Array(featureIndex.length);
   let fillIndex = 0;
   let startIndex = 0;
-
   for (let index = 1; index < faceRange.length; index += 2) {
     const endIndex = (faceRange[index] + 1) * VALUES_PER_VERTEX;
     orderedFeatureIndices.fill(fillIndex, startIndex, endIndex);
     fillIndex++;
     startIndex = endIndex + 1;
   }
-
   return orderedFeatureIndices;
 }
+
+export function getPropertyTable(tileContent) {
+  const batchTableJson = tileContent === null || tileContent === void 0 ? void 0 : tileContent.batchTableJson;
+  if (batchTableJson) {
+    return batchTableJson;
+  }
+  const {
+    extensionName,
+    extension
+  } = getPropertyTableExtension(tileContent);
+  switch (extensionName) {
+    case EXT_MESH_FEATURES:
+      {
+        console.warn('The I3S converter does not yet support the EXT_mesh_features extension');
+        return null;
+      }
+    case EXT_FEATURE_METADATA:
+      {
+        return getPropertyTableFromExtFeatureMetadata(extension);
+      }
+    default:
+      return null;
+  }
+}
+
+function getPropertyTableExtension(tileContent) {
+  var _tileContent$gltf3, _tileContent$gltf5, _tileContent$gltf5$ex;
+  const extensionsWithPropertyTables = [EXT_FEATURE_METADATA, EXT_MESH_FEATURES];
+  const extensionsUsed = tileContent === null || tileContent === void 0 ? void 0 : (_tileContent$gltf3 = tileContent.gltf) === null || _tileContent$gltf3 === void 0 ? void 0 : _tileContent$gltf3.extensionsUsed;
+  if (!extensionsUsed) {
+    return {
+      extensionName: null,
+      extension: null
+    };
+  }
+  let extensionName = '';
+  for (const extensionItem of (tileContent === null || tileContent === void 0 ? void 0 : (_tileContent$gltf4 = tileContent.gltf) === null || _tileContent$gltf4 === void 0 ? void 0 : _tileContent$gltf4.extensionsUsed) || []) {
+    var _tileContent$gltf4;
+    if (extensionsWithPropertyTables.includes(extensionItem)) {
+      extensionName = extensionItem;
+      break;
+    }
+  }
+  const extension = tileContent === null || tileContent === void 0 ? void 0 : (_tileContent$gltf5 = tileContent.gltf) === null || _tileContent$gltf5 === void 0 ? void 0 : (_tileContent$gltf5$ex = _tileContent$gltf5.extensions) === null || _tileContent$gltf5$ex === void 0 ? void 0 : _tileContent$gltf5$ex[extensionName];
+  return {
+    extensionName,
+    extension
+  };
+}
+
+function getPropertyTableFromExtFeatureMetadata(extension) {
+  if (extension !== null && extension !== void 0 && extension.featureTextures) {
+    console.warn('The I3S converter does not yet support the EXT_feature_metadata feature textures');
+    return null;
+  }
+  if (extension !== null && extension !== void 0 && extension.featureTables) {
+    var _Object$keys;
+    const firstFeatureTableName = (_Object$keys = Object.keys(extension.featureTables)) === null || _Object$keys === void 0 ? void 0 : _Object$keys[0];
+    if (firstFeatureTableName) {
+      const featureTable = extension === null || extension === void 0 ? void 0 : extension.featureTables[firstFeatureTableName];
+      const propertyTable = {};
+      for (const propertyName in featureTable.properties) {
+        propertyTable[propertyName] = featureTable.properties[propertyName].data;
+      }
+      return propertyTable;
+    }
+  }
+  console.warn("The I3S converter couldn't handle EXT_feature_metadata extension");
+  return null;
+}
 //# sourceMappingURL=geometry-converter.js.map