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

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

@@ -25,6 +25,7 @@ var _batchIdsExtensions = require("./batch-ids-extensions");
 var _featureAttributes = require("./feature-attributes");
 var _math = require("@loaders.gl/math");
 var _geometryUtils = require("../../lib/utils/geometry-utils");
+var _constants = require("../../constants");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
@@ -42,16 +43,14 @@ var SHORT_INT_TYPE = 'Int32';
 var DOUBLE_TYPE = 'Float64';
 var OBJECT_ID_TYPE = 'Oid32';
 var BATCHED_ID_POSSIBLE_ATTRIBUTE_NAMES = ['CUSTOM_ATTRIBUTE_2', '_BATCHID', 'BATCHID'];
-var EXT_FEATURE_METADATA = 'EXT_feature_metadata';
-var EXT_MESH_FEATURES = 'EXT_mesh_features';
 var scratchVector = new _core.Vector3();
-function convertB3dmToI3sGeometry(_x, _x2, _x3, _x4, _x5, _x6, _x7, _x8, _x9, _x10, _x11, _x12) {
+function convertB3dmToI3sGeometry(_x, _x2, _x3, _x4, _x5, _x6, _x7, _x8, _x9, _x10, _x11, _x12, _x13) {
   return _convertB3dmToI3sGeometry.apply(this, arguments);
 }
 function _convertB3dmToI3sGeometry() {
-  _convertB3dmToI3sGeometry = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee(tileContent, tileTransform, tileBoundingVolume, addNodeToNodePage, propertyTable, featuresHashArray, attributeStorageInfo, draco, generateBoundingVolumes, shouldMergeMaterials, geoidHeightModel, libraries) {
+  _convertB3dmToI3sGeometry = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee(tileContent, tileTransform, tileBoundingVolume, addNodeToNodePage, propertyTable, featuresHashArray, attributeStorageInfo, draco, generateBoundingVolumes, shouldMergeMaterials, geoidHeightModel, libraries, metadataClass) {
     var _tileContent$gltf4;
-    var useCartesianPositions, materialAndTextureList, dataForAttributesConversion, convertedAttributesMap, result, _iterator6, _step6, materialAndTexture, originarMaterialId, convertedAttributes, material, texture, nodeId;
+    var useCartesianPositions, materialAndTextureList, dataForAttributesConversion, featureTexture, convertedAttributesMap, result, _iterator6, _step6, materialAndTexture, originarMaterialId, convertedAttributes, material, texture, nodeId;
     return _regenerator.default.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -61,44 +60,45 @@ function _convertB3dmToI3sGeometry() {
         case 3:
           materialAndTextureList = _context.sent;
           dataForAttributesConversion = (0, _gltfAttributes.prepareDataForAttributesConversion)(tileContent, tileTransform, tileBoundingVolume);
-          _context.next = 7;
-          return convertAttributes(dataForAttributesConversion, materialAndTextureList, useCartesianPositions);
-        case 7:
+          featureTexture = (0, _batchIdsExtensions.getTextureByMetadataClass)(tileContent, metadataClass);
+          _context.next = 8;
+          return convertAttributes(dataForAttributesConversion, materialAndTextureList, useCartesianPositions, featureTexture);
+        case 8:
           convertedAttributesMap = _context.sent;
           if (generateBoundingVolumes) {
             _generateBoundingVolumesFromGeometry(convertedAttributesMap, geoidHeightModel);
           }
           result = [];
           _iterator6 = _createForOfIteratorHelper(materialAndTextureList);
-          _context.prev = 11;
+          _context.prev = 12;
           _iterator6.s();
-        case 13:
+        case 14:
           if ((_step6 = _iterator6.n()).done) {
-            _context.next = 32;
+            _context.next = 33;
             break;
           }
           materialAndTexture = _step6.value;
           originarMaterialId = materialAndTexture.mergedMaterials[0].originalMaterialId;
           if (convertedAttributesMap.has(originarMaterialId)) {
-            _context.next = 18;
+            _context.next = 19;
             break;
           }
-          return _context.abrupt("continue", 30);
-        case 18:
+          return _context.abrupt("continue", 31);
+        case 19:
           convertedAttributes = convertedAttributesMap.get(originarMaterialId);
           if (convertedAttributes) {
-            _context.next = 21;
+            _context.next = 22;
             break;
           }
-          return _context.abrupt("continue", 30);
-        case 21:
+          return _context.abrupt("continue", 31);
+        case 22:
           material = materialAndTexture.material, texture = materialAndTexture.texture;
-          _context.next = 24;
+          _context.next = 25;
           return addNodeToNodePage();
-        case 24:
+        case 25:
           nodeId = _context.sent;
           _context.t0 = result;
-          _context.next = 28;
+          _context.next = 29;
           return _makeNodeResources({
             convertedAttributes: convertedAttributes,
             material: material,
@@ -111,36 +111,36 @@ function _convertB3dmToI3sGeometry() {
             draco: draco,
             libraries: libraries
           });
-        case 28:
+        case 29:
           _context.t1 = _context.sent;
           _context.t0.push.call(_context.t0, _context.t1);
-        case 30:
-          _context.next = 13;
+        case 31:
+          _context.next = 14;
           break;
-        case 32:
-          _context.next = 37;
+        case 33:
+          _context.next = 38;
           break;
-        case 34:
-          _context.prev = 34;
-          _context.t2 = _context["catch"](11);
+        case 35:
+          _context.prev = 35;
+          _context.t2 = _context["catch"](12);
           _iterator6.e(_context.t2);
-        case 37:
-          _context.prev = 37;
+        case 38:
+          _context.prev = 38;
           _iterator6.f();
-          return _context.finish(37);
-        case 40:
+          return _context.finish(38);
+        case 41:
           if (result.length) {
-            _context.next = 42;
+            _context.next = 43;
             break;
           }
           return _context.abrupt("return", null);
-        case 42:
-          return _context.abrupt("return", result);
         case 43:
+          return _context.abrupt("return", result);
+        case 44:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[11, 34, 37, 40]]);
+    }, _callee, null, [[12, 35, 38, 41]]);
   }));
   return _convertB3dmToI3sGeometry.apply(this, arguments);
 }
@@ -167,7 +167,7 @@ function _generateBoundingVolumesFromGeometry(convertedAttributesMap, geoidHeigh
     _iterator.f();
   }
 }
-function _makeNodeResources(_x13) {
+function _makeNodeResources(_x14) {
   return _makeNodeResources2.apply(this, arguments);
 }
 function _makeNodeResources2() {
@@ -222,11 +222,11 @@ function _makeNodeResources2() {
   }));
   return _makeNodeResources2.apply(this, arguments);
 }
-function convertAttributes(_x14, _x15, _x16) {
+function convertAttributes(_x15, _x16, _x17, _x18) {
   return _convertAttributes.apply(this, arguments);
 }
 function _convertAttributes() {
-  _convertAttributes = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee3(attributesData, materialAndTextureList, useCartesianPositions) {
+  _convertAttributes = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee3(attributesData, materialAndTextureList, useCartesianPositions, featureTexture) {
     var nodes, images, cartographicOrigin, cartesianModelMatrix, attributesMap, _iterator7, _step7, materialAndTexture, attributes, _iterator9, _step9, mergedMaterial, _iterator8, _step8, attrKey, _attributes;
     return _regenerator.default.wrap(function _callee3$(_context3) {
       while (1) switch (_context3.prev = _context3.next) {
@@ -265,7 +265,7 @@ function _convertAttributes() {
           } finally {
             _iterator7.f();
           }
-          convertNodes(nodes, images, cartographicOrigin, cartesianModelMatrix, attributesMap, useCartesianPositions);
+          convertNodes(nodes, images, cartographicOrigin, cartesianModelMatrix, attributesMap, useCartesianPositions, undefined, featureTexture);
           _iterator8 = _createForOfIteratorHelper(attributesMap.keys());
           _context3.prev = 6;
           _iterator8.s();
@@ -321,13 +321,14 @@ function _convertAttributes() {
 }
 function convertNodes(nodes, images, cartographicOrigin, cartesianModelMatrix, attributesMap, useCartesianPositions) {
   var matrix = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : new _core.Matrix4([1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1]);
+  var featureTexture = arguments.length > 7 ? arguments[7] : undefined;
   if (nodes) {
     var _iterator2 = _createForOfIteratorHelper(nodes),
       _step2;
     try {
       for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
         var node = _step2.value;
-        convertNode(node, images, cartographicOrigin, cartesianModelMatrix, attributesMap, useCartesianPositions, matrix);
+        convertNode(node, images, cartographicOrigin, cartesianModelMatrix, attributesMap, useCartesianPositions, matrix, featureTexture);
       }
     } catch (err) {
       _iterator2.e(err);
@@ -358,16 +359,18 @@ function getCompositeTransformationMatrix(node, matrix) {
 }
 function convertNode(node, images, cartographicOrigin, cartesianModelMatrix, attributesMap, useCartesianPositions) {
   var matrix = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : new _core.Matrix4([1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1]);
+  var featureTexture = arguments.length > 7 ? arguments[7] : undefined;
   var transformationMatrix = getCompositeTransformationMatrix(node, matrix);
   var 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) {
   var useCartesianPositions = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : false;
   var matrix = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : new _core.Matrix4([1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1]);
+  var featureTexture = arguments.length > 7 ? arguments[7] : undefined;
   var _iterator3 = _createForOfIteratorHelper(mesh.primitives),
     _step3;
   try {
@@ -417,7 +420,7 @@ function convertMesh(mesh, images, cartographicOrigin, cartesianModelMatrix, att
         outputAttributes.uvRegions = (0, _loaderUtils.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));
     };
     for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
       var _ret = _loop();
@@ -550,8 +553,8 @@ function flattenBatchIds(batchedIds, indices) {
   }
   return newBatchIds;
 }
-function getBatchIds(attributes, primitive, images) {
-  var batchIds = (0, _batchIdsExtensions.handleBatchIdsExtensions)(attributes, primitive, images);
+function getBatchIds(attributes, primitive, images, featureTexture) {
+  var batchIds = (0, _batchIdsExtensions.handleBatchIdsExtensions)(attributes, primitive, images, featureTexture);
   if (batchIds.length) {
     return batchIds;
   }
@@ -610,7 +613,7 @@ function _convertMaterials() {
   }));
   return _convertMaterials.apply(this, arguments);
 }
-function mergeAllMaterials(_x17) {
+function mergeAllMaterials(_x19) {
   return _mergeAllMaterials.apply(this, arguments);
 }
 function _mergeAllMaterials() {
@@ -708,7 +711,7 @@ function _mergeAllMaterials() {
   }));
   return _mergeAllMaterials.apply(this, arguments);
 }
-function mergeMaterials(_x18, _x19) {
+function mergeMaterials(_x20, _x21) {
   return _mergeMaterials.apply(this, arguments);
 }
 function _mergeMaterials() {
@@ -1035,7 +1038,7 @@ function generateBigUint64Array(featureIds) {
   }
   return typedFeatureIds;
 }
-function generateCompressedGeometry(_x20, _x21, _x22, _x23) {
+function generateCompressedGeometry(_x22, _x23, _x24, _x25) {
   return _generateCompressedGeometry.apply(this, arguments);
 }
 function _generateCompressedGeometry() {
@@ -1107,7 +1110,7 @@ function generateFeatureIndexAttribute(featureIndex, faceRange) {
   }
   return orderedFeatureIndices;
 }
-function getPropertyTable(tileContent) {
+function getPropertyTable(tileContent, metadataClass) {
   if (!tileContent) {
     return null;
   }
@@ -1119,14 +1122,14 @@ function getPropertyTable(tileContent) {
     extensionName = _getPropertyTableExte.extensionName,
     extension = _getPropertyTableExte.extension;
   switch (extensionName) {
-    case EXT_MESH_FEATURES:
+    case _constants.EXT_MESH_FEATURES:
       {
         console.warn('The I3S converter does not yet support the EXT_mesh_features extension');
         return null;
       }
-    case EXT_FEATURE_METADATA:
+    case _constants.EXT_FEATURE_METADATA:
       {
-        return getPropertyTableFromExtFeatureMetadata(extension);
+        return getPropertyTableFromExtFeatureMetadata(extension, metadataClass);
       }
     default:
       return null;
@@ -1134,7 +1137,7 @@ function getPropertyTable(tileContent) {
 }
 function getPropertyTableExtension(tileContent) {
   var _tileContent$gltf, _tileContent$gltf2, _tileContent$gltf2$ex, _tileContent$gltf3;
-  var extensionsWithPropertyTables = [EXT_FEATURE_METADATA, EXT_MESH_FEATURES];
+  var extensionsWithPropertyTables = [_constants.EXT_FEATURE_METADATA, _constants.EXT_MESH_FEATURES];
   var extensionsUsed = tileContent === null || tileContent === void 0 ? void 0 : (_tileContent$gltf = tileContent.gltf) === null || _tileContent$gltf === void 0 ? void 0 : _tileContent$gltf.extensionsUsed;
   if (!extensionsUsed) {
     return {
@@ -1170,7 +1173,7 @@ function getPropertyTableExtension(tileContent) {
     extension: extension
   };
 }
-function getPropertyTableFromExtFeatureMetadata(extension) {
+function getPropertyTableFromExtFeatureMetadata(extension, metadataClass) {
   if (extension !== null && extension !== void 0 && extension.featureTables) {
     var _Object$keys;
     var firstFeatureTableName = (_Object$keys = Object.keys(extension.featureTables)) === null || _Object$keys === void 0 ? void 0 : _Object$keys[0];
@@ -1184,10 +1187,15 @@ function getPropertyTableFromExtFeatureMetadata(extension) {
     }
   }
   if (extension !== null && extension !== void 0 && extension.featureTextures) {
-    var _Object$keys2;
-    var firstTextureName = (_Object$keys2 = Object.keys(extension.featureTextures)) === null || _Object$keys2 === void 0 ? void 0 : _Object$keys2[0];
-    if (firstTextureName) {
-      var _featureTable = extension === null || extension === void 0 ? void 0 : extension.featureTextures[firstTextureName];
+    var featureTexture;
+    for (var textureKey in extension.featureTextures) {
+      var texture = extension.featureTextures[textureKey];
+      if (texture.class === metadataClass) {
+        featureTexture = textureKey;
+      }
+    }
+    if (typeof featureTexture === 'string') {
+      var _featureTable = extension === null || extension === void 0 ? void 0 : extension.featureTextures[featureTexture];
       var _propertyTable = {};
       for (var _propertyName in _featureTable.properties) {
         _propertyTable[_propertyName] = _featureTable.properties[_propertyName].data;