@loaders.gl/gltf 3.1.0-alpha.4 → 3.1.0-beta.3

package/dist/es5/lib/extensions/KHR_binary_gltf.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/lib/extensions/KHR_binary_gltf.ts"],"names":["KHR_BINARY_GLTF","name","preprocess","gltfData","gltfScenegraph","GLTFScenegraph","json","images","image","extension","getObjectExtension","Object","assign","removeObjectExtension","buffers","uri","removeExtension"],"mappings":";;;;;;;;;;AAMA;;;;;;;;AAEA,IAAMA,eAAe,GAAG,iBAAxB;AAGO,IAAMC,IAAI,GAAGD,eAAb;;;AAEA,SAASE,UAAT,CAAoBC,QAApB,EAAkD;AACvD,MAAMC,cAAc,GAAG,IAAIC,uBAAJ,CAAmBF,QAAnB,CAAvB;AACA,MAAOG,IAAP,GAAeF,cAAf,CAAOE,IAAP;;AAFuD,6CASnCA,IAAI,CAACC,MAAL,IAAe,EAToB;AAAA;;AAAA;AASvD,wDAAuC;AAAA,UAA5BC,KAA4B;AACrC,UAAMC,SAAS,GAAGL,cAAc,CAACM,kBAAf,CAChBF,KADgB,EAEhBR,eAFgB,CAAlB;;AAKA,UAAIS,SAAJ,EAAe;AACbE,QAAAA,MAAM,CAACC,MAAP,CAAcJ,KAAd,EAAqBC,SAArB;AACD;;AACDL,MAAAA,cAAc,CAACS,qBAAf,CAAqCL,KAArC,EAA4CR,eAA5C;AACD;AAnBsD;AAAA;AAAA;AAAA;AAAA;;AAyBvD,MAAIM,IAAI,CAACQ,OAAL,IAAgBR,IAAI,CAACQ,OAAL,CAAa,CAAb,CAApB,EAAqC;AACnC,WAAOR,IAAI,CAACQ,OAAL,CAAa,CAAb,EAAgBC,GAAvB;AACD;;AAGDX,EAAAA,cAAc,CAACY,eAAf,CAA+BhB,eAA/B;AACD","sourcesContent":["// GLTF 1.0 EXTENSION: KHR_binary_glTF\n// https://github.com/KhronosGroup/glTF/tree/master/extensions/1.0/Khronos/KHR_binary_glTF\n/* eslint-disable camelcase */\n\nimport type {GLTF, GLTF_KHR_binary_glTF} from '../types/gltf-types';\n\nimport GLTFScenegraph from '../api/gltf-scenegraph';\n\nconst KHR_BINARY_GLTF = 'KHR_binary_glTF';\n\n/** Extension name */\nexport const name = KHR_BINARY_GLTF;\n\nexport function preprocess(gltfData: {json: GLTF}): void {\n  const gltfScenegraph = new GLTFScenegraph(gltfData);\n  const {json} = gltfScenegraph;\n\n  // Note: json.buffers.binary_glTF also needs to be replaced\n  // This is currently done during gltf normalization\n\n  // Image and shader nodes can have the extension\n  // https://github.com/KhronosGroup/glTF/blob/master/extensions/1.0/Khronos/KHR_binary_glTF/schema/image.KHR_binary_glTF.schema.json\n  for (const image of json.images || []) {\n    const extension = gltfScenegraph.getObjectExtension<GLTF_KHR_binary_glTF>(\n      image,\n      KHR_BINARY_GLTF\n    );\n    // The data in the extension is valid as glTF 2.0 data inside the object, so just copy it in\n    if (extension) {\n      Object.assign(image, extension);\n    }\n    gltfScenegraph.removeObjectExtension(image, KHR_BINARY_GLTF);\n  }\n\n  // TODO shaders - At least traverse and throw error if used?\n  // https://github.com/KhronosGroup/glTF/blob/master/extensions/1.0/Khronos/KHR_binary_glTF/schema/shader.KHR_binary_glTF.schema.json\n\n  // glTF v1 one files have a partially formed URI field that is not expected in (and causes problems in) 2.0\n  if (json.buffers && json.buffers[0]) {\n    delete json.buffers[0].uri;\n  }\n\n  // Remove the top-level extension as it has now been removed from all nodes\n  gltfScenegraph.removeExtension(KHR_BINARY_GLTF);\n}\n\n// KHR_binary_gltf is a 1.0 extension that is supported natively by 2.0\n// export function encode() {\n//   throw new Error(KHR_BINARY_GLTF);\n// }\n"],"file":"KHR_binary_gltf.js"}
+{"version":3,"sources":["../../../../src/lib/extensions/KHR_binary_gltf.ts"],"names":["KHR_BINARY_GLTF","name","preprocess","gltfData","gltfScenegraph","GLTFScenegraph","json","image","images","extension","getObjectExtension","Object","assign","removeObjectExtension","buffers","uri","removeExtension"],"mappings":";;;;;;;;;;AAMA;;AAEA,MAAMA,eAAe,GAAG,iBAAxB;AAGO,MAAMC,IAAI,GAAGD,eAAb;;;AAEA,SAASE,UAAT,CAAoBC,QAApB,EAAkD;AACvD,QAAMC,cAAc,GAAG,IAAIC,uBAAJ,CAAmBF,QAAnB,CAAvB;AACA,QAAM;AAACG,IAAAA;AAAD,MAASF,cAAf;;AAOA,OAAK,MAAMG,KAAX,IAAoBD,IAAI,CAACE,MAAL,IAAe,EAAnC,EAAuC;AACrC,UAAMC,SAAS,GAAGL,cAAc,CAACM,kBAAf,CAChBH,KADgB,EAEhBP,eAFgB,CAAlB;;AAKA,QAAIS,SAAJ,EAAe;AACbE,MAAAA,MAAM,CAACC,MAAP,CAAcL,KAAd,EAAqBE,SAArB;AACD;;AACDL,IAAAA,cAAc,CAACS,qBAAf,CAAqCN,KAArC,EAA4CP,eAA5C;AACD;;AAMD,MAAIM,IAAI,CAACQ,OAAL,IAAgBR,IAAI,CAACQ,OAAL,CAAa,CAAb,CAApB,EAAqC;AACnC,WAAOR,IAAI,CAACQ,OAAL,CAAa,CAAb,EAAgBC,GAAvB;AACD;;AAGDX,EAAAA,cAAc,CAACY,eAAf,CAA+BhB,eAA/B;AACD","sourcesContent":["// GLTF 1.0 EXTENSION: KHR_binary_glTF\n// https://github.com/KhronosGroup/glTF/tree/master/extensions/1.0/Khronos/KHR_binary_glTF\n/* eslint-disable camelcase */\n\nimport type {GLTF, GLTF_KHR_binary_glTF} from '../types/gltf-types';\n\nimport GLTFScenegraph from '../api/gltf-scenegraph';\n\nconst KHR_BINARY_GLTF = 'KHR_binary_glTF';\n\n/** Extension name */\nexport const name = KHR_BINARY_GLTF;\n\nexport function preprocess(gltfData: {json: GLTF}): void {\n  const gltfScenegraph = new GLTFScenegraph(gltfData);\n  const {json} = gltfScenegraph;\n\n  // Note: json.buffers.binary_glTF also needs to be replaced\n  // This is currently done during gltf normalization\n\n  // Image and shader nodes can have the extension\n  // https://github.com/KhronosGroup/glTF/blob/master/extensions/1.0/Khronos/KHR_binary_glTF/schema/image.KHR_binary_glTF.schema.json\n  for (const image of json.images || []) {\n    const extension = gltfScenegraph.getObjectExtension<GLTF_KHR_binary_glTF>(\n      image,\n      KHR_BINARY_GLTF\n    );\n    // The data in the extension is valid as glTF 2.0 data inside the object, so just copy it in\n    if (extension) {\n      Object.assign(image, extension);\n    }\n    gltfScenegraph.removeObjectExtension(image, KHR_BINARY_GLTF);\n  }\n\n  // TODO shaders - At least traverse and throw error if used?\n  // https://github.com/KhronosGroup/glTF/blob/master/extensions/1.0/Khronos/KHR_binary_glTF/schema/shader.KHR_binary_glTF.schema.json\n\n  // glTF v1 one files have a partially formed URI field that is not expected in (and causes problems in) 2.0\n  if (json.buffers && json.buffers[0]) {\n    delete json.buffers[0].uri;\n  }\n\n  // Remove the top-level extension as it has now been removed from all nodes\n  gltfScenegraph.removeExtension(KHR_BINARY_GLTF);\n}\n\n// KHR_binary_gltf is a 1.0 extension that is supported natively by 2.0\n// export function encode() {\n//   throw new Error(KHR_BINARY_GLTF);\n// }\n"],"file":"KHR_binary_gltf.js"}

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

@@ -1,7 +1,5 @@
 "use strict";
 
-var _regeneratorRuntime2 = require("@babel/runtime/regenerator");
-
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 Object.defineProperty(exports, "__esModule", {
@@ -12,14 +10,6 @@ exports.decode = decode;
 exports.encode = encode;
 exports.name = void 0;
 
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-
 var _draco = require("@loaders.gl/draco");
 
 var _loaderUtils = require("@loaders.gl/loader-utils");
@@ -28,212 +18,113 @@ var _gltfScenegraph = _interopRequireDefault(require("../api/gltf-scenegraph"));
 
 var _gltfAttributeUtils = require("../gltf-utils/gltf-attribute-utils");
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
-
-var _marked = _regeneratorRuntime2.mark(makeMeshPrimitiveIterator);
-
-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; }
-
-var KHR_DRACO_MESH_COMPRESSION = 'KHR_draco_mesh_compression';
-var name = KHR_DRACO_MESH_COMPRESSION;
+const KHR_DRACO_MESH_COMPRESSION = 'KHR_draco_mesh_compression';
+const name = KHR_DRACO_MESH_COMPRESSION;
 exports.name = name;
 
 function preprocess(gltfData, options, context) {
-  var scenegraph = new _gltfScenegraph.default(gltfData);
-
-  var _iterator = _createForOfIteratorHelper(makeMeshPrimitiveIterator(scenegraph)),
-      _step;
+  const scenegraph = new _gltfScenegraph.default(gltfData);
 
-  try {
-    for (_iterator.s(); !(_step = _iterator.n()).done;) {
-      var primitive = _step.value;
-
-      if (scenegraph.getObjectExtension(primitive, KHR_DRACO_MESH_COMPRESSION)) {}
-    }
-  } catch (err) {
-    _iterator.e(err);
-  } finally {
-    _iterator.f();
+  for (const primitive of makeMeshPrimitiveIterator(scenegraph)) {
+    if (scenegraph.getObjectExtension(primitive, KHR_DRACO_MESH_COMPRESSION)) {}
   }
 }
 
-function decode(_x, _x2, _x3) {
-  return _decode.apply(this, arguments);
-}
-
-function _decode() {
-  _decode = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee(gltfData, options, context) {
-    var _options$gltf;
-
-    var scenegraph, promises, _iterator5, _step5, primitive;
-
-    return _regenerator.default.wrap(function _callee$(_context2) {
-      while (1) {
-        switch (_context2.prev = _context2.next) {
-          case 0:
-            if (options !== null && options !== void 0 && (_options$gltf = options.gltf) !== null && _options$gltf !== void 0 && _options$gltf.decompressMeshes) {
-              _context2.next = 2;
-              break;
-            }
+async function decode(gltfData, options, context) {
+  var _options$gltf;
 
-            return _context2.abrupt("return");
-
-          case 2:
-            scenegraph = new _gltfScenegraph.default(gltfData);
-            promises = [];
-            _iterator5 = _createForOfIteratorHelper(makeMeshPrimitiveIterator(scenegraph));
-
-            try {
-              for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
-                primitive = _step5.value;
-
-                if (scenegraph.getObjectExtension(primitive, KHR_DRACO_MESH_COMPRESSION)) {
-                  promises.push(decompressPrimitive(scenegraph, primitive, options, context));
-                }
-              }
-            } catch (err) {
-              _iterator5.e(err);
-            } finally {
-              _iterator5.f();
-            }
-
-            _context2.next = 8;
-            return Promise.all(promises);
-
-          case 8:
-            scenegraph.removeExtension(KHR_DRACO_MESH_COMPRESSION);
-
-          case 9:
-          case "end":
-            return _context2.stop();
-        }
-      }
-    }, _callee);
-  }));
-  return _decode.apply(this, arguments);
-}
-
-function encode(gltfData) {
-  var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-  var scenegraph = new _gltfScenegraph.default(gltfData);
+  if (!(options !== null && options !== void 0 && (_options$gltf = options.gltf) !== null && _options$gltf !== void 0 && _options$gltf.decompressMeshes)) {
+    return;
+  }
 
-  var _iterator2 = _createForOfIteratorHelper(scenegraph.json.meshes || []),
-      _step2;
+  const scenegraph = new _gltfScenegraph.default(gltfData);
+  const promises = [];
 
-  try {
-    for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-      var mesh = _step2.value;
-      compressMesh(mesh, options);
-      scenegraph.addRequiredExtension(KHR_DRACO_MESH_COMPRESSION);
+  for (const primitive of makeMeshPrimitiveIterator(scenegraph)) {
+    if (scenegraph.getObjectExtension(primitive, KHR_DRACO_MESH_COMPRESSION)) {
+      promises.push(decompressPrimitive(scenegraph, primitive, options, context));
     }
-  } catch (err) {
-    _iterator2.e(err);
-  } finally {
-    _iterator2.f();
   }
-}
 
-function decompressPrimitive(_x4, _x5, _x6, _x7) {
-  return _decompressPrimitive.apply(this, arguments);
+  await Promise.all(promises);
+  scenegraph.removeExtension(KHR_DRACO_MESH_COMPRESSION);
 }
 
-function _decompressPrimitive() {
-  _decompressPrimitive = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee2(scenegraph, primitive, options, context) {
-    var dracoExtension, buffer, bufferCopy, parse, dracoOptions, decodedData, decodedAttributes, _i, _Object$entries, _Object$entries$_i, attributeName, decodedAttribute, accessorIndex, accessor;
-
-    return _regenerator.default.wrap(function _callee2$(_context3) {
-      while (1) {
-        switch (_context3.prev = _context3.next) {
-          case 0:
-            dracoExtension = scenegraph.getObjectExtension(primitive, KHR_DRACO_MESH_COMPRESSION);
-
-            if (dracoExtension) {
-              _context3.next = 3;
-              break;
-            }
+function encode(gltfData, options = {}) {
+  const scenegraph = new _gltfScenegraph.default(gltfData);
 
-            return _context3.abrupt("return");
-
-          case 3:
-            buffer = scenegraph.getTypedArrayForBufferView(dracoExtension.bufferView);
-            bufferCopy = (0, _loaderUtils.sliceArrayBuffer)(buffer.buffer, buffer.byteOffset);
-            parse = context.parse;
-            dracoOptions = _objectSpread({}, options);
-            delete dracoOptions['3d-tiles'];
-            _context3.next = 10;
-            return parse(bufferCopy, _draco.DracoLoader, dracoOptions, context);
-
-          case 10:
-            decodedData = _context3.sent;
-            decodedAttributes = (0, _gltfAttributeUtils.getGLTFAccessors)(decodedData.attributes);
-
-            for (_i = 0, _Object$entries = Object.entries(decodedAttributes); _i < _Object$entries.length; _i++) {
-              _Object$entries$_i = (0, _slicedToArray2.default)(_Object$entries[_i], 2), attributeName = _Object$entries$_i[0], decodedAttribute = _Object$entries$_i[1];
+  for (const mesh of scenegraph.json.meshes || []) {
+    compressMesh(mesh, options);
+    scenegraph.addRequiredExtension(KHR_DRACO_MESH_COMPRESSION);
+  }
+}
 
-              if (attributeName in primitive.attributes) {
-                accessorIndex = primitive.attributes[attributeName];
-                accessor = scenegraph.getAccessor(accessorIndex);
+async function decompressPrimitive(scenegraph, primitive, options, context) {
+  const dracoExtension = scenegraph.getObjectExtension(primitive, KHR_DRACO_MESH_COMPRESSION);
 
-                if (accessor !== null && accessor !== void 0 && accessor.min && accessor !== null && accessor !== void 0 && accessor.max) {
-                  decodedAttribute.min = accessor.min;
-                  decodedAttribute.max = accessor.max;
-                }
-              }
-            }
+  if (!dracoExtension) {
+    return;
+  }
 
-            primitive.attributes = decodedAttributes;
+  const buffer = scenegraph.getTypedArrayForBufferView(dracoExtension.bufferView);
+  const bufferCopy = (0, _loaderUtils.sliceArrayBuffer)(buffer.buffer, buffer.byteOffset);
+  const {
+    parse
+  } = context;
+  const dracoOptions = { ...options
+  };
+  delete dracoOptions['3d-tiles'];
+  const decodedData = await parse(bufferCopy, _draco.DracoLoader, dracoOptions, context);
+  const decodedAttributes = (0, _gltfAttributeUtils.getGLTFAccessors)(decodedData.attributes);
+
+  for (const [attributeName, decodedAttribute] of Object.entries(decodedAttributes)) {
+    if (attributeName in primitive.attributes) {
+      const accessorIndex = primitive.attributes[attributeName];
+      const accessor = scenegraph.getAccessor(accessorIndex);
+
+      if (accessor !== null && accessor !== void 0 && accessor.min && accessor !== null && accessor !== void 0 && accessor.max) {
+        decodedAttribute.min = accessor.min;
+        decodedAttribute.max = accessor.max;
+      }
+    }
+  }
 
-            if (decodedData.indices) {
-              primitive.indices = (0, _gltfAttributeUtils.getGLTFAccessor)(decodedData.indices);
-            }
+  primitive.attributes = decodedAttributes;
 
-            checkPrimitive(primitive);
+  if (decodedData.indices) {
+    primitive.indices = (0, _gltfAttributeUtils.getGLTFAccessor)(decodedData.indices);
+  }
 
-          case 16:
-          case "end":
-            return _context3.stop();
-        }
-      }
-    }, _callee2);
-  }));
-  return _decompressPrimitive.apply(this, arguments);
+  checkPrimitive(primitive);
 }
 
-function compressMesh(attributes, indices) {
+function compressMesh(attributes, indices, mode = 4, options, context) {
   var _context$parseSync;
 
-  var mode = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 4;
-  var options = arguments.length > 3 ? arguments[3] : undefined;
-  var context = arguments.length > 4 ? arguments[4] : undefined;
-
   if (!options.DracoWriter) {
     throw new Error('options.gltf.DracoWriter not provided');
   }
 
-  var compressedData = options.DracoWriter.encodeSync({
-    attributes: attributes
+  const compressedData = options.DracoWriter.encodeSync({
+    attributes
   });
-  var decodedData = context === null || context === void 0 ? void 0 : (_context$parseSync = context.parseSync) === null || _context$parseSync === void 0 ? void 0 : _context$parseSync.call(context, {
-    attributes: attributes
+  const decodedData = context === null || context === void 0 ? void 0 : (_context$parseSync = context.parseSync) === null || _context$parseSync === void 0 ? void 0 : _context$parseSync.call(context, {
+    attributes
   });
 
-  var fauxAccessors = options._addFauxAttributes(decodedData.attributes);
+  const fauxAccessors = options._addFauxAttributes(decodedData.attributes);
 
-  var bufferViewIndex = options.addBufferView(compressedData);
-  var glTFMesh = {
+  const bufferViewIndex = options.addBufferView(compressedData);
+  const glTFMesh = {
     primitives: [{
       attributes: fauxAccessors,
-      mode: mode,
-      extensions: (0, _defineProperty2.default)({}, KHR_DRACO_MESH_COMPRESSION, {
-        bufferView: bufferViewIndex,
-        attributes: fauxAccessors
-      })
+      mode,
+      extensions: {
+        [KHR_DRACO_MESH_COMPRESSION]: {
+          bufferView: bufferViewIndex,
+          attributes: fauxAccessors
+        }
+      }
     }]
   };
   return glTFMesh;
@@ -245,87 +136,11 @@ function checkPrimitive(primitive) {
   }
 }
 
-function makeMeshPrimitiveIterator(scenegraph) {
-  var _iterator3, _step3, mesh, _iterator4, _step4, primitive;
-
-  return _regenerator.default.wrap(function makeMeshPrimitiveIterator$(_context) {
-    while (1) {
-      switch (_context.prev = _context.next) {
-        case 0:
-          _iterator3 = _createForOfIteratorHelper(scenegraph.json.meshes || []);
-          _context.prev = 1;
-
-          _iterator3.s();
-
-        case 3:
-          if ((_step3 = _iterator3.n()).done) {
-            _context.next = 24;
-            break;
-          }
-
-          mesh = _step3.value;
-          _iterator4 = _createForOfIteratorHelper(mesh.primitives);
-          _context.prev = 6;
-
-          _iterator4.s();
-
-        case 8:
-          if ((_step4 = _iterator4.n()).done) {
-            _context.next = 14;
-            break;
-          }
-
-          primitive = _step4.value;
-          _context.next = 12;
-          return primitive;
-
-        case 12:
-          _context.next = 8;
-          break;
-
-        case 14:
-          _context.next = 19;
-          break;
-
-        case 16:
-          _context.prev = 16;
-          _context.t0 = _context["catch"](6);
-
-          _iterator4.e(_context.t0);
-
-        case 19:
-          _context.prev = 19;
-
-          _iterator4.f();
-
-          return _context.finish(19);
-
-        case 22:
-          _context.next = 3;
-          break;
-
-        case 24:
-          _context.next = 29;
-          break;
-
-        case 26:
-          _context.prev = 26;
-          _context.t1 = _context["catch"](1);
-
-          _iterator3.e(_context.t1);
-
-        case 29:
-          _context.prev = 29;
-
-          _iterator3.f();
-
-          return _context.finish(29);
-
-        case 32:
-        case "end":
-          return _context.stop();
-      }
+function* makeMeshPrimitiveIterator(scenegraph) {
+  for (const mesh of scenegraph.json.meshes || []) {
+    for (const primitive of mesh.primitives) {
+      yield primitive;
     }
-  }, _marked, null, [[1, 26, 29, 32], [6, 16, 19, 22]]);
+  }
 }
 //# sourceMappingURL=KHR_draco_mesh_compression.js.map

package/dist/es5/lib/extensions/KHR_draco_mesh_compression.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/lib/extensions/KHR_draco_mesh_compression.ts"],"names":["makeMeshPrimitiveIterator","KHR_DRACO_MESH_COMPRESSION","name","preprocess","gltfData","options","context","scenegraph","Scenegraph","primitive","getObjectExtension","decode","gltf","decompressMeshes","promises","push","decompressPrimitive","Promise","all","removeExtension","encode","json","meshes","mesh","compressMesh","addRequiredExtension","dracoExtension","buffer","getTypedArrayForBufferView","bufferView","bufferCopy","byteOffset","parse","dracoOptions","DracoLoader","decodedData","decodedAttributes","attributes","Object","entries","attributeName","decodedAttribute","accessorIndex","accessor","getAccessor","min","max","indices","checkPrimitive","mode","DracoWriter","Error","compressedData","encodeSync","parseSync","fauxAccessors","_addFauxAttributes","bufferViewIndex","addBufferView","glTFMesh","primitives","extensions","keys","length"],"mappings":"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","sourcesContent":["// https://github.com/KhronosGroup/glTF/tree/master/extensions/2.0/Khronos/KHR_draco_mesh_compression\n// Only TRIANGLES: 0x0004 and TRIANGLE_STRIP: 0x0005 are supported\n/* eslint-disable camelcase */\n\n/* eslint-disable camelcase */\nimport type {\n  GLTF,\n  GLTFAccessor,\n  GLTFMeshPrimitive,\n  GLTF_KHR_draco_mesh_compression\n} from '../types/gltf-types';\nimport type {GLTFLoaderOptions} from '../../gltf-loader';\n\nimport type {LoaderContext} from '@loaders.gl/loader-utils';\nimport {DracoLoader} from '@loaders.gl/draco';\nimport {DracoLoaderOptions, DracoMesh} from '@loaders.gl/draco';\nimport {sliceArrayBuffer} from '@loaders.gl/loader-utils';\nimport {default as Scenegraph} from '../api/gltf-scenegraph';\nimport {getGLTFAccessors, getGLTFAccessor} from '../gltf-utils/gltf-attribute-utils';\n\nconst KHR_DRACO_MESH_COMPRESSION = 'KHR_draco_mesh_compression';\n\n/** Extension name */\nexport const name = KHR_DRACO_MESH_COMPRESSION;\n\nexport function preprocess(\n  gltfData: {json: GLTF},\n  options: GLTFLoaderOptions,\n  context: LoaderContext\n): void {\n  const scenegraph = new Scenegraph(gltfData);\n  for (const primitive of makeMeshPrimitiveIterator(scenegraph)) {\n    if (scenegraph.getObjectExtension(primitive, KHR_DRACO_MESH_COMPRESSION)) {\n      // TODO - Remove fallback accessors to make sure we don't load unnecessary buffers\n    }\n  }\n}\n\nexport async function decode(\n  gltfData: {json: GLTF},\n  options: GLTFLoaderOptions,\n  context: LoaderContext\n): Promise<void> {\n  if (!options?.gltf?.decompressMeshes) {\n    return;\n  }\n\n  const scenegraph = new Scenegraph(gltfData);\n  const promises: Promise<void>[] = [];\n  for (const primitive of makeMeshPrimitiveIterator(scenegraph)) {\n    if (scenegraph.getObjectExtension(primitive, KHR_DRACO_MESH_COMPRESSION)) {\n      promises.push(decompressPrimitive(scenegraph, primitive, options, context));\n    }\n  }\n\n  // Decompress meshes in parallel\n  await Promise.all(promises);\n\n  // We have now decompressed all primitives, so remove the top-level extensions\n  scenegraph.removeExtension(KHR_DRACO_MESH_COMPRESSION);\n}\n\nexport function encode(gltfData, options: GLTFLoaderOptions = {}): void {\n  const scenegraph = new Scenegraph(gltfData);\n\n  for (const mesh of scenegraph.json.meshes || []) {\n    // eslint-disable-next-line camelcase\n    // @ts-ignore\n    compressMesh(mesh, options);\n    // NOTE: Only add the extension if something was actually compressed\n    scenegraph.addRequiredExtension(KHR_DRACO_MESH_COMPRESSION);\n  }\n}\n\n// DECODE\n\n// Unpacks one mesh primitive and removes the extension from the primitive\n// DracoDecoder needs to be imported and registered by app\n// Returns: Promise that resolves when all pending draco decoder jobs for this mesh complete\n\n// TODO - Implement fallback behavior per KHR_DRACO_MESH_COMPRESSION spec\n\nasync function decompressPrimitive(\n  scenegraph: Scenegraph,\n  primitive: GLTFMeshPrimitive,\n  options: GLTFLoaderOptions,\n  context: LoaderContext\n): Promise<void> {\n  const dracoExtension = scenegraph.getObjectExtension<GLTF_KHR_draco_mesh_compression>(\n    primitive,\n    KHR_DRACO_MESH_COMPRESSION\n  );\n  if (!dracoExtension) {\n    return;\n  }\n\n  const buffer = scenegraph.getTypedArrayForBufferView(dracoExtension.bufferView);\n  // TODO - parse does not yet deal well with byte offsets embedded in typed arrays. Copy buffer\n  // TODO - remove when `parse` is fixed to handle `byteOffset`s\n  const bufferCopy = sliceArrayBuffer(buffer.buffer, buffer.byteOffset); // , buffer.byteLength);\n\n  const {parse} = context;\n  const dracoOptions: DracoLoaderOptions = {...options};\n\n  // TODO - remove hack: The entire tileset might be included, too expensive to serialize\n  delete dracoOptions['3d-tiles'];\n  const decodedData = (await parse(bufferCopy, DracoLoader, dracoOptions, context)) as DracoMesh;\n\n  const decodedAttributes: {[key: string]: GLTFAccessor} = getGLTFAccessors(decodedData.attributes);\n\n  // Restore min/max values\n  for (const [attributeName, decodedAttribute] of Object.entries(decodedAttributes)) {\n    if (attributeName in primitive.attributes) {\n      const accessorIndex: number = primitive.attributes[attributeName];\n      const accessor = scenegraph.getAccessor(accessorIndex);\n      if (accessor?.min && accessor?.max) {\n        decodedAttribute.min = accessor.min;\n        decodedAttribute.max = accessor.max;\n      }\n    }\n  }\n\n  // @ts-ignore\n  primitive.attributes = decodedAttributes;\n  if (decodedData.indices) {\n    // @ts-ignore\n    primitive.indices = getGLTFAccessor(decodedData.indices);\n  }\n\n  // Extension has been processed, delete it\n  // delete primitive.extensions[KHR_DRACO_MESH_COMPRESSION];\n\n  checkPrimitive(primitive);\n}\n\n// ENCODE\n\n// eslint-disable-next-line max-len\n// Only TRIANGLES: 0x0004 and TRIANGLE_STRIP: 0x0005 are supported\nfunction compressMesh(attributes, indices, mode: number = 4, options, context: LoaderContext) {\n  if (!options.DracoWriter) {\n    throw new Error('options.gltf.DracoWriter not provided');\n  }\n\n  // TODO - use DracoWriter using encode w/ registered DracoWriter...\n  const compressedData = options.DracoWriter.encodeSync({attributes});\n\n  // Draco compression may change the order and number of vertices in a mesh.\n  // To satisfy the requirement that accessors properties be correct for both\n  // compressed and uncompressed data, generators should create uncompressed\n  // attributes and indices using data that has been decompressed from the Draco buffer,\n  // rather than the original source data.\n  // @ts-ignore TODO this needs to be fixed\n  const decodedData = context?.parseSync?.({attributes});\n  const fauxAccessors = options._addFauxAttributes(decodedData.attributes);\n\n  const bufferViewIndex = options.addBufferView(compressedData);\n\n  const glTFMesh = {\n    primitives: [\n      {\n        attributes: fauxAccessors, // TODO - verify with spec\n        mode, // GL.POINTS\n        extensions: {\n          [KHR_DRACO_MESH_COMPRESSION]: {\n            bufferView: bufferViewIndex,\n            attributes: fauxAccessors // TODO - verify with spec\n          }\n        }\n      }\n    ]\n  };\n\n  return glTFMesh;\n}\n\n// UTILS\n\nfunction checkPrimitive(primitive: GLTFMeshPrimitive) {\n  if (!primitive.attributes && Object.keys(primitive.attributes).length > 0) {\n    throw new Error('glTF: Empty primitive detected: Draco decompression failure?');\n  }\n}\n\nfunction* makeMeshPrimitiveIterator(scenegraph) {\n  for (const mesh of scenegraph.json.meshes || []) {\n    for (const primitive of mesh.primitives) {\n      yield primitive;\n    }\n  }\n}\n"],"file":"KHR_draco_mesh_compression.js"}
+{"version":3,"sources":["../../../../src/lib/extensions/KHR_draco_mesh_compression.ts"],"names":["KHR_DRACO_MESH_COMPRESSION","name","preprocess","gltfData","options","context","scenegraph","Scenegraph","primitive","makeMeshPrimitiveIterator","getObjectExtension","decode","gltf","decompressMeshes","promises","push","decompressPrimitive","Promise","all","removeExtension","encode","mesh","json","meshes","compressMesh","addRequiredExtension","dracoExtension","buffer","getTypedArrayForBufferView","bufferView","bufferCopy","byteOffset","parse","dracoOptions","decodedData","DracoLoader","decodedAttributes","attributes","attributeName","decodedAttribute","Object","entries","accessorIndex","accessor","getAccessor","min","max","indices","checkPrimitive","mode","DracoWriter","Error","compressedData","encodeSync","parseSync","fauxAccessors","_addFauxAttributes","bufferViewIndex","addBufferView","glTFMesh","primitives","extensions","keys","length"],"mappings":"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","sourcesContent":["// https://github.com/KhronosGroup/glTF/tree/master/extensions/2.0/Khronos/KHR_draco_mesh_compression\n// Only TRIANGLES: 0x0004 and TRIANGLE_STRIP: 0x0005 are supported\n/* eslint-disable camelcase */\n\n/* eslint-disable camelcase */\nimport type {\n  GLTF,\n  GLTFAccessor,\n  GLTFMeshPrimitive,\n  GLTF_KHR_draco_mesh_compression\n} from '../types/gltf-types';\nimport type {GLTFLoaderOptions} from '../../gltf-loader';\n\nimport type {LoaderContext} from '@loaders.gl/loader-utils';\nimport {DracoLoader} from '@loaders.gl/draco';\nimport {DracoLoaderOptions, DracoMesh} from '@loaders.gl/draco';\nimport {sliceArrayBuffer} from '@loaders.gl/loader-utils';\nimport {default as Scenegraph} from '../api/gltf-scenegraph';\nimport {getGLTFAccessors, getGLTFAccessor} from '../gltf-utils/gltf-attribute-utils';\n\nconst KHR_DRACO_MESH_COMPRESSION = 'KHR_draco_mesh_compression';\n\n/** Extension name */\nexport const name = KHR_DRACO_MESH_COMPRESSION;\n\nexport function preprocess(\n  gltfData: {json: GLTF},\n  options: GLTFLoaderOptions,\n  context: LoaderContext\n): void {\n  const scenegraph = new Scenegraph(gltfData);\n  for (const primitive of makeMeshPrimitiveIterator(scenegraph)) {\n    if (scenegraph.getObjectExtension(primitive, KHR_DRACO_MESH_COMPRESSION)) {\n      // TODO - Remove fallback accessors to make sure we don't load unnecessary buffers\n    }\n  }\n}\n\nexport async function decode(\n  gltfData: {json: GLTF},\n  options: GLTFLoaderOptions,\n  context: LoaderContext\n): Promise<void> {\n  if (!options?.gltf?.decompressMeshes) {\n    return;\n  }\n\n  const scenegraph = new Scenegraph(gltfData);\n  const promises: Promise<void>[] = [];\n  for (const primitive of makeMeshPrimitiveIterator(scenegraph)) {\n    if (scenegraph.getObjectExtension(primitive, KHR_DRACO_MESH_COMPRESSION)) {\n      promises.push(decompressPrimitive(scenegraph, primitive, options, context));\n    }\n  }\n\n  // Decompress meshes in parallel\n  await Promise.all(promises);\n\n  // We have now decompressed all primitives, so remove the top-level extensions\n  scenegraph.removeExtension(KHR_DRACO_MESH_COMPRESSION);\n}\n\nexport function encode(gltfData, options: GLTFLoaderOptions = {}): void {\n  const scenegraph = new Scenegraph(gltfData);\n\n  for (const mesh of scenegraph.json.meshes || []) {\n    // eslint-disable-next-line camelcase\n    // @ts-ignore\n    compressMesh(mesh, options);\n    // NOTE: Only add the extension if something was actually compressed\n    scenegraph.addRequiredExtension(KHR_DRACO_MESH_COMPRESSION);\n  }\n}\n\n// DECODE\n\n// Unpacks one mesh primitive and removes the extension from the primitive\n// DracoDecoder needs to be imported and registered by app\n// Returns: Promise that resolves when all pending draco decoder jobs for this mesh complete\n\n// TODO - Implement fallback behavior per KHR_DRACO_MESH_COMPRESSION spec\n\nasync function decompressPrimitive(\n  scenegraph: Scenegraph,\n  primitive: GLTFMeshPrimitive,\n  options: GLTFLoaderOptions,\n  context: LoaderContext\n): Promise<void> {\n  const dracoExtension = scenegraph.getObjectExtension<GLTF_KHR_draco_mesh_compression>(\n    primitive,\n    KHR_DRACO_MESH_COMPRESSION\n  );\n  if (!dracoExtension) {\n    return;\n  }\n\n  const buffer = scenegraph.getTypedArrayForBufferView(dracoExtension.bufferView);\n  // TODO - parse does not yet deal well with byte offsets embedded in typed arrays. Copy buffer\n  // TODO - remove when `parse` is fixed to handle `byteOffset`s\n  const bufferCopy = sliceArrayBuffer(buffer.buffer, buffer.byteOffset); // , buffer.byteLength);\n\n  const {parse} = context;\n  const dracoOptions: DracoLoaderOptions = {...options};\n\n  // TODO - remove hack: The entire tileset might be included, too expensive to serialize\n  delete dracoOptions['3d-tiles'];\n  const decodedData = (await parse(bufferCopy, DracoLoader, dracoOptions, context)) as DracoMesh;\n\n  const decodedAttributes: {[key: string]: GLTFAccessor} = getGLTFAccessors(decodedData.attributes);\n\n  // Restore min/max values\n  for (const [attributeName, decodedAttribute] of Object.entries(decodedAttributes)) {\n    if (attributeName in primitive.attributes) {\n      const accessorIndex: number = primitive.attributes[attributeName];\n      const accessor = scenegraph.getAccessor(accessorIndex);\n      if (accessor?.min && accessor?.max) {\n        decodedAttribute.min = accessor.min;\n        decodedAttribute.max = accessor.max;\n      }\n    }\n  }\n\n  // @ts-ignore\n  primitive.attributes = decodedAttributes;\n  if (decodedData.indices) {\n    // @ts-ignore\n    primitive.indices = getGLTFAccessor(decodedData.indices);\n  }\n\n  // Extension has been processed, delete it\n  // delete primitive.extensions[KHR_DRACO_MESH_COMPRESSION];\n\n  checkPrimitive(primitive);\n}\n\n// ENCODE\n\n// eslint-disable-next-line max-len\n// Only TRIANGLES: 0x0004 and TRIANGLE_STRIP: 0x0005 are supported\nfunction compressMesh(attributes, indices, mode: number = 4, options, context: LoaderContext) {\n  if (!options.DracoWriter) {\n    throw new Error('options.gltf.DracoWriter not provided');\n  }\n\n  // TODO - use DracoWriter using encode w/ registered DracoWriter...\n  const compressedData = options.DracoWriter.encodeSync({attributes});\n\n  // Draco compression may change the order and number of vertices in a mesh.\n  // To satisfy the requirement that accessors properties be correct for both\n  // compressed and uncompressed data, generators should create uncompressed\n  // attributes and indices using data that has been decompressed from the Draco buffer,\n  // rather than the original source data.\n  // @ts-ignore TODO this needs to be fixed\n  const decodedData = context?.parseSync?.({attributes});\n  const fauxAccessors = options._addFauxAttributes(decodedData.attributes);\n\n  const bufferViewIndex = options.addBufferView(compressedData);\n\n  const glTFMesh = {\n    primitives: [\n      {\n        attributes: fauxAccessors, // TODO - verify with spec\n        mode, // GL.POINTS\n        extensions: {\n          [KHR_DRACO_MESH_COMPRESSION]: {\n            bufferView: bufferViewIndex,\n            attributes: fauxAccessors // TODO - verify with spec\n          }\n        }\n      }\n    ]\n  };\n\n  return glTFMesh;\n}\n\n// UTILS\n\nfunction checkPrimitive(primitive: GLTFMeshPrimitive) {\n  if (!primitive.attributes && Object.keys(primitive.attributes).length > 0) {\n    throw new Error('glTF: Empty primitive detected: Draco decompression failure?');\n  }\n}\n\nfunction* makeMeshPrimitiveIterator(scenegraph) {\n  for (const mesh of scenegraph.json.meshes || []) {\n    for (const primitive of mesh.primitives) {\n      yield primitive;\n    }\n  }\n}\n"],"file":"KHR_draco_mesh_compression.js"}

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

@@ -10,38 +10,24 @@ exports.name = void 0;
 
 var _gltfScenegraph = _interopRequireDefault(require("../api/gltf-scenegraph"));
 
-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; }
-
-var KHR_TEXTURE_BASISU = 'KHR_texture_basisu';
-var name = KHR_TEXTURE_BASISU;
+const KHR_TEXTURE_BASISU = 'KHR_texture_basisu';
+const name = KHR_TEXTURE_BASISU;
 exports.name = name;
 
 function preprocess(gltfData, options) {
-  var scene = new _gltfScenegraph.default(gltfData);
-  var json = scene.json;
+  const scene = new _gltfScenegraph.default(gltfData);
+  const {
+    json
+  } = scene;
 
-  var _iterator = _createForOfIteratorHelper(json.textures || []),
-      _step;
+  for (const texture of json.textures || []) {
+    const extension = scene.getObjectExtension(texture, KHR_TEXTURE_BASISU);
 
-  try {
-    for (_iterator.s(); !(_step = _iterator.n()).done;) {
-      var texture = _step.value;
-      var extension = scene.getObjectExtension(texture, KHR_TEXTURE_BASISU);
-
-      if (extension) {
-        texture.source = extension.source;
-      }
-
-      scene.removeObjectExtension(texture, KHR_TEXTURE_BASISU);
+    if (extension) {
+      texture.source = extension.source;
     }
-  } catch (err) {
-    _iterator.e(err);
-  } finally {
-    _iterator.f();
+
+    scene.removeObjectExtension(texture, KHR_TEXTURE_BASISU);
   }
 
   scene.removeExtension(KHR_TEXTURE_BASISU);

package/dist/es5/lib/extensions/KHR_texture_basisu.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/lib/extensions/KHR_texture_basisu.ts"],"names":["KHR_TEXTURE_BASISU","name","preprocess","gltfData","options","scene","GLTFScenegraph","json","textures","texture","extension","getObjectExtension","source","removeObjectExtension","removeExtension"],"mappings":";;;;;;;;;;AAOA;;;;;;;;AAEA,IAAMA,kBAAkB,GAAG,oBAA3B;AAGO,IAAMC,IAAI,GAAGD,kBAAb;;;AAMA,SAASE,UAAT,CAAoBC,QAApB,EAA4CC,OAA5C,EAA8E;AACnF,MAAMC,KAAK,GAAG,IAAIC,uBAAJ,CAAmBH,QAAnB,CAAd;AACA,MAAOI,IAAP,GAAeF,KAAf,CAAOE,IAAP;;AAFmF,6CAI7DA,IAAI,CAACC,QAAL,IAAiB,EAJ4C;AAAA;;AAAA;AAInF,wDAA2C;AAAA,UAAhCC,OAAgC;AACzC,UAAMC,SAAS,GAAGL,KAAK,CAACM,kBAAN,CAChBF,OADgB,EAEhBT,kBAFgB,CAAlB;;AAIA,UAAIU,SAAJ,EAAe;AACbD,QAAAA,OAAO,CAACG,MAAR,GAAiBF,SAAS,CAACE,MAA3B;AACD;;AACDP,MAAAA,KAAK,CAACQ,qBAAN,CAA4BJ,OAA5B,EAAqCT,kBAArC;AACD;AAbkF;AAAA;AAAA;AAAA;AAAA;;AAgBnFK,EAAAA,KAAK,CAACS,eAAN,CAAsBd,kBAAtB;AACD","sourcesContent":["// GLTF EXTENSION: EXT_TEXTURE_WEBP\n// https://github.com/KhronosGroup/glTF/tree/master/extensions/2.0/Khronos/EXT_TEXTURE_WEBP\n/* eslint-disable camelcase */\n\nimport type {GLTF, GLTF_KHR_texture_basisu} from '../types/gltf-types';\nimport type {GLTFLoaderOptions} from '../../gltf-loader';\n\nimport GLTFScenegraph from '../api/gltf-scenegraph';\n\nconst KHR_TEXTURE_BASISU = 'KHR_texture_basisu';\n\n/** Extension name */\nexport const name = KHR_TEXTURE_BASISU;\n\n/**\n * Replaces a texture source reference with the extension texture\n * Done in preprocess() to prevent load of default image\n */\nexport function preprocess(gltfData: {json: GLTF}, options: GLTFLoaderOptions): void {\n  const scene = new GLTFScenegraph(gltfData);\n  const {json} = scene;\n\n  for (const texture of json.textures || []) {\n    const extension = scene.getObjectExtension<GLTF_KHR_texture_basisu>(\n      texture,\n      KHR_TEXTURE_BASISU\n    );\n    if (extension) {\n      texture.source = extension.source;\n    }\n    scene.removeObjectExtension(texture, KHR_TEXTURE_BASISU);\n  }\n\n  // Remove the top-level extension\n  scene.removeExtension(KHR_TEXTURE_BASISU);\n}\n"],"file":"KHR_texture_basisu.js"}
+{"version":3,"sources":["../../../../src/lib/extensions/KHR_texture_basisu.ts"],"names":["KHR_TEXTURE_BASISU","name","preprocess","gltfData","options","scene","GLTFScenegraph","json","texture","textures","extension","getObjectExtension","source","removeObjectExtension","removeExtension"],"mappings":";;;;;;;;;;AAOA;;AAEA,MAAMA,kBAAkB,GAAG,oBAA3B;AAGO,MAAMC,IAAI,GAAGD,kBAAb;;;AAMA,SAASE,UAAT,CAAoBC,QAApB,EAA4CC,OAA5C,EAA8E;AACnF,QAAMC,KAAK,GAAG,IAAIC,uBAAJ,CAAmBH,QAAnB,CAAd;AACA,QAAM;AAACI,IAAAA;AAAD,MAASF,KAAf;;AAEA,OAAK,MAAMG,OAAX,IAAsBD,IAAI,CAACE,QAAL,IAAiB,EAAvC,EAA2C;AACzC,UAAMC,SAAS,GAAGL,KAAK,CAACM,kBAAN,CAChBH,OADgB,EAEhBR,kBAFgB,CAAlB;;AAIA,QAAIU,SAAJ,EAAe;AACbF,MAAAA,OAAO,CAACI,MAAR,GAAiBF,SAAS,CAACE,MAA3B;AACD;;AACDP,IAAAA,KAAK,CAACQ,qBAAN,CAA4BL,OAA5B,EAAqCR,kBAArC;AACD;;AAGDK,EAAAA,KAAK,CAACS,eAAN,CAAsBd,kBAAtB;AACD","sourcesContent":["// GLTF EXTENSION: KHR_texture_basisu\n// https://github.com/KhronosGroup/glTF/tree/main/extensions/2.0/Khronos/KHR_texture_basisu\n/* eslint-disable camelcase */\n\nimport type {GLTF, GLTF_KHR_texture_basisu} from '../types/gltf-types';\nimport type {GLTFLoaderOptions} from '../../gltf-loader';\n\nimport GLTFScenegraph from '../api/gltf-scenegraph';\n\nconst KHR_TEXTURE_BASISU = 'KHR_texture_basisu';\n\n/** Extension name */\nexport const name = KHR_TEXTURE_BASISU;\n\n/**\n * Replaces a texture source reference with the extension texture\n * Done in preprocess() to prevent load of default image\n */\nexport function preprocess(gltfData: {json: GLTF}, options: GLTFLoaderOptions): void {\n  const scene = new GLTFScenegraph(gltfData);\n  const {json} = scene;\n\n  for (const texture of json.textures || []) {\n    const extension = scene.getObjectExtension<GLTF_KHR_texture_basisu>(\n      texture,\n      KHR_TEXTURE_BASISU\n    );\n    if (extension) {\n      texture.source = extension.source;\n    }\n    scene.removeObjectExtension(texture, KHR_TEXTURE_BASISU);\n  }\n\n  // Remove the top-level extension\n  scene.removeExtension(KHR_TEXTURE_BASISU);\n}\n"],"file":"KHR_texture_basisu.js"}