@galacean/engine-core 1.4.13 → 1.4.15

package/dist/module.js

@@ -19387,12 +19387,24 @@ var AssetPromise = /*#__PURE__*/ function() {
         this._onCancelHandler && this._onCancelHandler();
         return this;
     };
-    /**
-   * Return a new resource Promise through the provided asset promise collection.
-   * The resolved of the new AssetPromise will be triggered when all the Promises in the provided set are completed.
-   * @param - Promise Collection
-   * @returns AssetPromise
-   */ AssetPromise.all = function all(promises) {
+    AssetPromise.resolve = function resolve(value) {
+        if (value === undefined) {
+            return new AssetPromise(function(resolve) {
+                return resolve();
+            });
+        } else if (_instanceof(value, AssetPromise) || _instanceof(value, Promise)) {
+            return new AssetPromise(function(resolve, reject) {
+                value.then(function(resolved) {
+                    return resolve(resolved);
+                }, reject);
+            });
+        } else {
+            return new AssetPromise(function(resolve) {
+                return resolve(value);
+            });
+        }
+    };
+    AssetPromise.all = function all(values) {
         return new AssetPromise(function(resolve, reject, setTaskCompleteProgress) {
             var onComplete = function onComplete(index, resultValue) {
                 completed++;
@@ -19403,7 +19415,7 @@ var AssetPromise = /*#__PURE__*/ function() {
                 }
             };
             var onProgress = function onProgress(promise, index) {
-                if (_instanceof(promise, Promise) || _instanceof(promise, AssetPromise)) {
+                if (_instanceof(promise, AssetPromise) || _instanceof(promise, Promise)) {
                     promise.then(function(value) {
                         onComplete(index, value);
                     }, reject);
@@ -19413,14 +19425,14 @@ var AssetPromise = /*#__PURE__*/ function() {
                     });
                 }
             };
-            var count = promises.length;
+            var count = Array.from(values).length;
             var results = new Array(count);
             var completed = 0;
             if (count === 0) {
                 return resolve(results);
             }
             for(var i = 0; i < count; i++){
-                onProgress(promises[i], i);
+                onProgress(values[i], i);
             }
         });
     };
@@ -20003,12 +20015,12 @@ var MultiExecutor = /*#__PURE__*/ function() {
         var obj = this._objectPool[refId];
         var promise;
         if (obj) {
-            promise = Promise.resolve(obj);
+            promise = AssetPromise.resolve(obj);
         } else {
             var resourceConfig = this._idResourceMap[refId];
             if (!resourceConfig) {
                 Logger.warn("refId:" + refId + " is not find in this._idResourceMap.");
-                return Promise.resolve(null);
+                return AssetPromise.resolve(null);
             }
             var url = resourceConfig.virtualPath;
             if (key) {
@@ -24122,7 +24134,7 @@ var fragBlurH = "#define GLSLIFY 1\n#include <PostCommon>\n\nvarying vec2 v_uv;\
 
 var fragBlurV = "#define GLSLIFY 1\n#include <PostCommon>\n\nvarying vec2 v_uv;\nuniform sampler2D renderer_BlitTexture;\nuniform vec4 renderer_texelSize;    // x: 1/width, y: 1/height, z: width, w: height\n\nvoid main(){\n    vec2 texelSize = renderer_texelSize.xy;\n\n    // Optimized bilinear 5-tap gaussian on the same-sized source (9-tap equivalent)\n    mediump vec4 c0 = sampleTexture(renderer_BlitTexture, v_uv - vec2(0.0, texelSize.y * 3.23076923));\n    mediump vec4 c1 = sampleTexture(renderer_BlitTexture, v_uv - vec2(0.0, texelSize.y * 1.38461538));\n    mediump vec4 c2 = sampleTexture(renderer_BlitTexture, v_uv);\n    mediump vec4 c3 = sampleTexture(renderer_BlitTexture, v_uv + vec2(0.0, texelSize.y * 1.38461538));\n    mediump vec4 c4 = sampleTexture(renderer_BlitTexture, v_uv + vec2(0.0, texelSize.y * 3.23076923));\n\n    gl_FragColor = c0 * 0.07027027 + c1 * 0.31621622\n                        + c2 * 0.22702703\n                        + c3 * 0.31621622 + c4 * 0.07027027;\n\n    #ifndef ENGINE_IS_COLORSPACE_GAMMA\n      gl_FragColor = linearToGamma(gl_FragColor);\n    #endif\n}"; // eslint-disable-line
 
-var fragPrefilter = "#define GLSLIFY 1\n#include <PostCommon>\n\nvarying vec2 v_uv;\nuniform sampler2D renderer_BlitTexture;\nuniform vec4 material_BloomParams;  // x: threshold (linear), y: threshold knee, z: scatter\nuniform vec4 renderer_texelSize;    // x: 1/width, y: 1/height, z: width, w: height\n\nvoid main(){\n\t#ifdef BLOOM_HQ\n      vec2 texelSize = renderer_texelSize.xy;\n      mediump vec4 A = sampleTexture(renderer_BlitTexture, v_uv + texelSize * vec2(-1.0, -1.0));\n      mediump vec4 B = sampleTexture(renderer_BlitTexture, v_uv + texelSize * vec2(0.0, -1.0));\n      mediump vec4 C = sampleTexture(renderer_BlitTexture, v_uv + texelSize * vec2(1.0, -1.0));\n      mediump vec4 D = sampleTexture(renderer_BlitTexture, v_uv + texelSize * vec2(-0.5, -0.5));\n      mediump vec4 E = sampleTexture(renderer_BlitTexture, v_uv + texelSize * vec2(0.5, -0.5));\n      mediump vec4 F = sampleTexture(renderer_BlitTexture, v_uv + texelSize * vec2(-1.0, 0.0));\n      mediump vec4 G = sampleTexture(renderer_BlitTexture, v_uv);\n      mediump vec4 H = sampleTexture(renderer_BlitTexture, v_uv + texelSize * vec2(1.0, 0.0));\n      mediump vec4 I = sampleTexture(renderer_BlitTexture, v_uv + texelSize * vec2(-0.5, 0.5));\n      mediump vec4 J = sampleTexture(renderer_BlitTexture, v_uv + texelSize * vec2(0.5, 0.5));\n      mediump vec4 K = sampleTexture(renderer_BlitTexture, v_uv + texelSize * vec2(-1.0, 1.0));\n      mediump vec4 L = sampleTexture(renderer_BlitTexture, v_uv + texelSize * vec2(0.0, 1.0));\n      mediump vec4 M = sampleTexture(renderer_BlitTexture, v_uv + texelSize * vec2(1.0, 1.0));\n\n      mediump vec2 scale = vec2(0.5, 0.125);\n      mediump vec2 div = (1.0 / 4.0) * scale;\n\n      mediump vec4 samplerColor = (D + E + I + J) * div.x;\n      samplerColor += (A + B + G + F) * div.y;\n      samplerColor += (B + C + H + G) * div.y;\n      samplerColor += (F + G + L + K) * div.y;\n      samplerColor += (G + H + M + L) * div.y;\n    #else\n      mediump vec4 samplerColor = sampleTexture(renderer_BlitTexture, v_uv);\n    #endif\n\n    mediump vec3 color = samplerColor.rgb;\n\n    // User controlled clamp to limit crazy high broken spec\n    color = min(color, HALF_MAX);\n\n    // Thresholding\n    mediump float brightness = max3(color);\n    float threshold = material_BloomParams.x;\n    float thresholdKnee = material_BloomParams.y;\n    mediump float softness = clamp(brightness - threshold + thresholdKnee, 0.0, 2.0 * thresholdKnee);\n    softness = (softness * softness) / (4.0 * thresholdKnee + 1e-4);\n    mediump float multiplier = max(brightness - threshold, softness) / max(brightness, 1e-4);\n    color *= multiplier;\n\n    // Clamp colors to positive once in prefilter. Encode can have a sqrt, and sqrt(-x) == NaN. Up/Downsample passes would then spread the NaN.\n    color = max(color, 0.0);\n\n    gl_FragColor = vec4(color, samplerColor.a);\n    \n    #ifndef ENGINE_IS_COLORSPACE_GAMMA\n      gl_FragColor = linearToGamma(gl_FragColor);\n    #endif\n}"; // eslint-disable-line
+var fragPrefilter = "#define GLSLIFY 1\n#include <PostCommon>\n\nvarying vec2 v_uv;\nuniform sampler2D renderer_BlitTexture;\nuniform vec4 material_BloomParams;  // x: threshold (linear), y: threshold knee, z: scatter\nuniform vec4 renderer_texelSize;    // x: 1/width, y: 1/height, z: width, w: height\n\nvoid main(){\n\t#ifdef BLOOM_HQ\n      vec2 texelSize = renderer_texelSize.xy;\n      mediump vec4 A = sampleTexture(renderer_BlitTexture, v_uv + texelSize * vec2(-1.0, -1.0));\n      mediump vec4 B = sampleTexture(renderer_BlitTexture, v_uv + texelSize * vec2(0.0, -1.0));\n      mediump vec4 C = sampleTexture(renderer_BlitTexture, v_uv + texelSize * vec2(1.0, -1.0));\n      mediump vec4 D = sampleTexture(renderer_BlitTexture, v_uv + texelSize * vec2(-0.5, -0.5));\n      mediump vec4 E = sampleTexture(renderer_BlitTexture, v_uv + texelSize * vec2(0.5, -0.5));\n      mediump vec4 F = sampleTexture(renderer_BlitTexture, v_uv + texelSize * vec2(-1.0, 0.0));\n      mediump vec4 G = sampleTexture(renderer_BlitTexture, v_uv);\n      mediump vec4 H = sampleTexture(renderer_BlitTexture, v_uv + texelSize * vec2(1.0, 0.0));\n      mediump vec4 I = sampleTexture(renderer_BlitTexture, v_uv + texelSize * vec2(-0.5, 0.5));\n      mediump vec4 J = sampleTexture(renderer_BlitTexture, v_uv + texelSize * vec2(0.5, 0.5));\n      mediump vec4 K = sampleTexture(renderer_BlitTexture, v_uv + texelSize * vec2(-1.0, 1.0));\n      mediump vec4 L = sampleTexture(renderer_BlitTexture, v_uv + texelSize * vec2(0.0, 1.0));\n      mediump vec4 M = sampleTexture(renderer_BlitTexture, v_uv + texelSize * vec2(1.0, 1.0));\n\n      mediump vec2 scale = vec2(0.5, 0.125);\n      mediump vec2 div = (1.0 / 4.0) * scale;\n\n      mediump vec4 samplerColor = (D + E + I + J) * div.x;\n      samplerColor += (A + B + G + F) * div.y;\n      samplerColor += (B + C + H + G) * div.y;\n      samplerColor += (F + G + L + K) * div.y;\n      samplerColor += (G + H + M + L) * div.y;\n    #else\n      mediump vec4 samplerColor = sampleTexture(renderer_BlitTexture, v_uv);\n    #endif\n\n    mediump vec3 color = samplerColor.rgb;\n\n    // User controlled clamp to limit crazy high broken spec\n    color = min(color, HALF_MAX);\n\n    // Thresholding\n    mediump float brightness = max3(color);\n    float threshold = material_BloomParams.x;\n    float thresholdKnee = material_BloomParams.y;\n    mediump float softness = clamp(brightness - threshold + thresholdKnee, 0.0, 2.0 * thresholdKnee);\n    softness = (softness * softness) / (4.0 * thresholdKnee + 1e-4);\n    mediump float multiplier = max(brightness - threshold, softness) / max(brightness, 1e-4);\n    color *= multiplier;\n\n    // Clamp colors to positive once in prefilter. Encode can have a sqrt, and sqrt(-x) == NaN. Up/Downsample passes would then spread the NaN.\n    color = max(color, 0.0);\n\n    // Bloom is addtive blend mode, we should set alpha 0 to avoid browser background color dark when canvas alpha and premultiplyAlpha is true\n    gl_FragColor = vec4(color, 0.0);\n    \n    #ifndef ENGINE_IS_COLORSPACE_GAMMA\n      gl_FragColor = linearToGamma(gl_FragColor);\n    #endif\n}\n"; // eslint-disable-line
 
 var fragUpsample = "#define GLSLIFY 1\n#include <PostCommon>\n#include <Filtering>\n\nvarying vec2 v_uv;\nuniform sampler2D renderer_BlitTexture;\nuniform sampler2D material_lowMipTexture;\nuniform vec4 material_BloomParams;        // x: threshold (linear), y: threshold knee, z: scatter\nuniform vec4 material_lowMipTexelSize;    // x: 1/width, y: 1/height, z: width, w: height\n\nvoid main(){\n    mediump vec4 highMip = sampleTexture(renderer_BlitTexture, v_uv);\n\n    #ifdef BLOOM_HQ\n      mediump vec4 lowMip = sampleTexture2DBicubic(material_lowMipTexture, v_uv, material_lowMipTexelSize);\n    #else\n      mediump vec4 lowMip = sampleTexture(material_lowMipTexture, v_uv);\n    #endif\n    \n    gl_FragColor = mix(highMip, lowMip, material_BloomParams.z);\n  \n    #ifndef ENGINE_IS_COLORSPACE_GAMMA\n      gl_FragColor = linearToGamma(gl_FragColor);\n    #endif\n}"; // eslint-disable-line
 
@@ -24382,7 +24394,7 @@ var PostProcessUberPass = /*#__PURE__*/ function(PostProcessPass) {
         var thresholdKnee = thresholdLinear * 0.5; // Hardcoded soft knee
         var bloomParams = bloomShaderData.getVector4(BloomEffect._bloomParams);
         var scatterLerp = MathUtil.lerp(0.05, 0.95, scatter.value);
-        bloomParams.x = threshold.value;
+        bloomParams.x = thresholdLinear;
         bloomParams.y = thresholdKnee;
         bloomParams.z = scatterLerp;
         var bloomIntensityParams = uberShaderData.getVector4(BloomEffect._bloomIntensityParams);