@galacean/engine-loader 1.1.0-beta.46 → 1.1.0-beta.47

package/dist/main.js

@@ -2060,7 +2060,7 @@ function registerGLTFParser(pipeline) {
     };
     /**
    * Parse the glb format.
-   */ GLTFUtils.parseGLB = function parseGLB(context, glb) {
+   */ GLTFUtils.parseGLB = function parseGLB(context, originBuffer) {
         var UINT32_LENGTH = 4;
         var GLB_HEADER_MAGIC = 0x46546c67; // 'glTF'
         var GLB_HEADER_LENGTH = 12;
@@ -2068,7 +2068,7 @@ function registerGLTFParser(pipeline) {
             JSON: 0x4e4f534a,
             BIN: 0x004e4942
         };
-        var dataView = new DataView(glb);
+        var dataView = new DataView(originBuffer);
         // read header
         var header = {
             magic: dataView.getUint32(0, true),
@@ -2076,8 +2076,9 @@ function registerGLTFParser(pipeline) {
             length: dataView.getUint32(2 * UINT32_LENGTH, true)
         };
         if (header.magic !== GLB_HEADER_MAGIC) {
-            console.error("Invalid glb magic number. Expected 0x46546C67, found 0x" + header.magic.toString(16));
-            return null;
+            return {
+                originBuffer: originBuffer
+            };
         }
         // read main data
         var chunkLength = dataView.getUint32(GLB_HEADER_LENGTH, true);
@@ -2087,7 +2088,7 @@ function registerGLTFParser(pipeline) {
             console.error("Invalid glb chunk type. Expected 0x4E4F534A, found 0x" + chunkType.toString(16));
             return null;
         }
-        var glTFData = new Uint8Array(glb, GLB_HEADER_LENGTH + 2 * UINT32_LENGTH, chunkLength);
+        var glTFData = new Uint8Array(originBuffer, GLB_HEADER_LENGTH + 2 * UINT32_LENGTH, chunkLength);
         var glTF = JSON.parse(engineCore.Utils.decodeText(glTFData));
         // read all buffers
         var buffers = [];
@@ -2101,7 +2102,7 @@ function registerGLTFParser(pipeline) {
                 return null;
             }
             var currentOffset = byteOffset + 2 * UINT32_LENGTH;
-            var buffer = glb.slice(currentOffset, currentOffset + chunkLength);
+            var buffer = originBuffer.slice(currentOffset, currentOffset + chunkLength);
             buffers.push(buffer);
             restoreGLBBufferSlice.push(new engineMath.Vector2(currentOffset, chunkLength));
             byteOffset += chunkLength + 2 * UINT32_LENGTH;
@@ -3511,23 +3512,20 @@ exports.GLTFSchemaParser = /*#__PURE__*/ function(GLTFParser1) {
         var requestConfig = {
             type: "arraybuffer"
         };
-        var isGLB = this._isGLB(url);
-        contentRestorer.isGLB = isGLB;
-        var promise = isGLB ? engineCore.request(url, requestConfig).then(function(glb) {
+        return engineCore.request(url, requestConfig).then(function(buffer) {
             restoreBufferRequests.push(new BufferRequestInfo(url, requestConfig));
-            return GLTFUtils.parseGLB(context, glb);
-        }).then(function(param) {
-            var glTF = param.glTF, buffers = param.buffers;
-            context.buffers = buffers;
-            return glTF;
-        }) : engineCore.request(url, {
-            type: "json"
+            return GLTFUtils.parseGLB(context, buffer);
+        }).then(function(result) {
+            var _result;
+            if ((_result = result) == null ? void 0 : _result.glTF) {
+                contentRestorer.isGLB = true;
+                context.buffers = result.buffers;
+                return result.glTF;
+            } else {
+                contentRestorer.isGLB = false;
+                return JSON.parse(engineCore.Utils.decodeText(new Uint8Array(result.originBuffer)));
+            }
         });
-        return promise;
-    };
-    _proto._isGLB = function _isGLB(url) {
-        var index = url.lastIndexOf(".");
-        return url.substring(index + 1, index + 4) === "glb";
     };
     return GLTFSchemaParser;
 }(GLTFParser);