@galacean/engine-loader 1.1.0-beta.12 → 1.1.0-beta.14

package/dist/main.js

@@ -293,7 +293,7 @@ exports.MeshDecoder = /*#__PURE__*/ function() {
             var encodedMeshData = JSON.parse(jsonDataString);
             // @ts-ignore Vector3 is not compatible with {x: number, y: number, z: number}.
             encodedMeshData.bounds && modelMesh.bounds.copyFrom(encodedMeshData.bounds);
-            var offset = Math.ceil(bufferReader.offset / 4) * 4;
+            var offset = Math.ceil(bufferReader.position / 4) * 4;
             var buffer = bufferReader.data.buffer;
             var byteOffset = bufferReader.data.byteOffset;
             var float32Array = new Float32Array(buffer, encodedMeshData.positions.start + offset + byteOffset, (encodedMeshData.positions.end - encodedMeshData.positions.start) / 4);
@@ -1546,10 +1546,10 @@ var TextureWrapMode;
 /**
  * @internal
  */ var GLTFParserContext = /*#__PURE__*/ function() {
-    function GLTFParserContext(glTFResource, resourceManager, keepMeshData) {
+    function GLTFParserContext(glTFResource, resourceManager, params) {
         this.glTFResource = glTFResource;
         this.resourceManager = resourceManager;
-        this.keepMeshData = keepMeshData;
+        this.params = params;
         this.accessorBufferCache = {};
         this._resourceCache = new Map();
         this.contentRestorer = new GLTFContentRestorer(glTFResource);
@@ -2247,7 +2247,7 @@ var SupercompressionScheme;
                 alphaSliceByteLength: sgdReader.nextUint32()
             };
         }
-        var endpointsByteOffset = sgdByteOffset + sgdReader.offset;
+        var endpointsByteOffset = sgdByteOffset + sgdReader.position;
         var selectorsByteOffset = endpointsByteOffset + endpointsByteLength;
         var tablesByteOffset = selectorsByteOffset + selectorsByteLength;
         var extendedByteOffset = tablesByteOffset + tablesByteLength;
@@ -2907,6 +2907,7 @@ exports.KTX2Loader = (_KTX2Loader = /*#__PURE__*/ function(Loader1) {
     _proto.initialize = function initialize(engine, configuration) {
         if (configuration.ktx2Loader) {
             var options = configuration.ktx2Loader;
+            if (options.priorityFormats) exports.KTX2Loader._priorityFormats = options.priorityFormats;
             if (this._isKhronosSupported(options.priorityFormats, engine) && options.workerCount !== 0) {
                 return exports.KTX2Loader._getKhronosTranscoder(options.workerCount).init();
             } else {
@@ -2935,17 +2936,7 @@ exports.KTX2Loader = (_KTX2Loader = /*#__PURE__*/ function(Loader1) {
             exports.KTX2TargetFormat.PVRTC,
             exports.KTX2TargetFormat.R8G8B8A8
         ];
-        var supportedList = new Array();
-        if (Array.isArray(priorityFormats[0])) {
-            for(var i = 0; i < priorityFormats.length; i++){
-                supportedList.push(exports.KTX2Loader._detectSupportedFormat(engine._hardwareRenderer, priorityFormats[i]));
-            }
-        } else {
-            supportedList.push(exports.KTX2Loader._detectSupportedFormat(engine._hardwareRenderer, priorityFormats));
-        }
-        return supportedList.every(function(format) {
-            return KhronosTranscoder.transcoderMap[format];
-        });
+        return !!KhronosTranscoder.transcoderMap[exports.KTX2Loader._detectSupportedFormat(engine._hardwareRenderer, priorityFormats)];
     };
     /**
    * Destroy ktx2 transcoder worker.
@@ -2959,7 +2950,8 @@ exports.KTX2Loader = (_KTX2Loader = /*#__PURE__*/ function(Loader1) {
     /** @internal */ KTX2Loader1._parseBuffer = function _parseBuffer(buffer, engine, params) {
         var _params;
         var ktx2Container = new KTX2Container(buffer);
-        var formatPriorities = (_params = params) == null ? void 0 : _params.priorityFormats;
+        var _params_priorityFormats;
+        var formatPriorities = (_params_priorityFormats = (_params = params) == null ? void 0 : _params.priorityFormats) != null ? _params_priorityFormats : exports.KTX2Loader._priorityFormats;
         var targetFormat = exports.KTX2Loader._decideTargetFormat(engine, ktx2Container, formatPriorities);
         var transcodeResultPromise;
         if (exports.KTX2Loader._isBinomialInit || !KhronosTranscoder.transcoderMap[targetFormat] || !ktx2Container.isUASTC) {
@@ -3026,13 +3018,6 @@ exports.KTX2Loader = (_KTX2Loader = /*#__PURE__*/ function(Loader1) {
         return targetFormat;
     };
     KTX2Loader1._detectSupportedFormat = function _detectSupportedFormat(renderer, priorityFormats) {
-        if (priorityFormats === void 0) priorityFormats = [
-            exports.KTX2TargetFormat.ASTC,
-            exports.KTX2TargetFormat.ETC,
-            exports.KTX2TargetFormat.BC7,
-            exports.KTX2TargetFormat.BC1_BC3,
-            exports.KTX2TargetFormat.PVRTC
-        ];
         for(var i = 0; i < priorityFormats.length; i++){
             var capabilities = this._supportedMap[priorityFormats[i]];
             for(var j = 0; j < capabilities.length; j++){
@@ -3074,6 +3059,14 @@ exports.KTX2Loader = (_KTX2Loader = /*#__PURE__*/ function(Loader1) {
     return KTX2Loader1;
 }(engineCore.Loader), function() {
     _KTX2Loader._isBinomialInit = false;
+}(), function() {
+    _KTX2Loader._priorityFormats = [
+        exports.KTX2TargetFormat.BC7,
+        exports.KTX2TargetFormat.ASTC,
+        exports.KTX2TargetFormat.BC1_BC3,
+        exports.KTX2TargetFormat.ETC,
+        exports.KTX2TargetFormat.PVRTC
+    ];
 }(), function() {
     var _obj;
     _KTX2Loader._supportedMap = (_obj = {}, _obj[exports.KTX2TargetFormat.ASTC] = [
@@ -3884,7 +3877,7 @@ exports.GLTFMeshParser = (_GLTFMeshParser = /*#__PURE__*/ function(GLTFParser1)
                         return context.get(exports.GLTFParserType.Buffer).then(function(buffers) {
                             return GLTFUtils.getAccessorData(glTF, indexAccessor, buffers);
                         });
-                    }, context.keepMeshData).then(resolve);
+                    }, context.params.keepMeshData).then(resolve);
                 }
             });
         };
@@ -4065,6 +4058,7 @@ exports.GLTFSceneParser = /*#__PURE__*/ function(GLTFParser1) {
         var _this = this;
         var _context_glTF = context.glTF, scenes = _context_glTF.scenes, _context_glTF_scene = _context_glTF.scene, scene = _context_glTF_scene === void 0 ? 0 : _context_glTF_scene, glTFResource = context.glTFResource;
         var sceneInfo = scenes[index];
+        var sceneExtensions = sceneInfo.extensions;
         var engine = glTFResource.engine;
         var isDefaultScene = scene === index;
         var sceneNodes = sceneInfo.nodes;
@@ -4090,6 +4084,7 @@ exports.GLTFSceneParser = /*#__PURE__*/ function(GLTFParser1) {
             promises.push(this._parseEntityComponent(context, sceneNodes[i1]));
         }
         return Promise.all(promises).then(function() {
+            GLTFParser.executeExtensionsAdditiveAndParse(sceneExtensions, context, sceneRoot, sceneInfo);
             if (isDefaultScene) {
                 return Promise.all([
                     context.get(exports.GLTFParserType.Skin),
@@ -4466,11 +4461,12 @@ var GLTFLoader = /*#__PURE__*/ function(Loader1) {
     }
     var _proto = GLTFLoader.prototype;
     _proto.load = function load(item, resourceManager) {
-        var _params;
         var url = item.url;
         var params = item.params;
         var glTFResource = new GLTFResource(resourceManager.engine, url);
-        var context = new GLTFParserContext(glTFResource, resourceManager, !!((_params = params) == null ? void 0 : _params.keepMeshData));
+        var context = new GLTFParserContext(glTFResource, resourceManager, _extends({
+            keepMeshData: false
+        }, params));
         return context.parse();
     };
     return GLTFLoader;
@@ -5682,7 +5678,7 @@ var KHR_draco_mesh_compression = (_KHR_draco_mesh_compression = /*#__PURE__*/ fu
                     throw "BlendShape animation is not supported when using draco.";
                 }, function() {
                     return decodedGeometry.index.array;
-                }, context.keepMeshData);
+                }, context.params.keepMeshData);
             });
         });
     };