@loaders.gl/gltf 4.0.0-alpha.23 → 4.0.0-alpha.25

package/dist/es5/lib/extensions/EXT_structural_metadata.js

@@ -5,12 +5,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.decode = decode;
+exports.getPropertyTableFromExtStructuralMetadata = getPropertyTableFromExtStructuralMetadata;
 exports.getPropertyTablePopulated = getPropertyTablePopulated;
 exports.name = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _gltfScenegraph = require("../api/gltf-scenegraph");
-var _dataProcessing = require("./data-processing");
+var _dTilesUtils = require("./utils/3d-tiles-utils");
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
@@ -36,6 +37,26 @@ function _decode() {
   }));
   return _decode.apply(this, arguments);
 }
+function getPropertyTableFromExtStructuralMetadata(extension, metadataClass) {
+  if (extension.propertyTables) {
+    var firstPropertyTable = extension === null || extension === void 0 ? void 0 : extension.propertyTables[0];
+    var propertyTableWithData = {};
+    for (var propertyName in firstPropertyTable.properties) {
+      propertyTableWithData[propertyName] = firstPropertyTable.properties[propertyName].data;
+    }
+    return propertyTableWithData;
+  }
+  if (extension.propertyTextures) {
+    var firstPropertyTexture = extension === null || extension === void 0 ? void 0 : extension.propertyTextures[0];
+    var _propertyTableWithData = {};
+    for (var _propertyName in firstPropertyTexture.properties) {
+      _propertyTableWithData[_propertyName] = firstPropertyTexture.properties[_propertyName].data;
+    }
+    return _propertyTableWithData;
+  }
+  console.warn('Cannot get property table from EXT_structural_metadata extension. There is neither propertyTables, nor propertyTextures in the extension.');
+  return null;
+}
 function getPropertyTablePopulated(scenegraph, propertyTableIndex) {
   var _extension$propertyTa;
   var extension = scenegraph.getExtension(EXT_STRUCTURAL_METADATA_NAME);
@@ -47,14 +68,23 @@ function getPropertyTablePopulated(scenegraph, propertyTableIndex) {
   throw new Error("Incorrect data in the EXT_structural_metadata extension: no property table with index ".concat(propertyTableIndex));
 }
 function decodeExtStructuralMetadata(scenegraph, options) {
-  var _options$gltf;
+  var _options$gltf, _options$gltf2;
+  if (!((_options$gltf = options.gltf) !== null && _options$gltf !== void 0 && _options$gltf.loadBuffers)) {
+    return;
+  }
   var extension = scenegraph.getExtension(EXT_STRUCTURAL_METADATA_NAME);
-  if (!(extension !== null && extension !== void 0 && extension.schema)) {
+  if (!extension) {
     return;
   }
+  if ((_options$gltf2 = options.gltf) !== null && _options$gltf2 !== void 0 && _options$gltf2.loadImages) {
+    decodePropertyTextures(scenegraph, extension);
+  }
+  decodePropertyTables(scenegraph, extension);
+}
+function decodePropertyTextures(scenegraph, extension) {
   var propertyTextures = extension.propertyTextures;
   var json = scenegraph.gltf.json;
-  if (propertyTextures && json.meshes && options !== null && options !== void 0 && (_options$gltf = options.gltf) !== null && _options$gltf !== void 0 && _options$gltf.loadImages) {
+  if (propertyTextures && json.meshes) {
     var _iterator = _createForOfIteratorHelper(json.meshes),
       _step;
     try {
@@ -79,17 +109,40 @@ function decodeExtStructuralMetadata(scenegraph, options) {
       _iterator.f();
     }
   }
-  var schemaClasses = extension.schema.classes;
+}
+function decodePropertyTables(scenegraph, extension) {
+  var schema = extension.schema;
+  if (!schema) {
+    return;
+  }
+  var schemaClasses = schema.classes;
   var propertyTables = extension.propertyTables;
   if (schemaClasses && propertyTables) {
     for (var schemaName in schemaClasses) {
       var propertyTable = findPropertyTableByClass(propertyTables, schemaName);
       if (propertyTable) {
-        processPropertyTable(scenegraph, extension.schema, propertyTable);
+        processPropertyTable(scenegraph, schema, propertyTable);
       }
     }
   }
 }
+function findPropertyTableByClass(propertyTables, schemaClassName) {
+  var _iterator3 = _createForOfIteratorHelper(propertyTables),
+    _step3;
+  try {
+    for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+      var propertyTable = _step3.value;
+      if (propertyTable.class === schemaClassName) {
+        return propertyTable;
+      }
+    }
+  } catch (err) {
+    _iterator3.e(err);
+  } finally {
+    _iterator3.f();
+  }
+  return null;
+}
 function processPrimitivePropertyTextures(scenegraph, propertyTextures, primitive, extension) {
   var _primitive$extensions;
   if (!propertyTextures) {
@@ -100,18 +153,18 @@ function processPrimitivePropertyTextures(scenegraph, propertyTextures, primitiv
   if (!primitivePropertyTextureIndices) {
     return;
   }
-  var _iterator3 = _createForOfIteratorHelper(primitivePropertyTextureIndices),
-    _step3;
+  var _iterator4 = _createForOfIteratorHelper(primitivePropertyTextureIndices),
+    _step4;
   try {
-    for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-      var primitivePropertyTextureIndex = _step3.value;
+    for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+      var primitivePropertyTextureIndex = _step4.value;
       var propertyTexture = propertyTextures[primitivePropertyTextureIndex];
       processPrimitivePropertyTexture(scenegraph, propertyTexture, primitive, extension);
     }
   } catch (err) {
-    _iterator3.e(err);
+    _iterator4.e(err);
   } finally {
-    _iterator3.f();
+    _iterator4.f();
   }
 }
 function processPrimitivePropertyTexture(scenegraph, propertyTexture, primitive, extension) {
@@ -122,10 +175,10 @@ function processPrimitivePropertyTexture(scenegraph, propertyTexture, primitive,
     extension.dataAttributeNames = [];
   }
   var className = propertyTexture.class;
-  for (var propName in propertyTexture.properties) {
+  for (var propertyName in propertyTexture.properties) {
     var _propertyTexture$prop;
-    var attributeName = "".concat(className, "_").concat(propName);
-    var textureInfoTopLevel = (_propertyTexture$prop = propertyTexture.properties) === null || _propertyTexture$prop === void 0 ? void 0 : _propertyTexture$prop[propName];
+    var attributeName = "".concat(className, "_").concat(propertyName);
+    var textureInfoTopLevel = (_propertyTexture$prop = propertyTexture.properties) === null || _propertyTexture$prop === void 0 ? void 0 : _propertyTexture$prop[propertyName];
     if (!textureInfoTopLevel) {
       continue;
     }
@@ -133,11 +186,11 @@ function processPrimitivePropertyTexture(scenegraph, propertyTexture, primitive,
       textureInfoTopLevel.data = [];
     }
     var featureTextureTable = textureInfoTopLevel.data;
-    var propertyData = (0, _dataProcessing.getPrimitiveTextureData)(scenegraph, textureInfoTopLevel, primitive);
+    var propertyData = (0, _dTilesUtils.getPrimitiveTextureData)(scenegraph, textureInfoTopLevel, primitive);
     if (propertyData === null) {
       continue;
     }
-    (0, _dataProcessing.primitivePropertyDataToAttributes)(scenegraph, attributeName, propertyData, featureTextureTable, primitive);
+    (0, _dTilesUtils.primitivePropertyDataToAttributes)(scenegraph, attributeName, propertyData, featureTextureTable, primitive);
     textureInfoTopLevel.data = featureTextureTable;
     extension.dataAttributeNames.push(attributeName);
   }
@@ -163,14 +216,8 @@ function getPropertyDataFromBinarySource(scenegraph, schema, classProperty, numb
   var data = [];
   var valuesBufferView = propertyTableProperty.values;
   var valuesDataBytes = scenegraph.getTypedArrayForBufferView(valuesBufferView);
-  var arrayOffsets = null;
-  if (classProperty.array && typeof classProperty.count === 'undefined' && typeof propertyTableProperty.arrayOffsets !== 'undefined' && typeof propertyTableProperty.arrayOffsetType !== 'undefined') {
-    arrayOffsets = getOffsetArray(scenegraph, propertyTableProperty.arrayOffsets, propertyTableProperty.arrayOffsetType, numberOfElements);
-  }
-  var stringOffsets = null;
-  if (typeof propertyTableProperty.stringOffsets !== 'undefined' && typeof propertyTableProperty.stringOffsetType !== 'undefined') {
-    stringOffsets = getOffsetArray(scenegraph, propertyTableProperty.stringOffsets, propertyTableProperty.stringOffsetType, numberOfElements);
-  }
+  var arrayOffsets = getArrayOffsetsForProperty(scenegraph, classProperty, propertyTableProperty, numberOfElements);
+  var stringOffsets = getStringOffsetsForProperty(scenegraph, propertyTableProperty, numberOfElements);
   switch (classProperty.type) {
     case 'SCALAR':
     case 'VEC2':
@@ -202,66 +249,62 @@ function getPropertyDataFromBinarySource(scenegraph, schema, classProperty, numb
   }
   return data;
 }
-function getOffsetArray(scenegraph, offsets, offsetType, numberOfElements) {
-  var arrayOffsetsBufferView = offsets;
-  var arrayOffsetsBytes = scenegraph.getTypedArrayForBufferView(arrayOffsetsBufferView);
-  var arrayOffsets = (0, _dataProcessing.convertRawBufferToMetadataArray)(arrayOffsetsBytes, 'SCALAR', offsetType, numberOfElements + 1);
-  return arrayOffsets;
+function getArrayOffsetsForProperty(scenegraph, classProperty, propertyTableProperty, numberOfElements) {
+  if (classProperty.array && typeof classProperty.count === 'undefined' && typeof propertyTableProperty.arrayOffsets !== 'undefined') {
+    return (0, _dTilesUtils.getOffsetsForProperty)(scenegraph, propertyTableProperty.arrayOffsets, propertyTableProperty.arrayOffsetType || 'UINT32', numberOfElements);
+  }
+  return null;
+}
+function getStringOffsetsForProperty(scenegraph, propertyTableProperty, numberOfElements) {
+  if (typeof propertyTableProperty.stringOffsets !== 'undefined') {
+    return (0, _dTilesUtils.getOffsetsForProperty)(scenegraph, propertyTableProperty.stringOffsets, propertyTableProperty.stringOffsetType || 'UINT32', numberOfElements);
+  }
+  return null;
 }
 function getPropertyDataNumeric(classProperty, numberOfElements, valuesDataBytes, arrayOffsets) {
   var isArray = classProperty.array;
   var arrayCount = classProperty.count;
-  var elementSize = (0, _dataProcessing.getArrayElementByteSize)(classProperty.type, classProperty.componentType);
+  var elementSize = (0, _dTilesUtils.getArrayElementByteSize)(classProperty.type, classProperty.componentType);
   var elementCount = valuesDataBytes.byteLength / elementSize;
   var valuesData;
   if (classProperty.componentType) {
-    valuesData = (0, _dataProcessing.convertRawBufferToMetadataArray)(valuesDataBytes, classProperty.type, classProperty.componentType, elementCount);
+    valuesData = (0, _dTilesUtils.convertRawBufferToMetadataArray)(valuesDataBytes, classProperty.type, classProperty.componentType, elementCount);
+    if (!valuesData) {
+      valuesData = valuesDataBytes;
+    }
   } else {
     valuesData = valuesDataBytes;
   }
   if (isArray) {
     if (arrayOffsets) {
-      return handleVariableLengthArrayNumeric(valuesData, numberOfElements, arrayOffsets, valuesDataBytes.length, elementSize);
+      return parseVariableLengthArrayNumeric(valuesData, numberOfElements, arrayOffsets, valuesDataBytes.length, elementSize);
     }
     if (arrayCount) {
-      return handleFixedLengthArrayNumeric(valuesData, numberOfElements, arrayCount);
+      return parseFixedLengthArrayNumeric(valuesData, numberOfElements, arrayCount);
     }
     return [];
   }
-  var attributeValueArray = [];
-  for (var index = 0; index < numberOfElements; index++) {
-    var value = valuesData[index];
-    attributeValueArray.push(value);
-  }
-  return attributeValueArray;
+  return valuesData;
 }
-function handleVariableLengthArrayNumeric(valuesData, numberOfElements, arrayOffsets, valuesDataBytesLength, elementSize) {
+function parseVariableLengthArrayNumeric(valuesData, numberOfElements, arrayOffsets, valuesDataBytesLength, valueSize) {
   var attributeValueArray = [];
   for (var index = 0; index < numberOfElements; index++) {
-    var array = [];
     var arrayOffset = arrayOffsets[index];
     var arrayByteSize = arrayOffsets[index + 1] - arrayOffsets[index];
-    if (arrayByteSize + arrayOffset <= valuesDataBytesLength) {
-      var typedArrayOffset = arrayOffset / elementSize;
-      var elementCount = arrayByteSize / elementSize;
-      for (var i = 0; i < elementCount; i++) {
-        var value = valuesData[typedArrayOffset + i];
-        array.push(value);
-      }
+    if (arrayByteSize + arrayOffset > valuesDataBytesLength) {
+      break;
     }
-    attributeValueArray.push(array);
+    var typedArrayOffset = arrayOffset / valueSize;
+    var elementCount = arrayByteSize / valueSize;
+    attributeValueArray.push(valuesData.slice(typedArrayOffset, typedArrayOffset + elementCount));
   }
   return attributeValueArray;
 }
-function handleFixedLengthArrayNumeric(valuesData, numberOfElements, arrayCount) {
+function parseFixedLengthArrayNumeric(valuesData, numberOfElements, arrayCount) {
   var attributeValueArray = [];
   for (var index = 0; index < numberOfElements; index++) {
-    var array = [];
-    for (var i = 0; i < arrayCount; i++) {
-      var value = valuesData[i];
-      array.push(value);
-    }
-    attributeValueArray.push(array);
+    var elementOffset = index * arrayCount;
+    attributeValueArray.push(valuesData.slice(elementOffset, elementOffset + arrayCount));
   }
   return attributeValueArray;
 }
@@ -288,9 +331,6 @@ function getPropertyDataString(classProperty, numberOfElements, valuesDataBytes,
 }
 function getPropertyDataENUM(schema, classProperty, numberOfElements, valuesDataBytes, arrayOffsets) {
   var _schema$enums;
-  var data = [];
-  var isArray = classProperty.array;
-  var arrayCount = classProperty.count;
   var enumType = classProperty.enumType;
   if (!enumType) {
     throw new Error('Incorrect data in the EXT_structural_metadata extension: classProperty.enumType is not set for type ENUM');
@@ -300,86 +340,92 @@ function getPropertyDataENUM(schema, classProperty, numberOfElements, valuesData
     throw new Error("Incorrect data in the EXT_structural_metadata extension: schema.enums does't contain ".concat(enumType));
   }
   var enumValueType = enumEntry.valueType || 'UINT16';
-  var elementSize = (0, _dataProcessing.getArrayElementByteSize)(classProperty.type, enumValueType);
+  var elementSize = (0, _dTilesUtils.getArrayElementByteSize)(classProperty.type, enumValueType);
   var elementCount = valuesDataBytes.byteLength / elementSize;
-  var valuesData = (0, _dataProcessing.convertRawBufferToMetadataArray)(valuesDataBytes, classProperty.type, enumValueType, elementCount);
-  if (isArray) {
+  var valuesData = (0, _dTilesUtils.convertRawBufferToMetadataArray)(valuesDataBytes, classProperty.type, enumValueType, elementCount);
+  if (!valuesData) {
+    valuesData = valuesDataBytes;
+  }
+  if (classProperty.array) {
     if (arrayOffsets) {
-      return handleVariableLengthArrayENUM(valuesData, numberOfElements, arrayOffsets, valuesDataBytes.length, elementSize, enumEntry);
+      return parseVariableLengthArrayENUM({
+        valuesData: valuesData,
+        numberOfElements: numberOfElements,
+        arrayOffsets: arrayOffsets,
+        valuesDataBytesLength: valuesDataBytes.length,
+        elementSize: elementSize,
+        enumEntry: enumEntry
+      });
     }
+    var arrayCount = classProperty.count;
     if (arrayCount) {
-      return handleFixedLengthArrayENUM(valuesData, numberOfElements, arrayCount, enumEntry);
+      return parseFixedLengthArrayENUM(valuesData, numberOfElements, arrayCount, enumEntry);
     }
     return [];
   }
-  for (var index = 0; index < numberOfElements; index++) {
-    var enumValue = valuesData[index];
-    var enumObject = getEnumByValue(enumEntry, enumValue);
-    if (enumObject) {
-      data.push(enumObject.name);
-    }
-  }
-  return data;
+  return getEnumsArray(valuesData, 0, numberOfElements, enumEntry);
 }
-function handleVariableLengthArrayENUM(valuesData, numberOfElements, arrayOffsets, valuesDataBytesLength, elementSize, enumEntry) {
+function parseVariableLengthArrayENUM(params) {
+  var valuesData = params.valuesData,
+    numberOfElements = params.numberOfElements,
+    arrayOffsets = params.arrayOffsets,
+    valuesDataBytesLength = params.valuesDataBytesLength,
+    elementSize = params.elementSize,
+    enumEntry = params.enumEntry;
   var attributeValueArray = [];
   for (var index = 0; index < numberOfElements; index++) {
-    var array = [];
     var arrayOffset = arrayOffsets[index];
     var arrayByteSize = arrayOffsets[index + 1] - arrayOffsets[index];
-    if (arrayByteSize + arrayOffset <= valuesDataBytesLength) {
-      var typedArrayOffset = arrayOffset / elementSize;
-      var elementCount = arrayByteSize / elementSize;
-      for (var i = 0; i < elementCount; i++) {
-        var value = valuesData[typedArrayOffset + i];
-        var enumObject = getEnumByValue(enumEntry, value);
-        if (enumObject) {
-          array.push(enumObject.name);
-        }
-      }
+    if (arrayByteSize + arrayOffset > valuesDataBytesLength) {
+      break;
     }
+    var typedArrayOffset = arrayOffset / elementSize;
+    var elementCount = arrayByteSize / elementSize;
+    var array = getEnumsArray(valuesData, typedArrayOffset, elementCount, enumEntry);
     attributeValueArray.push(array);
   }
   return attributeValueArray;
 }
-function handleFixedLengthArrayENUM(valuesData, numberOfElements, arrayCount, enumEntry) {
+function parseFixedLengthArrayENUM(valuesData, numberOfElements, arrayCount, enumEntry) {
   var attributeValueArray = [];
   for (var index = 0; index < numberOfElements; index++) {
-    var array = [];
-    for (var i = 0; i < arrayCount; i++) {
-      var value = valuesData[i];
-      var enumObject = getEnumByValue(enumEntry, value);
-      if (enumObject) {
-        array.push(enumObject.name);
-      }
-    }
+    var elementOffset = arrayCount * index;
+    var array = getEnumsArray(valuesData, elementOffset, arrayCount, enumEntry);
     attributeValueArray.push(array);
   }
   return attributeValueArray;
 }
-function findPropertyTableByClass(propertyTables, schemaClassName) {
-  for (var i = 0, len = propertyTables.length; i < len; i++) {
-    var propertyTable = propertyTables[i];
-    if (propertyTable.class === schemaClassName) {
-      return propertyTable;
+function getEnumsArray(valuesData, offset, count, enumEntry) {
+  var array = [];
+  for (var i = 0; i < count; i++) {
+    if (valuesData instanceof BigInt64Array || valuesData instanceof BigUint64Array) {
+      array.push('');
+    } else {
+      var value = valuesData[offset + i];
+      var enumObject = getEnumByValue(enumEntry, value);
+      if (enumObject) {
+        array.push(enumObject.name);
+      } else {
+        array.push('');
+      }
     }
   }
-  return null;
+  return array;
 }
 function getEnumByValue(enumEntry, value) {
-  var _iterator4 = _createForOfIteratorHelper(enumEntry.values),
-    _step4;
+  var _iterator5 = _createForOfIteratorHelper(enumEntry.values),
+    _step5;
   try {
-    for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
-      var enumValue = _step4.value;
+    for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+      var enumValue = _step5.value;
       if (enumValue.value === value) {
         return enumValue;
       }
     }
   } catch (err) {
-    _iterator4.e(err);
+    _iterator5.e(err);
   } finally {
-    _iterator4.f();
+    _iterator5.f();
   }
   return null;
 }