@galacean/engine-core 1.5.5 → 1.5.7

package/dist/main.js

@@ -25656,6 +25656,7 @@ var unlitVs = "#define GLSLIFY 1\n#include <common>\n#include <common_vert>\n#in
 var UIUtils = /*#__PURE__*/ function() {
     function UIUtils() {}
     UIUtils.renderOverlay = function renderOverlay(engine, scene, uiCanvases) {
+        engine._macroCollection.enable(UIUtils._shouldSRGBCorrect);
         var canvas = engine.canvas; engine._hardwareRenderer; var renderContext = engine._renderContext, batcherManager = engine._batcherManager;
         var uiRenderQueue = this._renderQueue || (this._renderQueue = new RenderQueue(RenderQueueType.Transparent));
         var virtualCamera = this._virtualCamera || (this._virtualCamera = new VirtualCamera());
@@ -25687,9 +25688,11 @@ var UIUtils = /*#__PURE__*/ function() {
             }
         }
         renderContext.camera = null;
+        engine._macroCollection.disable(UIUtils._shouldSRGBCorrect);
     };
     return UIUtils;
 }();
+UIUtils._shouldSRGBCorrect = ShaderMacro.getByName("ENGINE_SHOULD_SRGB_CORRECT");
 var OverlayCamera = function OverlayCamera() {
     // @ts-ignore
     this.instanceId = ++EngineObject._instanceIdCounter;
@@ -32990,6 +32993,170 @@ __decorate([
     ignoreClone
 ], EmissionModule.prototype, "_burstRand", void 0);
 
+/**
+ * Force over lifetime module.
+ */ var ForceOverLifetimeModule = /*#__PURE__*/ function(ParticleGeneratorModule) {
+    _inherits(ForceOverLifetimeModule, ParticleGeneratorModule);
+    function ForceOverLifetimeModule(generator) {
+        var _this;
+        _this = ParticleGeneratorModule.call(this, generator) || this, /** @internal */ _this._forceRand = new engineMath.Rand(0, ParticleRandomSubSeeds.ForceOverLifetime), _this._forceMinConstant = new engineMath.Vector3(), _this._forceMaxConstant = new engineMath.Vector3(), _this._space = ParticleSimulationSpace.Local;
+        _this.forceX = new ParticleCompositeCurve(0);
+        _this.forceY = new ParticleCompositeCurve(0);
+        _this.forceZ = new ParticleCompositeCurve(0);
+        return _this;
+    }
+    var _proto = ForceOverLifetimeModule.prototype;
+    /**
+   * @internal
+   */ _proto._updateShaderData = function _updateShaderData(shaderData) {
+        var forceModeMacro = null;
+        var isRandomModeMacro = null;
+        if (this.enabled) {
+            var forceX = this._forceX;
+            var forceY = this._forceY;
+            var forceZ = this._forceZ;
+            var isRandomCurveMode = forceX.mode === ParticleCurveMode.TwoCurves && forceY.mode === ParticleCurveMode.TwoCurves && forceZ.mode === ParticleCurveMode.TwoCurves;
+            if (isRandomCurveMode || forceX.mode === ParticleCurveMode.Curve && forceY.mode === ParticleCurveMode.Curve && forceZ.mode === ParticleCurveMode.Curve) {
+                shaderData.setFloatArray(ForceOverLifetimeModule._maxGradientXProperty, forceX.curveMax._getTypeArray());
+                shaderData.setFloatArray(ForceOverLifetimeModule._maxGradientYProperty, forceY.curveMax._getTypeArray());
+                shaderData.setFloatArray(ForceOverLifetimeModule._maxGradientZProperty, forceZ.curveMax._getTypeArray());
+                forceModeMacro = ForceOverLifetimeModule._curveModeMacro;
+                if (isRandomCurveMode) {
+                    shaderData.setFloatArray(ForceOverLifetimeModule._minGradientXProperty, forceX.curveMin._getTypeArray());
+                    shaderData.setFloatArray(ForceOverLifetimeModule._minGradientYProperty, forceY.curveMin._getTypeArray());
+                    shaderData.setFloatArray(ForceOverLifetimeModule._minGradientZProperty, forceZ.curveMin._getTypeArray());
+                    isRandomModeMacro = ForceOverLifetimeModule._isRandomMacro;
+                }
+            } else {
+                var constantMax = this._forceMaxConstant;
+                constantMax.set(forceX.constantMax, forceY.constantMax, forceZ.constantMax);
+                shaderData.setVector3(ForceOverLifetimeModule._maxConstantProperty, constantMax);
+                forceModeMacro = ForceOverLifetimeModule._constantModeMacro;
+                if (forceX.mode === ParticleCurveMode.TwoConstants && forceY.mode === ParticleCurveMode.TwoConstants && forceZ.mode === ParticleCurveMode.TwoConstants) {
+                    var constantMin = this._forceMinConstant;
+                    constantMin.set(forceX.constantMin, forceY.constantMin, forceZ.constantMin);
+                    shaderData.setVector3(ForceOverLifetimeModule._minConstantProperty, constantMin);
+                    isRandomModeMacro = ForceOverLifetimeModule._isRandomMacro;
+                }
+            }
+            shaderData.setInt(ForceOverLifetimeModule._spaceProperty, this._space);
+        }
+        this._forceMacro = this._enableMacro(shaderData, this._forceMacro, forceModeMacro);
+        this._randomModeMacro = this._enableMacro(shaderData, this._randomModeMacro, isRandomModeMacro);
+    };
+    /**
+   * @internal
+   */ _proto._resetRandomSeed = function _resetRandomSeed(seed) {
+        this._forceRand.reset(seed, ParticleRandomSubSeeds.ForceOverLifetime);
+    };
+    /**
+   * @internal
+   */ _proto._isRandomMode = function _isRandomMode() {
+        var modeX = this.forceX.mode;
+        var modeY = this.forceY.mode;
+        var modeZ = this.forceZ.mode;
+        return modeX === ParticleCurveMode.TwoCurves && modeY === ParticleCurveMode.TwoCurves && modeZ === ParticleCurveMode.TwoCurves || modeX === ParticleCurveMode.TwoConstants && modeY === ParticleCurveMode.TwoConstants && modeZ === ParticleCurveMode.TwoConstants;
+    };
+    _create_class(ForceOverLifetimeModule, [
+        {
+            key: "forceX",
+            get: /**
+   * Force over lifetime for x axis.
+   */ function get() {
+                return this._forceX;
+            },
+            set: function set(value) {
+                var lastValue = this._forceX;
+                if (value !== lastValue) {
+                    this._forceX = value;
+                    this._onCompositeCurveChange(lastValue, value);
+                }
+            }
+        },
+        {
+            key: "forceY",
+            get: /**
+   * Force over lifetime for y axis.
+   */ function get() {
+                return this._forceY;
+            },
+            set: function set(value) {
+                var lastValue = this._forceY;
+                if (value !== lastValue) {
+                    this._forceY = value;
+                    this._onCompositeCurveChange(lastValue, value);
+                }
+            }
+        },
+        {
+            key: "forceZ",
+            get: /**
+   * Force over lifetime for z axis.
+   */ function get() {
+                return this._forceZ;
+            },
+            set: function set(value) {
+                var lastValue = this._forceZ;
+                if (value !== lastValue) {
+                    this._forceZ = value;
+                    this._onCompositeCurveChange(lastValue, value);
+                }
+            }
+        },
+        {
+            key: "space",
+            get: /**
+   * Force space.
+   */ function get() {
+                return this._space;
+            },
+            set: function set(value) {
+                if (value !== this._space) {
+                    this._space = value;
+                    this._generator._renderer._onGeneratorParamsChanged();
+                }
+            }
+        }
+    ]);
+    return ForceOverLifetimeModule;
+}(ParticleGeneratorModule);
+ForceOverLifetimeModule._constantModeMacro = ShaderMacro.getByName("RENDERER_FOL_CONSTANT_MODE");
+ForceOverLifetimeModule._curveModeMacro = ShaderMacro.getByName("RENDERER_FOL_CURVE_MODE");
+ForceOverLifetimeModule._isRandomMacro = ShaderMacro.getByName("RENDERER_FOL_IS_RANDOM_TWO");
+ForceOverLifetimeModule._minConstantProperty = ShaderProperty.getByName("renderer_FOLMinConst");
+ForceOverLifetimeModule._maxConstantProperty = ShaderProperty.getByName("renderer_FOLMaxConst");
+ForceOverLifetimeModule._minGradientXProperty = ShaderProperty.getByName("renderer_FOLMinGradientX");
+ForceOverLifetimeModule._minGradientYProperty = ShaderProperty.getByName("renderer_FOLMinGradientY");
+ForceOverLifetimeModule._minGradientZProperty = ShaderProperty.getByName("renderer_FOLMinGradientZ");
+ForceOverLifetimeModule._maxGradientXProperty = ShaderProperty.getByName("renderer_FOLMaxGradientX");
+ForceOverLifetimeModule._maxGradientYProperty = ShaderProperty.getByName("renderer_FOLMaxGradientY");
+ForceOverLifetimeModule._maxGradientZProperty = ShaderProperty.getByName("renderer_FOLMaxGradientZ");
+ForceOverLifetimeModule._spaceProperty = ShaderProperty.getByName("renderer_FOLSpace");
+__decorate([
+    ignoreClone
+], ForceOverLifetimeModule.prototype, "_forceRand", void 0);
+__decorate([
+    ignoreClone
+], ForceOverLifetimeModule.prototype, "_forceMinConstant", void 0);
+__decorate([
+    ignoreClone
+], ForceOverLifetimeModule.prototype, "_forceMaxConstant", void 0);
+__decorate([
+    ignoreClone
+], ForceOverLifetimeModule.prototype, "_forceMacro", void 0);
+__decorate([
+    ignoreClone
+], ForceOverLifetimeModule.prototype, "_randomModeMacro", void 0);
+__decorate([
+    deepClone
+], ForceOverLifetimeModule.prototype, "_forceX", void 0);
+__decorate([
+    deepClone
+], ForceOverLifetimeModule.prototype, "_forceY", void 0);
+__decorate([
+    deepClone
+], ForceOverLifetimeModule.prototype, "_forceZ", void 0);
+
 /**
  * Control how Particle Generator apply transform scale.
  */ var ParticleScaleMode = /*#__PURE__*/ function(ParticleScaleMode) {
@@ -34013,170 +34180,6 @@ __decorate([
     deepClone
 ], VelocityOverLifetimeModule.prototype, "_velocityZ", void 0);
 
-/**
- * Force over lifetime module.
- */ var ForceOverLifetimeModule = /*#__PURE__*/ function(ParticleGeneratorModule) {
-    _inherits(ForceOverLifetimeModule, ParticleGeneratorModule);
-    function ForceOverLifetimeModule(generator) {
-        var _this;
-        _this = ParticleGeneratorModule.call(this, generator) || this, /** @internal */ _this._forceRand = new engineMath.Rand(0, ParticleRandomSubSeeds.ForceOverLifetime), _this._forceMinConstant = new engineMath.Vector3(), _this._forceMaxConstant = new engineMath.Vector3(), _this._space = ParticleSimulationSpace.Local;
-        _this.forceX = new ParticleCompositeCurve(0);
-        _this.forceY = new ParticleCompositeCurve(0);
-        _this.forceZ = new ParticleCompositeCurve(0);
-        return _this;
-    }
-    var _proto = ForceOverLifetimeModule.prototype;
-    /**
-   * @internal
-   */ _proto._updateShaderData = function _updateShaderData(shaderData) {
-        var forceModeMacro = null;
-        var isRandomModeMacro = null;
-        if (this.enabled) {
-            var forceX = this._forceX;
-            var forceY = this._forceY;
-            var forceZ = this._forceZ;
-            var isRandomCurveMode = forceX.mode === ParticleCurveMode.TwoCurves && forceY.mode === ParticleCurveMode.TwoCurves && forceZ.mode === ParticleCurveMode.TwoCurves;
-            if (isRandomCurveMode || forceX.mode === ParticleCurveMode.Curve && forceY.mode === ParticleCurveMode.Curve && forceZ.mode === ParticleCurveMode.Curve) {
-                shaderData.setFloatArray(ForceOverLifetimeModule._maxGradientXProperty, forceX.curveMax._getTypeArray());
-                shaderData.setFloatArray(ForceOverLifetimeModule._maxGradientYProperty, forceY.curveMax._getTypeArray());
-                shaderData.setFloatArray(ForceOverLifetimeModule._maxGradientZProperty, forceZ.curveMax._getTypeArray());
-                forceModeMacro = ForceOverLifetimeModule._curveModeMacro;
-                if (isRandomCurveMode) {
-                    shaderData.setFloatArray(ForceOverLifetimeModule._minGradientXProperty, forceX.curveMin._getTypeArray());
-                    shaderData.setFloatArray(ForceOverLifetimeModule._minGradientYProperty, forceY.curveMin._getTypeArray());
-                    shaderData.setFloatArray(ForceOverLifetimeModule._minGradientZProperty, forceZ.curveMin._getTypeArray());
-                    isRandomModeMacro = ForceOverLifetimeModule._isRandomMacro;
-                }
-            } else {
-                var constantMax = this._forceMaxConstant;
-                constantMax.set(forceX.constantMax, forceY.constantMax, forceZ.constantMax);
-                shaderData.setVector3(ForceOverLifetimeModule._maxConstantProperty, constantMax);
-                forceModeMacro = ForceOverLifetimeModule._constantModeMacro;
-                if (forceX.mode === ParticleCurveMode.TwoConstants && forceY.mode === ParticleCurveMode.TwoConstants && forceZ.mode === ParticleCurveMode.TwoConstants) {
-                    var constantMin = this._forceMinConstant;
-                    constantMin.set(forceX.constantMin, forceY.constantMin, forceZ.constantMin);
-                    shaderData.setVector3(ForceOverLifetimeModule._minConstantProperty, constantMin);
-                    isRandomModeMacro = ForceOverLifetimeModule._isRandomMacro;
-                }
-            }
-            shaderData.setInt(ForceOverLifetimeModule._spaceProperty, this._space);
-        }
-        this._forceMacro = this._enableMacro(shaderData, this._forceMacro, forceModeMacro);
-        this._randomModeMacro = this._enableMacro(shaderData, this._randomModeMacro, isRandomModeMacro);
-    };
-    /**
-   * @internal
-   */ _proto._resetRandomSeed = function _resetRandomSeed(seed) {
-        this._forceRand.reset(seed, ParticleRandomSubSeeds.ForceOverLifetime);
-    };
-    /**
-   * @internal
-   */ _proto._isRandomMode = function _isRandomMode() {
-        var modeX = this.forceX.mode;
-        var modeY = this.forceY.mode;
-        var modeZ = this.forceZ.mode;
-        return modeX === ParticleCurveMode.TwoCurves && modeY === ParticleCurveMode.TwoCurves && modeZ === ParticleCurveMode.TwoCurves || modeX === ParticleCurveMode.TwoConstants && modeY === ParticleCurveMode.TwoConstants && modeZ === ParticleCurveMode.TwoConstants;
-    };
-    _create_class(ForceOverLifetimeModule, [
-        {
-            key: "forceX",
-            get: /**
-   * Force over lifetime for x axis.
-   */ function get() {
-                return this._forceX;
-            },
-            set: function set(value) {
-                var lastValue = this._forceX;
-                if (value !== lastValue) {
-                    this._forceX = value;
-                    this._onCompositeCurveChange(lastValue, value);
-                }
-            }
-        },
-        {
-            key: "forceY",
-            get: /**
-   * Force over lifetime for y axis.
-   */ function get() {
-                return this._forceY;
-            },
-            set: function set(value) {
-                var lastValue = this._forceY;
-                if (value !== lastValue) {
-                    this._forceY = value;
-                    this._onCompositeCurveChange(lastValue, value);
-                }
-            }
-        },
-        {
-            key: "forceZ",
-            get: /**
-   * Force over lifetime for z axis.
-   */ function get() {
-                return this._forceZ;
-            },
-            set: function set(value) {
-                var lastValue = this._forceZ;
-                if (value !== lastValue) {
-                    this._forceZ = value;
-                    this._onCompositeCurveChange(lastValue, value);
-                }
-            }
-        },
-        {
-            key: "space",
-            get: /**
-   * Force space.
-   */ function get() {
-                return this._space;
-            },
-            set: function set(value) {
-                if (value !== this._space) {
-                    this._space = value;
-                    this._generator._renderer._onGeneratorParamsChanged();
-                }
-            }
-        }
-    ]);
-    return ForceOverLifetimeModule;
-}(ParticleGeneratorModule);
-ForceOverLifetimeModule._constantModeMacro = ShaderMacro.getByName("RENDERER_FOL_CONSTANT_MODE");
-ForceOverLifetimeModule._curveModeMacro = ShaderMacro.getByName("RENDERER_FOL_CURVE_MODE");
-ForceOverLifetimeModule._isRandomMacro = ShaderMacro.getByName("RENDERER_FOL_IS_RANDOM_TWO");
-ForceOverLifetimeModule._minConstantProperty = ShaderProperty.getByName("renderer_FOLMinConst");
-ForceOverLifetimeModule._maxConstantProperty = ShaderProperty.getByName("renderer_FOLMaxConst");
-ForceOverLifetimeModule._minGradientXProperty = ShaderProperty.getByName("renderer_FOLMinGradientX");
-ForceOverLifetimeModule._minGradientYProperty = ShaderProperty.getByName("renderer_FOLMinGradientY");
-ForceOverLifetimeModule._minGradientZProperty = ShaderProperty.getByName("renderer_FOLMinGradientZ");
-ForceOverLifetimeModule._maxGradientXProperty = ShaderProperty.getByName("renderer_FOLMaxGradientX");
-ForceOverLifetimeModule._maxGradientYProperty = ShaderProperty.getByName("renderer_FOLMaxGradientY");
-ForceOverLifetimeModule._maxGradientZProperty = ShaderProperty.getByName("renderer_FOLMaxGradientZ");
-ForceOverLifetimeModule._spaceProperty = ShaderProperty.getByName("renderer_FOLSpace");
-__decorate([
-    ignoreClone
-], ForceOverLifetimeModule.prototype, "_forceRand", void 0);
-__decorate([
-    ignoreClone
-], ForceOverLifetimeModule.prototype, "_forceMinConstant", void 0);
-__decorate([
-    ignoreClone
-], ForceOverLifetimeModule.prototype, "_forceMaxConstant", void 0);
-__decorate([
-    ignoreClone
-], ForceOverLifetimeModule.prototype, "_forceMacro", void 0);
-__decorate([
-    ignoreClone
-], ForceOverLifetimeModule.prototype, "_randomModeMacro", void 0);
-__decorate([
-    deepClone
-], ForceOverLifetimeModule.prototype, "_forceX", void 0);
-__decorate([
-    deepClone
-], ForceOverLifetimeModule.prototype, "_forceY", void 0);
-__decorate([
-    deepClone
-], ForceOverLifetimeModule.prototype, "_forceZ", void 0);
-
 /**
  * Particle Generator.
  */ var ParticleGenerator = /*#__PURE__*/ function() {
@@ -34954,7 +34957,6 @@ __decorate([
     };
     _proto._addGravityToBounds = function _addGravityToBounds(maxLifetime, origin, out) {
         var originMin = origin.min, originMax = origin.max;
-        var min = out.min, max = out.max;
         var modifierMinMax = ParticleGenerator._tempVector20;
         // Gravity modifier impact
         this._getExtremeValueFromZero(this.main.gravityModifier, modifierMinMax);
@@ -34968,10 +34970,9 @@ __decorate([
         var gravityEffectMaxY = y * maxGravityEffect;
         var gravityEffectMinZ = z * minGravityEffect;
         var gravityEffectMaxZ = z * maxGravityEffect;
-        min.set(Math.min(gravityEffectMinX, gravityEffectMaxX), Math.min(gravityEffectMinY, gravityEffectMaxY), Math.min(gravityEffectMinZ, gravityEffectMaxZ));
-        max.set(Math.max(gravityEffectMinX, gravityEffectMaxX), Math.max(gravityEffectMinY, gravityEffectMaxY), Math.max(gravityEffectMinZ, gravityEffectMaxZ));
-        min.add(originMin);
-        max.add(originMax);
+        // `origin` and `out` maybe is same reference
+        out.min.set(Math.min(gravityEffectMinX, gravityEffectMaxX) + originMin.x, Math.min(gravityEffectMinY, gravityEffectMaxY) + originMin.y, Math.min(gravityEffectMinZ, gravityEffectMaxZ) + originMin.z);
+        out.max.set(Math.max(gravityEffectMinX, gravityEffectMaxX) + originMax.x, Math.max(gravityEffectMinY, gravityEffectMaxY) + originMax.y, Math.max(gravityEffectMinZ, gravityEffectMaxZ) + originMax.z);
     };
     _proto._getExtremeValueFromZero = function _getExtremeValueFromZero(curve, out) {
         curve._getMinMax(out);