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

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

@@ -66,17 +66,17 @@ function convertB3dmToI3sGeometry(_x, _x2, _x3, _x4, _x5, _x6, _x7, _x8, _x9) {
 }
 
 function _convertB3dmToI3sGeometry() {
-  _convertB3dmToI3sGeometry = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee(tileContent, nodeId, propertyTable, featuresHashArray, attributeStorageInfo, draco, generateBoundingVolumes, geoidHeightModel, workerSource) {
-    var _tileContent$gltf;
+  _convertB3dmToI3sGeometry = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee(tileContent, addNodeToNodePage, propertyTable, featuresHashArray, attributeStorageInfo, draco, generateBoundingVolumes, geoidHeightModel, workerSource) {
+    var _tileContent$gltf4;
 
-    var useCartesianPositions, materialAndTextureList, dataForAttributesConversion, convertedAttributesMap, result, nodesCounter, _ref3, _ref3$materials, materials, i, sourceMaterial, convertedAttributes, _materialAndTextureLi, material, texture;
+    var useCartesianPositions, materialAndTextureList, dataForAttributesConversion, convertedAttributesMap, result, _ref3, _ref3$materials, materials, i, sourceMaterial, convertedAttributes, _materialAndTextureLi, material, texture, nodeId;
 
     return _regenerator.default.wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
             useCartesianPositions = generateBoundingVolumes;
-            materialAndTextureList = convertMaterials((_tileContent$gltf = tileContent.gltf) === null || _tileContent$gltf === void 0 ? void 0 : _tileContent$gltf.materials);
+            materialAndTextureList = convertMaterials((_tileContent$gltf4 = tileContent.gltf) === null || _tileContent$gltf4 === void 0 ? void 0 : _tileContent$gltf4.materials);
             dataForAttributesConversion = (0, _gltfAttributes.prepareDataForAttributesConversion)(tileContent);
             _context.next = 5;
             return convertAttributes(dataForAttributesConversion, useCartesianPositions);
@@ -95,7 +95,6 @@ function _convertB3dmToI3sGeometry() {
             }
 
             result = [];
-            nodesCounter = nodeId;
             _ref3 = tileContent.gltf || {
               materials: []
             }, _ref3$materials = _ref3.materials, materials = _ref3$materials === void 0 ? [] : _ref3$materials;
@@ -108,33 +107,34 @@ function _convertB3dmToI3sGeometry() {
 
             i = 0;
 
-          case 13:
+          case 12:
             if (!(i < materials.length)) {
-              _context.next = 30;
+              _context.next = 29;
               break;
             }
 
             sourceMaterial = materials[i];
 
             if (convertedAttributesMap.has(sourceMaterial.id)) {
-              _context.next = 17;
+              _context.next = 16;
               break;
             }
 
-            return _context.abrupt("continue", 27);
+            return _context.abrupt("continue", 26);
 
-          case 17:
+          case 16:
             convertedAttributes = convertedAttributesMap.get(sourceMaterial.id);
 
             if (convertedAttributes) {
-              _context.next = 20;
+              _context.next = 19;
               break;
             }
 
-            return _context.abrupt("continue", 27);
+            return _context.abrupt("continue", 26);
 
-          case 20:
+          case 19:
             _materialAndTextureLi = materialAndTextureList[i], material = _materialAndTextureLi.material, texture = _materialAndTextureLi.texture;
+            nodeId = addNodeToNodePage();
             _context.t0 = result;
             _context.next = 24;
             return _makeNodeResources({
@@ -142,7 +142,7 @@ function _convertB3dmToI3sGeometry() {
               material: material,
               texture: texture,
               tileContent: tileContent,
-              nodeId: nodesCounter,
+              nodeId: nodeId,
               featuresHashArray: featuresHashArray,
               propertyTable: propertyTable,
               attributeStorageInfo: attributeStorageInfo,
@@ -155,25 +155,23 @@ function _convertB3dmToI3sGeometry() {
 
             _context.t0.push.call(_context.t0, _context.t1);
 
-            nodesCounter++;
-
-          case 27:
+          case 26:
             i++;
-            _context.next = 13;
+            _context.next = 12;
             break;
 
-          case 30:
+          case 29:
             if (result.length) {
-              _context.next = 32;
+              _context.next = 31;
               break;
             }
 
             return _context.abrupt("return", null);
 
-          case 32:
+          case 31:
             return _context.abrupt("return", result);
 
-          case 33:
+          case 32:
           case "end":
             return _context.stop();
         }
@@ -217,7 +215,7 @@ function _makeNodeResources(_x10) {
 
 function _makeNodeResources2() {
   _makeNodeResources2 = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee2(_ref) {
-    var _tileContent$gltf2;
+    var _tileContent$gltf5;
 
     var convertedAttributes, material, texture, tileContent, nodeId, featuresHashArray, propertyTable, attributeStorageInfo, draco, workerSource, boundingVolumes, vertexCount, _generateAttributes, faceRange, featureIds, positions, normals, colors, texCoords, featureCount, header, typedFeatureIds, fileBuffer, compressedGeometry, attributes;
 
@@ -253,10 +251,11 @@ function _makeNodeResources2() {
             }
 
             return _context2.abrupt("return", {
+              nodeId: nodeId,
               geometry: fileBuffer,
               compressedGeometry: compressedGeometry,
               texture: texture,
-              sharedResources: getSharedResources(((_tileContent$gltf2 = tileContent.gltf) === null || _tileContent$gltf2 === void 0 ? void 0 : _tileContent$gltf2.materials) || [], nodeId),
+              sharedResources: getSharedResources(((_tileContent$gltf5 = tileContent.gltf) === null || _tileContent$gltf5 === void 0 ? void 0 : _tileContent$gltf5.materials) || [], nodeId),
               meshMaterial: material,
               vertexCount: vertexCount,
               attributes: attributes,
@@ -280,13 +279,13 @@ function convertAttributes(_x11, _x12) {
 
 function _convertAttributes() {
   _convertAttributes = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee3(attributesData, useCartesianPositions) {
-    var gltfMaterials, nodes, cartographicOrigin, cartesianModelMatrix, attributesMap, _iterator7, _step7, material, _iterator8, _step8, attrKey, attributes;
+    var gltfMaterials, nodes, images, cartographicOrigin, cartesianModelMatrix, attributesMap, _iterator7, _step7, material, _iterator8, _step8, attrKey, attributes;
 
     return _regenerator.default.wrap(function _callee3$(_context3) {
       while (1) {
         switch (_context3.prev = _context3.next) {
           case 0:
-            gltfMaterials = attributesData.gltfMaterials, nodes = attributesData.nodes, cartographicOrigin = attributesData.cartographicOrigin, cartesianModelMatrix = attributesData.cartesianModelMatrix;
+            gltfMaterials = attributesData.gltfMaterials, nodes = attributesData.nodes, images = attributesData.images, cartographicOrigin = attributesData.cartographicOrigin, cartesianModelMatrix = attributesData.cartesianModelMatrix;
             attributesMap = new Map();
             _iterator7 = _createForOfIteratorHelper(gltfMaterials || [{
               id: 'default'
@@ -311,7 +310,7 @@ function _convertAttributes() {
               _iterator7.f();
             }
 
-            convertNodes(nodes, cartographicOrigin, cartesianModelMatrix, attributesMap, useCartesianPositions);
+            convertNodes(nodes, images, cartographicOrigin, cartesianModelMatrix, attributesMap, useCartesianPositions);
             _iterator8 = _createForOfIteratorHelper(attributesMap.keys());
             _context3.prev = 6;
 
@@ -384,8 +383,8 @@ function _convertAttributes() {
   return _convertAttributes.apply(this, arguments);
 }
 
-function convertNodes(nodes, cartographicOrigin, cartesianModelMatrix, attributesMap, useCartesianPositions) {
-  var matrix = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : new _core.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) {
+  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]);
 
   if (nodes) {
     var _iterator2 = _createForOfIteratorHelper(nodes),
@@ -394,7 +393,7 @@ function convertNodes(nodes, cartographicOrigin, cartesianModelMatrix, attribute
     try {
       for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
         var node = _step2.value;
-        convertNode(node, cartographicOrigin, cartesianModelMatrix, attributesMap, useCartesianPositions, matrix);
+        convertNode(node, images, cartographicOrigin, cartesianModelMatrix, attributesMap, useCartesianPositions, matrix);
       }
     } catch (err) {
       _iterator2.e(err);
@@ -430,17 +429,16 @@ function getCompositeTransformationMatrix(node, matrix) {
   return transformationMatrix;
 }
 
-function convertNode(node, cartographicOrigin, cartesianModelMatrix, attributesMap, useCartesianPositions) {
-  var matrix = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : new _core.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) {
+  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 transformationMatrix = getCompositeTransformationMatrix(node, matrix);
   var mesh = node.mesh;
-  var 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) {
@@ -1053,16 +1051,14 @@ function generateFeatureIndexAttribute(featureIndex, faceRange) {
   return orderedFeatureIndices;
 }
 
-function getPropertyTable(sourceTile) {
-  var _sourceTile$content;
-
-  var batchTableJson = sourceTile === null || sourceTile === void 0 ? void 0 : (_sourceTile$content = sourceTile.content) === null || _sourceTile$content === void 0 ? void 0 : _sourceTile$content.batchTableJson;
+function getPropertyTable(tileContent) {
+  var batchTableJson = tileContent === null || tileContent === void 0 ? void 0 : tileContent.batchTableJson;
 
   if (batchTableJson) {
     return batchTableJson;
   }
 
-  var _getPropertyTableExte = getPropertyTableExtension(sourceTile),
+  var _getPropertyTableExte = getPropertyTableExtension(tileContent),
       extensionName = _getPropertyTableExte.extensionName,
       extension = _getPropertyTableExte.extension;
 
@@ -1083,11 +1079,11 @@ function getPropertyTable(sourceTile) {
   }
 }
 
-function getPropertyTableExtension(sourceTile) {
-  var _sourceTile$content2, _sourceTile$content2$, _sourceTile$content3, _sourceTile$content3$, _sourceTile$content3$2, _sourceTile$content4, _sourceTile$content4$;
+function getPropertyTableExtension(tileContent) {
+  var _tileContent$gltf, _tileContent$gltf2, _tileContent$gltf2$ex, _tileContent$gltf3;
 
   var extensionsWithPropertyTables = [EXT_FEATURE_METADATA, EXT_MESH_FEATURES];
-  var extensionsUsed = sourceTile === null || sourceTile === void 0 ? void 0 : (_sourceTile$content2 = sourceTile.content) === null || _sourceTile$content2 === void 0 ? void 0 : (_sourceTile$content2$ = _sourceTile$content2.gltf) === null || _sourceTile$content2$ === void 0 ? void 0 : _sourceTile$content2$.extensionsUsed;
+  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 {
@@ -1098,7 +1094,7 @@ function getPropertyTableExtension(sourceTile) {
 
   var extensionName = '';
 
-  var _iterator6 = _createForOfIteratorHelper(sourceTile === null || sourceTile === void 0 ? void 0 : (_sourceTile$content4 = sourceTile.content) === null || _sourceTile$content4 === void 0 ? void 0 : (_sourceTile$content4$ = _sourceTile$content4.gltf) === null || _sourceTile$content4$ === void 0 ? void 0 : _sourceTile$content4$.extensionsUsed),
+  var _iterator6 = _createForOfIteratorHelper((tileContent === null || tileContent === void 0 ? void 0 : (_tileContent$gltf3 = tileContent.gltf) === null || _tileContent$gltf3 === void 0 ? void 0 : _tileContent$gltf3.extensionsUsed) || []),
       _step6;
 
   try {
@@ -1116,7 +1112,7 @@ function getPropertyTableExtension(sourceTile) {
     _iterator6.f();
   }
 
-  var extension = sourceTile === null || sourceTile === void 0 ? void 0 : (_sourceTile$content3 = sourceTile.content) === null || _sourceTile$content3 === void 0 ? void 0 : (_sourceTile$content3$ = _sourceTile$content3.gltf) === null || _sourceTile$content3$ === void 0 ? void 0 : (_sourceTile$content3$2 = _sourceTile$content3$.extensions) === null || _sourceTile$content3$2 === void 0 ? void 0 : _sourceTile$content3$2[extensionName];
+  var extension = tileContent === null || tileContent === void 0 ? void 0 : (_tileContent$gltf2 = tileContent.gltf) === null || _tileContent$gltf2 === void 0 ? void 0 : (_tileContent$gltf2$ex = _tileContent$gltf2.extensions) === null || _tileContent$gltf2$ex === void 0 ? void 0 : _tileContent$gltf2$ex[extensionName];
   return {
     extensionName: extensionName,
     extension: extension