@loaders.gl/tile-converter 4.0.0-alpha.6 → 4.0.0-alpha.7

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

@@ -24,6 +24,7 @@ var _gltfAttributes = require("./gltf-attributes");
 var _batchIdsExtensions = require("./batch-ids-extensions");
 var _featureAttributes = require("./feature-attributes");
 var _math = require("@loaders.gl/math");
+var _geometryUtils = require("../../lib/utils/geometry-utils");
 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; }
@@ -376,21 +377,22 @@ function convertMesh(mesh, images, cartographicOrigin, cartesianModelMatrix, att
       var materialUvRegion;
       if (primitive.material) {
         var _outputAttributes, _outputAttributes$mer;
-        outputAttributes = attributesMap.get(primitive.material.uniqueId);
+        outputAttributes = attributesMap.get(primitive.material.id);
         materialUvRegion = (_outputAttributes = outputAttributes) === null || _outputAttributes === void 0 ? void 0 : (_outputAttributes$mer = _outputAttributes.mergedMaterials.find(function (_ref2) {
           var _primitive$material;
           var originalMaterialId = _ref2.originalMaterialId;
-          return originalMaterialId === ((_primitive$material = primitive.material) === null || _primitive$material === void 0 ? void 0 : _primitive$material.uniqueId);
+          return originalMaterialId === ((_primitive$material = primitive.material) === null || _primitive$material === void 0 ? void 0 : _primitive$material.id);
         })) === null || _outputAttributes$mer === void 0 ? void 0 : _outputAttributes$mer.uvRegion;
       } else if (attributesMap.has('default')) {
         outputAttributes = attributesMap.get('default');
       }
       (0, _core2.assert)(outputAttributes !== null, 'Primitive - material mapping failed');
+      (0, _core2.assert)(primitive.mode === _math.GL.TRIANGLES || primitive.mode === _math.GL.TRIANGLE_STRIP, "Primitive - unsupported mode ".concat(primitive.mode));
       var attributes = primitive.attributes;
       if (!outputAttributes) {
         return "continue";
       }
-      var indices = getIndices(primitive);
+      var indices = normalizeIndices(primitive);
       outputAttributes.positions = (0, _loaderUtils.concatenateTypedArrays)(outputAttributes.positions, transformVertexArray({
         vertices: attributes.POSITION.value,
         cartographicOrigin: cartographicOrigin,
@@ -427,9 +429,13 @@ function convertMesh(mesh, images, cartographicOrigin, cartesianModelMatrix, att
     _iterator3.f();
   }
 }
-function getIndices(primitive) {
+function normalizeIndices(primitive) {
   var _primitive$indices;
   var indices = (_primitive$indices = primitive.indices) === null || _primitive$indices === void 0 ? void 0 : _primitive$indices.value;
+  if (!indices) {
+    var positions = primitive.attributes.POSITION.value;
+    return (0, _geometryUtils.generateSyntheticIndices)(positions.length / VALUES_PER_VERTEX);
+  }
   if (indices && primitive.mode === _math.GL.TRIANGLE_STRIP) {
     var TypedArrayConstructor = indices.constructor;
     var newIndices = new TypedArrayConstructor((indices.length - 2) * 3);
@@ -643,12 +649,12 @@ function _mergeAllMaterials() {
           break;
         case 15:
           if (newMaterial.texture && mergedIndices.length) {
-            newWidth = (_newMaterial$mergedMa = newMaterial.mergedMaterials) === null || _newMaterial$mergedMa === void 0 ? void 0 : _newMaterial$mergedMa.reduce(function (accum, _ref4) {
-              var textureSize = _ref4.textureSize;
+            newWidth = (_newMaterial$mergedMa = newMaterial.mergedMaterials) === null || _newMaterial$mergedMa === void 0 ? void 0 : _newMaterial$mergedMa.reduce(function (accum, _ref5) {
+              var textureSize = _ref5.textureSize;
               return accum + ((textureSize === null || textureSize === void 0 ? void 0 : textureSize.width) || 0);
             }, 0);
-            newHeight = (_newMaterial$mergedMa2 = newMaterial.mergedMaterials) === null || _newMaterial$mergedMa2 === void 0 ? void 0 : _newMaterial$mergedMa2.reduce(function (accum, _ref5) {
-              var textureSize = _ref5.textureSize;
+            newHeight = (_newMaterial$mergedMa2 = newMaterial.mergedMaterials) === null || _newMaterial$mergedMa2 === void 0 ? void 0 : _newMaterial$mergedMa2.reduce(function (accum, _ref6) {
+              var textureSize = _ref6.textureSize;
               return Math.max(accum, (textureSize === null || textureSize === void 0 ? void 0 : textureSize.height) || 0);
             }, 0);
             currentX = -1;
@@ -781,10 +787,9 @@ function convertMaterial(sourceMaterial) {
       textureSetDefinitionId: 0
     };
   }
-  var uniqueId = (0, _uuid.v4)();
-  sourceMaterial.uniqueId = uniqueId;
+  sourceMaterial.id = Number.isFinite(sourceMaterial.id) ? sourceMaterial.id : (0, _uuid.v4)();
   var mergedMaterials = [{
-    originalMaterialId: uniqueId
+    originalMaterialId: sourceMaterial.id
   }];
   if (!texture) {
     var _sourceMaterial$pbrMe4;
@@ -892,21 +897,24 @@ function extractSharedResourcesMaterialInfo(baseColorFactor) {
   };
 }
 function extractSharedResourcesTextureInfo(texture, nodeId) {
-  var _texture$source, _texture$source2, _texture$source3;
+  var _texture$source, _texture$source2, _texture$source3, _texture$source4;
   return {
     encoding: texture !== null && texture !== void 0 && (_texture$source = texture.source) !== null && _texture$source !== void 0 && _texture$source.mimeType ? [texture.source.mimeType] : undefined,
     images: [{
       id: generateImageId(texture, nodeId),
       size: (_texture$source2 = texture.source) === null || _texture$source2 === void 0 ? void 0 : _texture$source2.image.width,
-      length: [(_texture$source3 = texture.source) === null || _texture$source3 === void 0 ? void 0 : _texture$source3.image.data.length]
+      length: (_texture$source3 = texture.source) !== null && _texture$source3 !== void 0 && _texture$source3.image.data.length ? [(_texture$source4 = texture.source) === null || _texture$source4 === void 0 ? void 0 : _texture$source4.image.data.length] : undefined
     }]
   };
 }
 function generateImageId(texture, nodeId) {
-  var _texture$source4;
-  var _texture$source$image = (_texture$source4 = texture.source) === null || _texture$source4 === void 0 ? void 0 : _texture$source4.image,
-    width = _texture$source$image.width,
-    height = _texture$source$image.height;
+  var _texture$source5;
+  var _ref4 = ((_texture$source5 = texture.source) === null || _texture$source5 === void 0 ? void 0 : _texture$source5.image) || {},
+    width = _ref4.width,
+    height = _ref4.height;
+  if (!width || !height) {
+    return '';
+  }
   var levelCountOfTexture = 1;
   var indexOfLevel = 0;
   var indexOfTextureInStore = nodeId + 1;