@galacean/engine-loader 1.4.0-alpha.0 → 1.4.0-alpha.1

package/dist/main.js

@@ -1574,32 +1574,18 @@ var EnvLoader = /*#__PURE__*/ function(Loader) {
     var _proto = EnvLoader.prototype;
     _proto.load = function load(item, resourceManager) {
         return new engineCore.AssetPromise(function(resolve, reject) {
-            resourceManager// @ts-ignore
-            ._request(item.url, _extends({}, item, {
+            var requestConfig = _extends({}, item, {
                 type: "arraybuffer"
-            })).then(function(arraybuffer) {
-                var _this;
-                var shArray = new Float32Array(arraybuffer, 0, 27);
-                var shByteLength = 27 * 4;
-                var size = (_this = new Uint16Array(arraybuffer, shByteLength, 1)) == null ? void 0 : _this[0];
-                var engine = resourceManager.engine;
-                var texture = new engineCore.TextureCube(engine, size);
-                texture.filterMode = engineCore.TextureFilterMode.Trilinear;
-                var mipmapCount = texture.mipmapCount;
-                var offset = shByteLength + 2;
-                for(var mipLevel = 0; mipLevel < mipmapCount; mipLevel++){
-                    var mipSize = size >> mipLevel;
-                    for(var face = 0; face < 6; face++){
-                        var dataSize = mipSize * mipSize * 4;
-                        var data = new Uint8Array(arraybuffer, offset, dataSize);
-                        offset += dataSize;
-                        texture.setPixelBuffer(engineCore.TextureCubeFace.PositiveX + face, data, mipLevel);
-                    }
-                }
+            });
+            var engine = resourceManager.engine;
+            resourceManager// @ts-ignore
+            ._request(item.url, requestConfig).then(function(arraybuffer) {
+                var texture = EnvLoader._setTextureByBuffer(engine, arraybuffer);
+                engine.resourceManager.addContentRestorer(new EnvContentRestorer(texture, item.url, requestConfig));
                 var ambientLight = new engineCore.AmbientLight(engine);
                 var sh = new engineMath.SphericalHarmonics3();
                 ambientLight.diffuseMode = engineCore.DiffuseMode.SphericalHarmonics;
-                sh.copyFromArray(shArray);
+                sh.copyFromArray(new Float32Array(arraybuffer, 0, 27));
                 ambientLight.diffuseSphericalHarmonics = sh;
                 ambientLight.specularTexture = texture;
                 ambientLight.specularTextureDecodeRGBM = true;
@@ -1609,6 +1595,27 @@ var EnvLoader = /*#__PURE__*/ function(Loader) {
             });
         });
     };
+    /**
+   * @internal
+   */ EnvLoader._setTextureByBuffer = function _setTextureByBuffer(engine, buffer, texture) {
+        var _this;
+        var shByteLength = 27 * 4;
+        var size = (_this = new Uint16Array(buffer, shByteLength, 1)) == null ? void 0 : _this[0];
+        texture || (texture = new engineCore.TextureCube(engine, size));
+        texture.filterMode = engineCore.TextureFilterMode.Trilinear;
+        var mipmapCount = texture.mipmapCount;
+        var offset = shByteLength + 2;
+        for(var mipLevel = 0; mipLevel < mipmapCount; mipLevel++){
+            var mipSize = size >> mipLevel;
+            for(var face = 0; face < 6; face++){
+                var dataSize = mipSize * mipSize * 4;
+                var data = new Uint8Array(buffer, offset, dataSize);
+                offset += dataSize;
+                texture.setPixelBuffer(engineCore.TextureCubeFace.PositiveX + face, data, mipLevel);
+            }
+        }
+        return texture;
+    };
     return EnvLoader;
 }(engineCore.Loader);
 EnvLoader = __decorate([
@@ -1616,6 +1623,27 @@ EnvLoader = __decorate([
         "env"
     ])
 ], EnvLoader);
+/**
+ * @internal
+ */ var EnvContentRestorer = /*#__PURE__*/ function(ContentRestorer) {
+    _inherits(EnvContentRestorer, ContentRestorer);
+    function EnvContentRestorer(resource, url, requestConfig) {
+        var _this;
+        _this = ContentRestorer.call(this, resource) || this, _this.url = url, _this.requestConfig = requestConfig;
+        return _this;
+    }
+    var _proto = EnvContentRestorer.prototype;
+    _proto.restoreContent = function restoreContent() {
+        var _this = this;
+        return new engineCore.AssetPromise(function(resolve, reject) {
+            engineCore.request(_this.url, _this.requestConfig).then(function(buffer) {
+                EnvLoader._setTextureByBuffer(_this.resource.engine, buffer, _this.resource);
+                resolve(_this.resource);
+            }).catch(reject);
+        });
+    };
+    return EnvContentRestorer;
+}(engineCore.ContentRestorer);
 
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
     try {
@@ -2033,7 +2061,7 @@ FontLoader = __decorate([
         task.total += 1;
         taskPromise.then(function() {
             _this._setTaskCompleteProgress(++task.loaded, task.total);
-        });
+        }, function() {});
     };
     _proto._handleSubAsset = function _handleSubAsset(resource, type, index) {
         var _this = this;
@@ -6323,6 +6351,45 @@ TextureCubeLoader = __decorate([
     ])
 ], TextureCubeLoader);
 
+var AudioLoader = /*#__PURE__*/ function(Loader) {
+    _inherits(AudioLoader, Loader);
+    function AudioLoader() {
+        return Loader.apply(this, arguments) || this;
+    }
+    var _proto = AudioLoader.prototype;
+    _proto.load = function load(item, resourceManager) {
+        return new engineCore.AssetPromise(function(resolve, reject) {
+            var url = item.url;
+            var requestConfig = _extends({}, item, {
+                type: "arraybuffer"
+            });
+            // @ts-ignore
+            resourceManager._request(url, requestConfig).then(function(arrayBuffer) {
+                var audioClip = new engineCore.AudioClip(resourceManager.engine);
+                engineCore.AudioManager.getContext().decodeAudioData(arrayBuffer).then(function(result) {
+                    // @ts-ignore
+                    audioClip._setAudioSource(result);
+                    if (url.indexOf("data:") !== 0) {
+                        var index = url.lastIndexOf("/");
+                        audioClip.name = url.substring(index + 1);
+                    }
+                    resolve(audioClip);
+                }).catch(function(e) {
+                    reject(e);
+                });
+            });
+        });
+    };
+    return AudioLoader;
+}(engineCore.Loader);
+AudioLoader = __decorate([
+    engineCore.resourceLoader(engineCore.AssetType.Audio, [
+        "mp3",
+        "ogg",
+        "wav"
+    ])
+], AudioLoader);
+
 var ShaderChunkLoader = /*#__PURE__*/ function(Loader) {
     _inherits(ShaderChunkLoader, Loader);
     function ShaderChunkLoader() {
@@ -6360,7 +6427,7 @@ var ShaderChunkLoader = /*#__PURE__*/ function(Loader) {
     };
     return ShaderChunkLoader;
 }(engineCore.Loader);
-ShaderChunkLoader._shaderIncludeRegex = /\s#include\s+"([./][^\\"]+)"/gm;
+ShaderChunkLoader._shaderIncludeRegex = /#include\s+"([./][^\\"]+)"/gm;
 ShaderChunkLoader = __decorate([
     engineCore.resourceLoader("ShaderChunk", [
         "glsl"
@@ -6698,6 +6765,37 @@ KHR_materials_pbrSpecularGlossiness = __decorate([
     registerGLTFExtension("KHR_materials_pbrSpecularGlossiness", GLTFExtensionMode.CreateAndParse)
 ], KHR_materials_pbrSpecularGlossiness);
 
+var KHR_materials_sheen = /*#__PURE__*/ function(GLTFExtensionParser) {
+    _inherits(KHR_materials_sheen, GLTFExtensionParser);
+    function KHR_materials_sheen() {
+        return GLTFExtensionParser.apply(this, arguments) || this;
+    }
+    var _proto = KHR_materials_sheen.prototype;
+    _proto.additiveParse = function additiveParse(context, material, schema) {
+        var sheenColorFactor = schema.sheenColorFactor, sheenColorTexture = schema.sheenColorTexture, _schema_sheenRoughnessFactor = schema.sheenRoughnessFactor, sheenRoughnessFactor = _schema_sheenRoughnessFactor === void 0 ? 0 : _schema_sheenRoughnessFactor, sheenRoughnessTexture = schema.sheenRoughnessTexture;
+        if (sheenColorFactor) {
+            material.sheenColor.set(engineMath.Color.linearToGammaSpace(sheenColorFactor[0]), engineMath.Color.linearToGammaSpace(sheenColorFactor[1]), engineMath.Color.linearToGammaSpace(sheenColorFactor[2]), undefined);
+        }
+        material.sheenRoughness = sheenRoughnessFactor;
+        if (sheenColorTexture) {
+            exports.GLTFMaterialParser._checkOtherTextureTransform(sheenColorTexture, "Sheen texture");
+            context.get(GLTFParserType.Texture, sheenColorTexture.index).then(function(texture) {
+                material.sheenColorTexture = texture;
+            });
+        }
+        if (sheenRoughnessTexture) {
+            exports.GLTFMaterialParser._checkOtherTextureTransform(sheenRoughnessTexture, "SheenRoughness texture");
+            context.get(GLTFParserType.Texture, sheenRoughnessTexture.index).then(function(texture) {
+                material.sheenRoughnessTexture = texture;
+            });
+        }
+    };
+    return KHR_materials_sheen;
+}(GLTFExtensionParser);
+KHR_materials_sheen = __decorate([
+    registerGLTFExtension("KHR_materials_sheen", GLTFExtensionMode.AdditiveParse)
+], KHR_materials_sheen);
+
 var KHR_materials_unlit = /*#__PURE__*/ function(GLTFExtensionParser) {
     _inherits(KHR_materials_unlit, GLTFExtensionParser);
     function KHR_materials_unlit() {