@galacean/engine-core 2.0.0-alpha.34 → 2.0.0-alpha.35

package/dist/main.js

@@ -16897,6 +16897,16 @@ BasicResources._maskReadOutsideRenderStates = null;
 BasicResources._maskWriteIncrementRenderStates = null;
 BasicResources._maskWriteDecrementRenderStates = null;
 
+/**
+ * Engine event type.
+ */ var EngineEventType = /*#__PURE__*/ function(EngineEventType) {
+    /** Dispatched when the engine starts running. */ EngineEventType["Run"] = "run";
+    /** Dispatched when the engine shuts down. */ EngineEventType["Shutdown"] = "shutdown";
+    /** Dispatched when the graphic device is lost. */ EngineEventType["DeviceLost"] = "devicelost";
+    /** Dispatched when the graphic device is restored. */ EngineEventType["DeviceRestored"] = "devicerestored";
+    return EngineEventType;
+}({});
+
 function _is_native_reflect_construct() {
     // Since Reflect.construct can't be properly polyfilled, some
     // implementations (e.g. core-js@2) don't set the correct internal slots.
@@ -27307,7 +27317,7 @@ var OverlayCamera = function OverlayCamera() {
    * Execution engine loop.
    */ _proto.run = function run() {
         this.resume();
-        this.dispatch("run", this);
+        this.dispatch(EngineEventType.Run, this);
     };
     /**
    * Force lose graphic device.
@@ -27392,7 +27402,7 @@ var OverlayCamera = function OverlayCamera() {
         this._batcherManager.destroy();
         this._renderTargetPool.gc();
         (_this_xrManager = this.xrManager) == null ? void 0 : _this_xrManager._destroy();
-        this.dispatch("shutdown", this);
+        this.dispatch(EngineEventType.Shutdown, this);
         // Cancel animation
         this.pause();
         Shader._clear(this);
@@ -27529,7 +27539,7 @@ var OverlayCamera = function OverlayCamera() {
         this.resourceManager._lostGraphicResources();
         this._renderingStatistics._reset();
         console.log("Device lost.");
-        this.dispatch("devicelost", this);
+        this.dispatch(EngineEventType.DeviceLost, this);
     };
     _proto._onDeviceRestored = function _onDeviceRestored() {
         var _this = this;
@@ -27546,7 +27556,7 @@ var OverlayCamera = function OverlayCamera() {
         // Restore resources content
         resourceManager._restoreResourcesContent().then(function() {
             console.log("Graphic resource content restored.\n\n" + "Device restored.");
-            _this.dispatch("devicerestored", _this);
+            _this.dispatch(EngineEventType.DeviceRestored, _this);
         }).catch(function(error) {
             console.error(error);
         });
@@ -33978,6 +33988,13 @@ var ParticleStopMode = /*#__PURE__*/ function(ParticleStopMode) {
     };
     /**
    * @internal
+   */ _proto._cloneTo = function _cloneTo(target) {
+        Renderer.prototype._cloneTo.call(this, target);
+        target.mesh = this._mesh;
+        target.renderMode = this._renderMode;
+    };
+    /**
+   * @internal
    */ _proto._isContainDirtyFlag = function _isContainDirtyFlag(type) {
         return (this._dirtyUpdateFlag & type) != 0;
     };
@@ -34039,9 +34056,7 @@ var ParticleStopMode = /*#__PURE__*/ function(ParticleStopMode) {
                     var wasMeshMode = lastRenderMode === ParticleRenderMode.Mesh;
                     var isMeshMode = value === ParticleRenderMode.Mesh;
                     if (wasMeshMode !== isMeshMode) {
-                        if (!isMeshMode || this.mesh) {
-                            this.generator._reorganizeGeometryBuffers();
-                        }
+                        this.generator._reorganizeGeometryBuffers();
                     }
                 }
             }
@@ -34095,6 +34110,15 @@ __decorate([
 __decorate([
     ignoreClone
 ], ParticleRenderer.prototype, "_transformedBounds", void 0);
+__decorate([
+    ignoreClone
+], ParticleRenderer.prototype, "_mesh", void 0);
+__decorate([
+    ignoreClone
+], ParticleRenderer.prototype, "_renderMode", void 0);
+__decorate([
+    ignoreClone
+], ParticleRenderer.prototype, "_currentRenderModeMacro", void 0);
 __decorate([
     ignoreClone
 ], ParticleRenderer.prototype, "_onGeneratorParamsChanged", null);
@@ -34485,6 +34509,7 @@ ParticleTransformFeedbackSimulator._deltaTimeProperty = ShaderProperty.getByName
     ParticleRandomSubSeeds[ParticleRandomSubSeeds["ForceOverLifetime"] = 3875246972] = "ForceOverLifetime";
     ParticleRandomSubSeeds[ParticleRandomSubSeeds["LimitVelocityOverLifetime"] = 3047300990] = "LimitVelocityOverLifetime";
     ParticleRandomSubSeeds[ParticleRandomSubSeeds["Noise"] = 4105357473] = "Noise";
+    ParticleRandomSubSeeds[ParticleRandomSubSeeds["EmissionRate"] = 2625893077] = "EmissionRate";
     return ParticleRandomSubSeeds;
 }({});
 
@@ -35409,10 +35434,6 @@ __decorate([
             Logger.error("CustomDataModule." + method + ': "' + name + '" must contain only letters, digits, or underscores; call ignored.');
             return false;
         }
-        if (CustomDataModule._reservedPrefixPattern.test(name)) {
-            Logger.error("CustomDataModule." + method + ': "' + name + '" starts with a reserved engine particle module prefix ' + "(VOL/FOL/SOL/COL/ROL/TSA/LVL) and would collide with built-in uniforms; call ignored.");
-            return false;
-        }
         if (this._curves.has(name) || this._gradients.has(name)) {
             Logger.error("CustomDataModule." + method + ': "' + name + '" is already in use; call ignored.');
             return false;
@@ -35440,7 +35461,6 @@ __decorate([
     return CustomDataModule;
 }(ParticleGeneratorModule);
 CustomDataModule._streamNamePattern = /^[A-Za-z0-9_]+$/;
-CustomDataModule._reservedPrefixPattern = /^(?:VOL|FOL|SOL|COL|ROL|TSA|LVL)/;
 CustomDataModule._zeroCurveArray = new Float32Array(8);
 CustomDataModule._zeroGradientColorArray = new Float32Array(16);
 CustomDataModule._zeroGradientAlphaArray = new Float32Array(8);
@@ -35465,7 +35485,7 @@ __decorate([
     _inherits(EmissionModule, ParticleGeneratorModule);
     function EmissionModule() {
         var _this;
-        _this = ParticleGeneratorModule.apply(this, arguments) || this, /**  The rate of particle emission. */ _this.rateOverTime = new ParticleCompositeCurve(10), /**  The rate at which the emitter spawns new particles over distance. */ _this.rateOverDistance = new ParticleCompositeCurve(0), /** @internal */ _this._shapeRand = new engineMath.Rand(0, ParticleRandomSubSeeds.Shape), /** @internal */ _this._frameRateTime = 0, _this._distanceAccumulator = 0, _this._lastEmitPosition = new engineMath.Vector3(), _this._hasLastEmitPosition = false, _this._bursts = [], _this._currentBurstIndex = 0, _this._burstRand = new engineMath.Rand(0, ParticleRandomSubSeeds.Burst);
+        _this = ParticleGeneratorModule.apply(this, arguments) || this, /**  The rate of particle emission. */ _this.rateOverTime = new ParticleCompositeCurve(10), /**  The rate at which the emitter spawns new particles over distance. */ _this.rateOverDistance = new ParticleCompositeCurve(0), /** @internal */ _this._shapeRand = new engineMath.Rand(0, ParticleRandomSubSeeds.Shape), /** @internal */ _this._rateRand = new engineMath.Rand(0, ParticleRandomSubSeeds.EmissionRate), /** @internal */ _this._frameRateTime = 0, _this._distanceAccumulator = 0, _this._lastEmitPosition = new engineMath.Vector3(), _this._hasLastEmitPosition = false, _this._bursts = [], _this._currentBurstIndex = 0, _this._burstRand = new engineMath.Rand(0, ParticleRandomSubSeeds.Burst);
         return _this;
     }
     var _proto = EmissionModule.prototype;
@@ -35507,9 +35527,16 @@ __decorate([
     };
     /**
    * @internal
+   */ _proto._updateShaderData = function _updateShaderData(shaderData) {
+        var shapeMacro = this._enabled && this._shape ? EmissionModule._emissionShapeMacro : null;
+        this._shapeMacro = this._enableMacro(shaderData, this._shapeMacro, shapeMacro);
+    };
+    /**
+   * @internal
    */ _proto._resetRandomSeed = function _resetRandomSeed(seed) {
         this._burstRand.reset(seed, ParticleRandomSubSeeds.Burst);
         this._shapeRand.reset(seed, ParticleRandomSubSeeds.Shape);
+        this._rateRand.reset(seed, ParticleRandomSubSeeds.EmissionRate);
     };
     /** @internal */ _proto._resyncCursors = function _resyncCursors(playTime) {
         this._frameRateTime = playTime;
@@ -35524,24 +35551,24 @@ __decorate([
         (_this__shape = this._shape) == null ? void 0 : _this__shape._unRegisterOnValueChanged(this._generator._renderer._onGeneratorParamsChanged);
     };
     _proto._emitByRateOverTime = function _emitByRateOverTime(playTime) {
-        var ratePerSeconds = this.rateOverTime.evaluate(undefined, undefined);
-        if (ratePerSeconds <= 0) {
-            this._frameRateTime = playTime;
-            return;
-        }
-        var generator = this._generator;
-        var emitInterval = 1.0 / ratePerSeconds;
+        var _this = this, rateOverTime = _this.rateOverTime, generator = _this._generator;
         var cumulativeTime = playTime - this._frameRateTime;
-        while(cumulativeTime >= emitInterval){
+        var ratePerSeconds = this._evaluateRate(rateOverTime, this._frameRateTime);
+        while(ratePerSeconds > 0){
+            var emitInterval = 1.0 / ratePerSeconds;
+            if (cumulativeTime < emitInterval) return;
             cumulativeTime -= emitInterval;
             this._frameRateTime += emitInterval;
             generator._emit(this._frameRateTime, 1);
+            ratePerSeconds = this._evaluateRate(rateOverTime, this._frameRateTime);
         }
+        this._frameRateTime = playTime;
     };
     _proto._emitByRateOverDistance = function _emitByRateOverDistance(lastPlayTime, playTime) {
-        var ratePerUnit = this.rateOverDistance.evaluate(undefined, undefined);
-        var generator = this._generator;
-        if (ratePerUnit <= 0) {
+        var _this = this, rateOverDistance = _this.rateOverDistance, generator = _this._generator;
+        // Distance rate is sampled once per frame at the current cycle position
+        var ratePerUnit = this._evaluateRate(rateOverDistance, playTime);
+        if (!(ratePerUnit > 0)) {
             this._hasLastEmitPosition = false;
             this._distanceAccumulator = 0;
             return;
@@ -35588,6 +35615,23 @@ __decorate([
         }
         lastPos.copyFrom(currentPos);
     };
+    _proto._evaluateRate = function _evaluateRate(rate, cursorTime) {
+        switch(rate.mode){
+            case ParticleCurveMode.Constant:
+                return rate.constant;
+            case ParticleCurveMode.Curve:
+                {
+                    var duration = this._generator.main.duration;
+                    return rate.evaluate(cursorTime % duration / duration, undefined);
+                }
+            default:
+                {
+                    // TwoConstants / TwoCurves: lerp between the two values with a per-sample random factor
+                    var duration1 = this._generator.main.duration;
+                    return rate.evaluate(cursorTime % duration1 / duration1, this._rateRand.random());
+                }
+        }
+    };
     _proto._emitByBurst = function _emitByBurst(lastPlayTime, playTime) {
         var main = this._generator.main;
         var duration = main.duration;
@@ -35662,11 +35706,6 @@ __decorate([
                         this._resyncCursors(this._generator._playTime);
                     }
                     this._enabled = value;
-                    if (value && this._shape) {
-                        this._generator._renderer.shaderData.enableMacro(EmissionModule._emissionShapeMacro);
-                    } else {
-                        this._generator._renderer.shaderData.disableMacro(EmissionModule._emissionShapeMacro);
-                    }
                 }
             }
         },
@@ -35683,12 +35722,7 @@ __decorate([
                     this._shape = value;
                     var renderer = this._generator._renderer;
                     lastShape == null ? void 0 : lastShape._unRegisterOnValueChanged(renderer._onGeneratorParamsChanged);
-                    if (value) {
-                        value._registerOnValueChanged(renderer._onGeneratorParamsChanged);
-                        this.enabled && renderer.shaderData.enableMacro(EmissionModule._emissionShapeMacro);
-                    } else {
-                        renderer.shaderData.disableMacro(EmissionModule._emissionShapeMacro);
-                    }
+                    value == null ? void 0 : value._registerOnValueChanged(renderer._onGeneratorParamsChanged);
                     renderer._onGeneratorParamsChanged();
                 }
             }
@@ -35718,6 +35752,12 @@ __decorate([
 __decorate([
     ignoreClone
 ], EmissionModule.prototype, "_shapeRand", void 0);
+__decorate([
+    ignoreClone
+], EmissionModule.prototype, "_shapeMacro", void 0);
+__decorate([
+    ignoreClone
+], EmissionModule.prototype, "_rateRand", void 0);
 __decorate([
     ignoreClone
 ], EmissionModule.prototype, "_distanceAccumulator", void 0);
@@ -37840,6 +37880,9 @@ __decorate([
         vertexBufferBindings.length = 0;
         if (renderer.renderMode === ParticleRenderMode.Mesh) {
             var mesh = renderer.mesh;
+            if (!mesh) {
+                return;
+            }
             var positionElement = mesh.getVertexElement(VertexAttribute.Position);
             var colorElement = mesh.getVertexElement(VertexAttribute.Color);
             var uvElement = mesh.getVertexElement(VertexAttribute.UV);
@@ -37973,6 +38016,7 @@ __decorate([
    * @internal
    */ _proto._updateShaderData = function _updateShaderData(shaderData) {
         this.main._updateShaderData(shaderData);
+        this.emission._updateShaderData(shaderData);
         this.velocityOverLifetime._updateShaderData(shaderData);
         this.forceOverLifetime._updateShaderData(shaderData);
         this.limitVelocityOverLifetime._updateShaderData(shaderData);
@@ -38652,6 +38696,9 @@ __decorate([
 __decorate([
     deepClone
 ], ParticleGenerator.prototype, "customData", void 0);
+__decorate([
+    ignoreClone
+], ParticleGenerator.prototype, "_currentParticleCount", void 0);
 __decorate([
     ignoreClone
 ], ParticleGenerator.prototype, "_playTime", void 0);
@@ -40969,6 +41016,7 @@ exports.DynamicCollider = DynamicCollider;
 exports.DynamicColliderConstraints = DynamicColliderConstraints;
 exports.EmissionModule = EmissionModule;
 exports.Engine = Engine;
+exports.EngineEventType = EngineEventType;
 exports.EngineObject = EngineObject;
 exports.Entity = Entity;
 exports.EntityModifyFlags = EntityModifyFlags;