@loaders.gl/tile-converter 4.0.0-alpha.19 → 4.0.0-alpha.21

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

@@ -8,10 +8,11 @@ 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 { getTextureByMetadataClass, handleBatchIdsExtensions } from './batch-ids-extensions';
 import { checkPropertiesLength, flattenPropertyTableByFeatureIds } from './feature-attributes';
 import { GL } from '@loaders.gl/math';
 import { generateSyntheticIndices } from '../../lib/utils/geometry-utils';
+import { EXT_FEATURE_METADATA, EXT_MESH_FEATURES } from '../../constants';
 const DEFAULT_ROUGHNESS_FACTOR = 1;
 const DEFAULT_METALLIC_FACTOR = 1;
 const VALUES_PER_VERTEX = 3;
@@ -22,15 +23,14 @@ 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, tileTransform, tileBoundingVolume, addNodeToNodePage, propertyTable, featuresHashArray, attributeStorageInfo, draco, generateBoundingVolumes, shouldMergeMaterials, geoidHeightModel, libraries) {
+export default async function convertB3dmToI3sGeometry(tileContent, tileTransform, tileBoundingVolume, addNodeToNodePage, propertyTable, featuresHashArray, attributeStorageInfo, draco, generateBoundingVolumes, shouldMergeMaterials, geoidHeightModel, libraries, metadataClass) {
   var _tileContent$gltf;
   const useCartesianPositions = generateBoundingVolumes;
   const materialAndTextureList = await convertMaterials((_tileContent$gltf = tileContent.gltf) === null || _tileContent$gltf === void 0 ? void 0 : _tileContent$gltf.materials, shouldMergeMaterials);
   const dataForAttributesConversion = prepareDataForAttributesConversion(tileContent, tileTransform, tileBoundingVolume);
-  const convertedAttributesMap = await convertAttributes(dataForAttributesConversion, materialAndTextureList, useCartesianPositions);
+  const featureTexture = getTextureByMetadataClass(tileContent, metadataClass);
+  const convertedAttributesMap = await convertAttributes(dataForAttributesConversion, materialAndTextureList, useCartesianPositions, featureTexture);
   if (generateBoundingVolumes) {
     _generateBoundingVolumesFromGeometry(convertedAttributesMap, geoidHeightModel);
   }
@@ -141,7 +141,7 @@ async function _makeNodeResources(_ref) {
     boundingVolumes
   };
 }
-export async function convertAttributes(attributesData, materialAndTextureList, useCartesianPositions) {
+export async function convertAttributes(attributesData, materialAndTextureList, useCartesianPositions, featureTexture) {
   const {
     nodes,
     images,
@@ -165,7 +165,7 @@ export async function convertAttributes(attributesData, materialAndTextureList,
       attributesMap.set(mergedMaterial.originalMaterialId, attributes);
     }
   }
-  convertNodes(nodes, images, cartographicOrigin, cartesianModelMatrix, attributesMap, useCartesianPositions);
+  convertNodes(nodes, images, cartographicOrigin, cartesianModelMatrix, attributesMap, useCartesianPositions, undefined, featureTexture);
   for (const attrKey of attributesMap.keys()) {
     const attributes = attributesMap.get(attrKey);
     if (!attributes) {
@@ -184,9 +184,10 @@ export async function convertAttributes(attributesData, materialAndTextureList,
 }
 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]);
+  let featureTexture = arguments.length > 7 ? arguments[7] : undefined;
   if (nodes) {
     for (const node of nodes) {
-      convertNode(node, images, cartographicOrigin, cartesianModelMatrix, attributesMap, useCartesianPositions, matrix);
+      convertNode(node, images, cartographicOrigin, cartesianModelMatrix, attributesMap, useCartesianPositions, matrix, featureTexture);
     }
   }
 }
@@ -214,16 +215,18 @@ function getCompositeTransformationMatrix(node, matrix) {
 }
 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]);
+  let featureTexture = arguments.length > 7 ? arguments[7] : undefined;
   const transformationMatrix = getCompositeTransformationMatrix(node, matrix);
   const mesh = node.mesh;
   if (mesh) {
-    convertMesh(mesh, images, cartographicOrigin, cartesianModelMatrix, attributesMap, useCartesianPositions, transformationMatrix);
+    convertMesh(mesh, images, cartographicOrigin, cartesianModelMatrix, attributesMap, useCartesianPositions, transformationMatrix, featureTexture);
   }
-  convertNodes(node.children || [], images, cartographicOrigin, cartesianModelMatrix, attributesMap, useCartesianPositions, transformationMatrix);
+  convertNodes(node.children || [], images, cartographicOrigin, cartesianModelMatrix, attributesMap, useCartesianPositions, transformationMatrix, featureTexture);
 }
 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]);
+  let featureTexture = arguments.length > 7 ? arguments[7] : undefined;
   for (const primitive of mesh.primitives) {
     let outputAttributes = null;
     let materialUvRegion;
@@ -271,7 +274,7 @@ function convertMesh(mesh, images, cartographicOrigin, cartesianModelMatrix, att
       outputAttributes.uvRegions = concatenateTypedArrays(outputAttributes.uvRegions, createUvRegion(materialUvRegion, indices));
     }
     outputAttributes.featureIndicesGroups = outputAttributes.featureIndicesGroups || [];
-    outputAttributes.featureIndicesGroups.push(flattenBatchIds(getBatchIds(attributes, primitive, images), indices));
+    outputAttributes.featureIndicesGroups.push(flattenBatchIds(getBatchIds(attributes, primitive, images, featureTexture), indices));
   }
 }
 function normalizeIndices(primitive) {
@@ -401,8 +404,8 @@ function flattenBatchIds(batchedIds, indices) {
   }
   return newBatchIds;
 }
-function getBatchIds(attributes, primitive, images) {
-  const batchIds = handleBatchIdsExtensions(attributes, primitive, images);
+function getBatchIds(attributes, primitive, images, featureTexture) {
+  const batchIds = handleBatchIdsExtensions(attributes, primitive, images, featureTexture);
   if (batchIds.length) {
     return batchIds;
   }
@@ -829,7 +832,7 @@ function generateFeatureIndexAttribute(featureIndex, faceRange) {
   }
   return orderedFeatureIndices;
 }
-export function getPropertyTable(tileContent) {
+export function getPropertyTable(tileContent, metadataClass) {
   if (!tileContent) {
     return null;
   }
@@ -849,7 +852,7 @@ export function getPropertyTable(tileContent) {
       }
     case EXT_FEATURE_METADATA:
       {
-        return getPropertyTableFromExtFeatureMetadata(extension);
+        return getPropertyTableFromExtFeatureMetadata(extension, metadataClass);
       }
     default:
       return null;
@@ -885,7 +888,7 @@ function getPropertyTableExtension(tileContent) {
     extension
   };
 }
-function getPropertyTableFromExtFeatureMetadata(extension) {
+function getPropertyTableFromExtFeatureMetadata(extension, metadataClass) {
   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];
@@ -899,10 +902,15 @@ function getPropertyTableFromExtFeatureMetadata(extension) {
     }
   }
   if (extension !== null && extension !== void 0 && extension.featureTextures) {
-    var _Object$keys2;
-    const firstTextureName = (_Object$keys2 = Object.keys(extension.featureTextures)) === null || _Object$keys2 === void 0 ? void 0 : _Object$keys2[0];
-    if (firstTextureName) {
-      const featureTable = extension === null || extension === void 0 ? void 0 : extension.featureTextures[firstTextureName];
+    let featureTexture;
+    for (const textureKey in extension.featureTextures) {
+      const texture = extension.featureTextures[textureKey];
+      if (texture.class === metadataClass) {
+        featureTexture = textureKey;
+      }
+    }
+    if (typeof featureTexture === 'string') {
+      const featureTable = extension === null || extension === void 0 ? void 0 : extension.featureTextures[featureTexture];
       const propertyTable = {};
       for (const propertyName in featureTable.properties) {
         propertyTable[propertyName] = featureTable.properties[propertyName].data;