@galacean/engine 1.5.5 → 1.5.7

package/dist/browser.js

@@ -30384,6 +30384,7 @@
     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;
@@ -30417,9 +30418,11 @@
                 }
             }
             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;
@@ -37629,6 +37632,169 @@
     __decorate$1([
         ignoreClone
     ], EmissionModule.prototype, "_burstRand", void 0);
+    /**
+     * Force over lifetime module.
+     */ var ForceOverLifetimeModule = /*#__PURE__*/ function(ParticleGeneratorModule) {
+        _inherits$2(ForceOverLifetimeModule, ParticleGeneratorModule);
+        function ForceOverLifetimeModule(generator) {
+            var _this;
+            _this = ParticleGeneratorModule.call(this, generator) || this, /** @internal */ _this._forceRand = new Rand(0, ParticleRandomSubSeeds.ForceOverLifetime), _this._forceMinConstant = new Vector3(), _this._forceMaxConstant = new 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$2(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$1([
+        ignoreClone
+    ], ForceOverLifetimeModule.prototype, "_forceRand", void 0);
+    __decorate$1([
+        ignoreClone
+    ], ForceOverLifetimeModule.prototype, "_forceMinConstant", void 0);
+    __decorate$1([
+        ignoreClone
+    ], ForceOverLifetimeModule.prototype, "_forceMaxConstant", void 0);
+    __decorate$1([
+        ignoreClone
+    ], ForceOverLifetimeModule.prototype, "_forceMacro", void 0);
+    __decorate$1([
+        ignoreClone
+    ], ForceOverLifetimeModule.prototype, "_randomModeMacro", void 0);
+    __decorate$1([
+        deepClone
+    ], ForceOverLifetimeModule.prototype, "_forceX", void 0);
+    __decorate$1([
+        deepClone
+    ], ForceOverLifetimeModule.prototype, "_forceY", void 0);
+    __decorate$1([
+        deepClone
+    ], ForceOverLifetimeModule.prototype, "_forceZ", void 0);
     /**
      * Control how Particle Generator apply transform scale.
      */ var ParticleScaleMode = /*#__PURE__*/ function(ParticleScaleMode) {
@@ -38645,169 +38811,6 @@
     __decorate$1([
         deepClone
     ], VelocityOverLifetimeModule.prototype, "_velocityZ", void 0);
-    /**
-     * Force over lifetime module.
-     */ var ForceOverLifetimeModule = /*#__PURE__*/ function(ParticleGeneratorModule) {
-        _inherits$2(ForceOverLifetimeModule, ParticleGeneratorModule);
-        function ForceOverLifetimeModule(generator) {
-            var _this;
-            _this = ParticleGeneratorModule.call(this, generator) || this, /** @internal */ _this._forceRand = new Rand(0, ParticleRandomSubSeeds.ForceOverLifetime), _this._forceMinConstant = new Vector3(), _this._forceMaxConstant = new 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$2(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$1([
-        ignoreClone
-    ], ForceOverLifetimeModule.prototype, "_forceRand", void 0);
-    __decorate$1([
-        ignoreClone
-    ], ForceOverLifetimeModule.prototype, "_forceMinConstant", void 0);
-    __decorate$1([
-        ignoreClone
-    ], ForceOverLifetimeModule.prototype, "_forceMaxConstant", void 0);
-    __decorate$1([
-        ignoreClone
-    ], ForceOverLifetimeModule.prototype, "_forceMacro", void 0);
-    __decorate$1([
-        ignoreClone
-    ], ForceOverLifetimeModule.prototype, "_randomModeMacro", void 0);
-    __decorate$1([
-        deepClone
-    ], ForceOverLifetimeModule.prototype, "_forceX", void 0);
-    __decorate$1([
-        deepClone
-    ], ForceOverLifetimeModule.prototype, "_forceY", void 0);
-    __decorate$1([
-        deepClone
-    ], ForceOverLifetimeModule.prototype, "_forceZ", void 0);
     /**
      * Particle Generator.
      */ var ParticleGenerator = /*#__PURE__*/ function() {
@@ -39585,7 +39588,6 @@
         };
         _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);
@@ -39599,10 +39601,9 @@
             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);
@@ -48287,6 +48288,8 @@
     exports.GLTFEntityParser = __decorate([
         registerGLTFParser(GLTFParserType.Entity)
     ], exports.GLTFEntityParser);
+    // @todo: remap plugin should have a higher priority storage location
+    var REMAP_NAME = "GALACEAN_materials_remap";
     exports.GLTFMaterialParser = /*#__PURE__*/ function(GLTFParser1) {
         _inherits(GLTFMaterialParser, GLTFParser1);
         function GLTFMaterialParser() {
@@ -48297,7 +48300,13 @@
             var materialInfo = context.glTF.materials[index];
             var glTFResource = context.glTFResource;
             var engine = glTFResource.engine;
-            var material = GLTFParser.executeExtensionsCreateAndParse(materialInfo.extensions, context, materialInfo);
+            var extensions = materialInfo.extensions || {};
+            //Keep only the remap extension
+            if (extensions[REMAP_NAME]) {
+                var _obj;
+                extensions = (_obj = {}, _obj[REMAP_NAME] = extensions[REMAP_NAME], _obj);
+            }
+            var material = GLTFParser.executeExtensionsCreateAndParse(extensions, context, materialInfo);
             if (!material) {
                 material = new PBRMaterial(engine);
                 material.name = materialInfo.name;
@@ -48306,7 +48315,7 @@
             return AssetPromise.resolve(material).then(function(material) {
                 // @ts-ignore
                 material || (material = engine._basicResources._getBlinnPhongMaterial());
-                GLTFParser.executeExtensionsAdditiveAndParse(materialInfo.extensions, context, material, materialInfo);
+                GLTFParser.executeExtensionsAdditiveAndParse(extensions, context, material, materialInfo);
                 // @ts-ignore
                 material._associationSuperResource(glTFResource);
                 return material;
@@ -51157,7 +51166,7 @@
     ], EXT_texture_webp);
 
     //@ts-ignore
-    var version = "1.5.5";
+    var version = "1.5.7";
     console.log("Galacean Engine Version: " + version);
     for(var key in CoreObjects){
         Loader.registerClass(key, CoreObjects[key]);