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

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

@@ -10,7 +10,7 @@ import { createBoundingVolumesFromGeometry } from './coordinate-converter';
 import { prepareDataForAttributesConversion } from './gltf-attributes';
 import { handleBatchIdsExtensions } from './batch-ids-extensions';
 import { checkPropertiesLength, flattenPropertyTableByFeatureIds } from './feature-attributes';
-
+import { GL } from '@loaders.gl/math';
 const DEFAULT_ROUGHNESS_FACTOR = 1;
 const DEFAULT_METALLIC_FACTOR = 1;
 const VALUES_PER_VERTEX = 3;
@@ -24,14 +24,12 @@ const BATCHED_ID_POSSIBLE_ATTRIBUTE_NAMES = ['CUSTOM_ATTRIBUTE_2', '_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, addNodeToNodePage, propertyTable, featuresHashArray, attributeStorageInfo, draco, generateBoundingVolumes, shouldMergeMaterials, geoidHeightModel, workerSource) {
   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);
   const convertedAttributesMap = await convertAttributes(dataForAttributesConversion, materialAndTextureList, useCartesianPositions);
-
   if (generateBoundingVolumes) {
     _generateBoundingVolumesFromGeometry(convertedAttributesMap, geoidHeightModel);
   }
@@ -41,7 +39,6 @@ export default async function convertB3dmToI3sGeometry(tileContent, addNodeToNod
     if (!convertedAttributesMap.has(originarMaterialId)) {
       continue;
     }
-
     const convertedAttributes = convertedAttributesMap.get(originarMaterialId);
     if (!convertedAttributes) {
       continue;
@@ -69,7 +66,6 @@ export default async function convertB3dmToI3sGeometry(tileContent, addNodeToNod
   }
   return result;
 }
-
 function _generateBoundingVolumesFromGeometry(convertedAttributesMap, geoidHeightModel) {
   for (const attributes of convertedAttributesMap.values()) {
     const boundingVolumes = createBoundingVolumesFromGeometry(attributes.positions, geoidHeightModel);
@@ -84,7 +80,6 @@ function _generateBoundingVolumesFromGeometry(convertedAttributesMap, geoidHeigh
     }
   }
 }
-
 async function _makeNodeResources(_ref) {
   var _tileContent$gltf2;
   let {
@@ -145,7 +140,6 @@ async function _makeNodeResources(_ref) {
     boundingVolumes
   };
 }
-
 export async function convertAttributes(attributesData, materialAndTextureList, useCartesianPositions) {
   const {
     nodes,
@@ -180,7 +174,6 @@ export async function convertAttributes(attributesData, materialAndTextureList,
       attributesMap.delete(attrKey);
       continue;
     }
-
     if (attributes.featureIndicesGroups) {
       attributes.featureIndices = attributes.featureIndicesGroups.reduce((acc, value) => acc.concat(value));
       delete attributes.featureIndicesGroups;
@@ -188,7 +181,6 @@ export async function convertAttributes(attributesData, materialAndTextureList,
   }
   return attributesMap;
 }
-
 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) {
@@ -197,7 +189,6 @@ function convertNodes(nodes, images, cartographicOrigin, cartesianModelMatrix, a
     }
   }
 }
-
 function getCompositeTransformationMatrix(node, matrix) {
   let transformationMatrix = matrix;
   const {
@@ -220,7 +211,6 @@ function getCompositeTransformationMatrix(node, matrix) {
   }
   return transformationMatrix;
 }
-
 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);
@@ -230,12 +220,10 @@ function convertNode(node, images, cartographicOrigin, cartesianModelMatrix, att
   }
   convertNodes(node.children || [], images, cartographicOrigin, cartesianModelMatrix, attributesMap, useCartesianPositions, transformationMatrix);
 }
-
 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$indices6;
     let outputAttributes = null;
     let materialUvRegion;
     if (primitive.material) {
@@ -256,12 +244,13 @@ function convertMesh(mesh, images, cartographicOrigin, cartesianModelMatrix, att
     if (!outputAttributes) {
       continue;
     }
+    const indices = getIndices(primitive);
     outputAttributes.positions = concatenateTypedArrays(outputAttributes.positions, transformVertexArray({
       vertices: attributes.POSITION.value,
       cartographicOrigin,
       cartesianModelMatrix,
       nodeMatrix: matrix,
-      indices: (_primitive$indices = primitive.indices) === null || _primitive$indices === void 0 ? void 0 : _primitive$indices.value,
+      indices,
       attributeSpecificTransformation: transformVertexPositions,
       useCartesianPositions
     }));
@@ -270,21 +259,41 @@ function convertMesh(mesh, images, cartographicOrigin, cartesianModelMatrix, att
       cartographicOrigin,
       cartesianModelMatrix,
       nodeMatrix: matrix,
-      indices: (_primitive$indices2 = primitive.indices) === null || _primitive$indices2 === void 0 ? void 0 : _primitive$indices2.value,
+      indices,
       attributeSpecificTransformation: transformVertexNormals,
       useCartesianPositions: false
     }));
-    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.texCoords = concatenateTypedArrays(outputAttributes.texCoords, flattenTexCoords(attributes.TEXCOORD_0 && attributes.TEXCOORD_0.value, indices));
+    outputAttributes.colors = concatenateTypedArrays(outputAttributes.colors, flattenColors(attributes.COLOR_0, indices));
     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.uvRegions = concatenateTypedArrays(outputAttributes.uvRegions, createUvRegion(materialUvRegion, indices));
     }
     outputAttributes.featureIndicesGroups = outputAttributes.featureIndicesGroups || [];
-    outputAttributes.featureIndicesGroups.push(flattenBatchIds(getBatchIds(attributes, primitive, images), (_primitive$indices6 = primitive.indices) === null || _primitive$indices6 === void 0 ? void 0 : _primitive$indices6.value));
+    outputAttributes.featureIndicesGroups.push(flattenBatchIds(getBatchIds(attributes, primitive, images), indices));
+  }
+}
+function getIndices(primitive) {
+  var _primitive$indices;
+  let indices = (_primitive$indices = primitive.indices) === null || _primitive$indices === void 0 ? void 0 : _primitive$indices.value;
+  if (indices && primitive.mode === GL.TRIANGLE_STRIP) {
+    const TypedArrayConstructor = indices.constructor;
+    const newIndices = new TypedArrayConstructor((indices.length - 2) * 3);
+    let triangleIndex = 0;
+    let currentTriangle = indices.slice(0, 3);
+    newIndices.set(currentTriangle, 0);
+    for (let i = 1; i + 2 < indices.length; i++) {
+      triangleIndex += 3;
+      currentTriangle = indices.slice(i, i + 3);
+      if (i % 2 === 0) {
+        newIndices.set(currentTriangle, triangleIndex);
+      } else {
+        newIndices.set(currentTriangle.reverse(), triangleIndex);
+      }
+    }
+    indices = newIndices;
   }
+  return indices;
 }
-
 function transformVertexArray(args) {
   const {
     vertices,
@@ -306,7 +315,6 @@ function transformVertexArray(args) {
   }
   return newVertices;
 }
-
 function transformVertexPositions(vertexVector, calleeArgs) {
   const {
     cartesianModelMatrix,
@@ -325,7 +333,6 @@ function transformVertexPositions(vertexVector, calleeArgs) {
   vertexVector = vertexVector.subtract(cartographicOrigin);
   return vertexVector;
 }
-
 function transformVertexNormals(vertexVector, calleeArgs) {
   const {
     cartesianModelMatrix,
@@ -337,7 +344,6 @@ function transformVertexNormals(vertexVector, calleeArgs) {
   vertexVector = vertexVector.transformAsVector(cartesianModelMatrix);
   return vertexVector;
 }
-
 function flattenTexCoords(texCoords, indices) {
   const newTexCoords = new Float32Array(indices.length * VALUES_PER_TEX_COORD);
   if (!texCoords) {
@@ -352,7 +358,6 @@ function flattenTexCoords(texCoords, indices) {
   }
   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);
@@ -372,7 +377,6 @@ function flattenColors(colorsAttribute, indices) {
   }
   return newColors;
 }
-
 function createUvRegion(materialUvRegion, indices) {
   const result = new Uint16Array(indices.length * 4);
   for (let i = 0; i < result.length; i += 4) {
@@ -380,7 +384,6 @@ function createUvRegion(materialUvRegion, indices) {
   }
   return result;
 }
-
 function flattenBatchIds(batchedIds, indices) {
   if (!batchedIds.length || !indices.length) {
     return [];
@@ -392,7 +395,6 @@ function flattenBatchIds(batchedIds, indices) {
   }
   return newBatchIds;
 }
-
 function getBatchIds(attributes, primitive, images) {
   const batchIds = handleBatchIdsExtensions(attributes, primitive, images);
   if (batchIds.length) {
@@ -406,7 +408,6 @@ function getBatchIds(attributes, primitive, images) {
   }
   return [];
 }
-
 async function convertMaterials() {
   let sourceMaterials = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
   let shouldMergeMaterials = arguments.length > 1 ? arguments[1] : undefined;
@@ -419,7 +420,6 @@ async function convertMaterials() {
   }
   return materials;
 }
-
 async function mergeAllMaterials(materials) {
   const result = [];
   while (materials.length > 0) {
@@ -472,7 +472,6 @@ async function mergeAllMaterials(materials) {
   }
   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) {
@@ -495,7 +494,6 @@ async function mergeMaterials(material1, material2) {
   material1.mergedMaterials = material1.mergedMaterials.concat(material2.mergedMaterials);
   return material1;
 }
-
 function convertMaterial(sourceMaterial) {
   var _sourceMaterial$emiss, _sourceMaterial$pbrMe, _sourceMaterial$pbrMe2, _sourceMaterial$pbrMe3;
   const material = {
@@ -540,7 +538,6 @@ function convertMaterial(sourceMaterial) {
     mergedMaterials
   };
 }
-
 function convertAlphaMode(gltfAlphaMode) {
   switch (gltfAlphaMode) {
     case 'OPAQUE':
@@ -553,7 +550,6 @@ function convertAlphaMode(gltfAlphaMode) {
       return 'opaque';
   }
 }
-
 function getDefaultMaterial() {
   return {
     alphaMode: 'opaque',
@@ -563,7 +559,6 @@ function getDefaultMaterial() {
     }
   };
 }
-
 function getSharedResources(gltfMaterials, nodeId) {
   const i3sResources = {};
   if (!gltfMaterials || !gltfMaterials.length) {
@@ -583,7 +578,6 @@ function getSharedResources(gltfMaterials, nodeId) {
   }
   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;
@@ -605,7 +599,6 @@ function convertGLTFMaterialToI3sSharedResources(gltfMaterial, nodeId) {
     textureDefinitionInfo
   };
 }
-
 function extractSharedResourcesMaterialInfo(baseColorFactor) {
   let metallicFactor = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 1;
   const matDielectricColorComponent = 0.04 / 255;
@@ -625,7 +618,6 @@ function extractSharedResourcesMaterialInfo(baseColorFactor) {
     }
   };
 }
-
 function extractSharedResourcesTextureInfo(texture, nodeId) {
   var _texture$source, _texture$source2, _texture$source3;
   return {
@@ -637,7 +629,6 @@ function extractSharedResourcesTextureInfo(texture, nodeId) {
     }]
   };
 }
-
 function generateImageId(texture, nodeId) {
   var _texture$source4;
   const {
@@ -657,13 +648,11 @@ function generateImageId(texture, nodeId) {
   const imageId = BigInt("0b".concat(leftHalf.toString(2)).concat(rightHalf));
   return imageId.toString();
 }
-
 function makeFeatureIdsUnique(featureIds, featureIndices, featuresHashArray, batchTable) {
   const replaceMap = getFeaturesReplaceMap(featureIds, batchTable, featuresHashArray);
   replaceIndicesByUnique(featureIndices, replaceMap);
   replaceIndicesByUnique(featureIds, replaceMap);
 }
-
 function getFeaturesReplaceMap(featureIds, batchTable, featuresHashArray) {
   const featureMap = {};
   for (let index = 0; index < featureIds.length; index++) {
@@ -673,7 +662,6 @@ function getFeaturesReplaceMap(featureIds, batchTable, featuresHashArray) {
   }
   return featureMap;
 }
-
 function generateStringFromBatchTableByIndex(batchTable, index) {
   let str = '';
   for (const key in batchTable) {
@@ -681,7 +669,6 @@ function generateStringFromBatchTableByIndex(batchTable, index) {
   }
   return str;
 }
-
 function getOrCreateUniqueFeatureId(index, batchTable, featuresHashArray) {
   const batchTableStr = generateStringFromBatchTableByIndex(batchTable, index);
   const hash = md5(batchTableStr);
@@ -690,13 +677,11 @@ function getOrCreateUniqueFeatureId(index, batchTable, featuresHashArray) {
   }
   return featuresHashArray.push(hash) - 1;
 }
-
 function replaceIndicesByUnique(indicesArray, featureMap) {
   for (let index = 0; index < indicesArray.length; index++) {
     indicesArray[index] = featureMap[indicesArray[index]];
   }
 }
-
 function convertPropertyTableToAttributeBuffers(featureIds, propertyTable, attributeStorageInfo) {
   const attributeBuffers = [];
   const needFlattenPropertyTable = checkPropertiesLength(featureIds, propertyTable);
@@ -713,7 +698,6 @@ function convertPropertyTableToAttributeBuffers(featureIds, propertyTable, attri
   }
   return attributeBuffers;
 }
-
 function generateAttributeBuffer(type, value) {
   let attributeBuffer;
   switch (type) {
@@ -732,25 +716,21 @@ function generateAttributeBuffer(type, value) {
   }
   return attributeBuffer;
 }
-
 function getAttributeType(key, attributeStorageInfo) {
   const attribute = attributeStorageInfo.find(attr => attr.name === key);
   return attribute.attributeValues.valueType;
 }
-
 function generateShortIntegerAttributeBuffer(featureIds) {
   const count = new Uint32Array([featureIds.length]);
   const valuesArray = new Uint32Array(featureIds);
   return concatenateArrayBuffers(count.buffer, valuesArray.buffer);
 }
-
 function generateDoubleAttributeBuffer(featureIds) {
   const count = new Uint32Array([featureIds.length]);
   const padding = new Uint8Array(4);
   const valuesArray = new Float64Array(featureIds);
   return concatenateArrayBuffers(count.buffer, padding.buffer, valuesArray.buffer);
 }
-
 function generateStringAttributeBuffer(batchAttributes) {
   const stringCountArray = new Uint32Array([batchAttributes.length]);
   let totalNumberOfBytes = 0;
@@ -767,7 +747,6 @@ function generateStringAttributeBuffer(batchAttributes) {
   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++) {
@@ -775,7 +754,6 @@ function generateBigUint64Array(featureIds) {
   }
   return typedFeatureIds;
 }
-
 async function generateCompressedGeometry(vertexCount, convertedAttributes, attributes, dracoWorkerSoure) {
   const {
     positions,
@@ -827,7 +805,6 @@ async function generateCompressedGeometry(vertexCount, convertedAttributes, attr
     }
   });
 }
-
 function generateFeatureIndexAttribute(featureIndex, faceRange) {
   const orderedFeatureIndices = new Uint32Array(featureIndex.length);
   let fillIndex = 0;
@@ -840,7 +817,6 @@ function generateFeatureIndexAttribute(featureIndex, faceRange) {
   }
   return orderedFeatureIndices;
 }
-
 export function getPropertyTable(tileContent) {
   const batchTableJson = tileContent === null || tileContent === void 0 ? void 0 : tileContent.batchTableJson;
   if (batchTableJson) {
@@ -864,7 +840,6 @@ export function getPropertyTable(tileContent) {
       return null;
   }
 }
-
 function getPropertyTableExtension(tileContent) {
   var _tileContent$gltf3, _tileContent$gltf5, _tileContent$gltf5$ex;
   const extensionsWithPropertyTables = [EXT_FEATURE_METADATA, EXT_MESH_FEATURES];
@@ -889,7 +864,6 @@ function getPropertyTableExtension(tileContent) {
     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');