@galacean/effects-core 2.0.0-alpha.23 → 2.0.0-alpha.25

package/dist/camera.d.ts

@@ -61,7 +61,7 @@ export declare class Camera {
     /**
      * 编辑器用于缩放画布
      */
-    private fovScaleRatio;
+    private viewportMatrix;
     private options;
     private viewMatrix;
     private projectionMatrix;
@@ -118,8 +118,8 @@ export declare class Camera {
      */
     set rotation(value: Euler);
     get rotation(): Euler;
-    setFovScaleRatio(value: number): void;
-    getFovScaleRatio(): number;
+    setViewportMatrix(matrix: Matrix4): void;
+    getViewportMatrix(): Matrix4;
     /**
      * 获取相机的视图变换矩阵
      * @return

package/dist/composition.d.ts

@@ -13,6 +13,7 @@ import type { Texture } from './texture';
 import type { Disposable, LostHandler } from './utils';
 import type { VFXItemProps } from './vfx-item';
 import { VFXItem } from './vfx-item';
+import { type Matrix4 } from '@galacean/effects-math/es/core';
 export interface CompositionStatistic {
     loadTime: number;
     loadStart: number;
@@ -225,8 +226,8 @@ export declare class Composition implements Disposable, LostHandler {
      * 获取销毁状态
      */
     get isDestroyed(): boolean;
-    set editorScaleRatio(value: number);
-    get editorScaleRatio(): number;
+    set viewportMatrix(matrix: Matrix4);
+    get viewportMatrix(): Matrix4;
     /**
      * 获取合成的时长
      */

package/dist/index.js

@@ -3,7 +3,7 @@
  * Description: Galacean Effects runtime core for the web
  * Author: Ant Group CO., Ltd.
  * Contributors: 燃然,飂兮,十弦,云垣,茂安,意绮
- * Version: v2.0.0-alpha.23
+ * Version: v2.0.0-alpha.25
  */
 
 'use strict';
@@ -8875,6 +8875,7 @@ exports.MaterialRenderType = void 0;
         var _this;
         _this = EffectsObject.call(this, engine) || this;
         _this.stringTags = {};
+        _this.enabledMacros = {};
         _this.destroyed = false;
         _this.initialized = false;
         if (props) {
@@ -16391,6 +16392,9 @@ exports.ParticleSystem = /*#__PURE__*/ function(Component) {
         return _this;
     }
     var _proto = ParticleSystem.prototype;
+    _proto.isFrozen = function isFrozen() {
+        return this.frozen;
+    };
     _proto.initEmitterTransform = function initEmitterTransform() {
         var position = this.item.transform.position.clone();
         var rotation = this.item.transform.rotation.clone();
@@ -16524,6 +16528,7 @@ exports.ParticleSystem = /*#__PURE__*/ function(Component) {
             return b.reset();
         });
         this.frozen = false;
+        this.ended = false;
     };
     _proto.onUpdate = function onUpdate(delta) {
         var _this = this;
@@ -17307,10 +17312,7 @@ function randomArrItem(arr, keepArr) {
  */ var ParticleBehaviourPlayable = /*#__PURE__*/ function(Playable) {
     _inherits(ParticleBehaviourPlayable, Playable);
     function ParticleBehaviourPlayable() {
-        var _this;
-        _this = Playable.apply(this, arguments) || this;
-        _this.lastTime = 0;
-        return _this;
+        return Playable.apply(this, arguments);
     }
     var _proto = ParticleBehaviourPlayable.prototype;
     _proto.start = function start(context) {
@@ -17335,13 +17337,11 @@ function randomArrItem(arr, keepArr) {
             // particleSystem.setParentTransform(parentItem.transform);
             particleSystem.setVisible(true);
             var deltaTime = context.deltaTime;
-            // 直接用 this.lastTime - this.time 获取 deltaTime 会有精度问题
-            if (this.lastTime === this.time) {
-                deltaTime = 0;
+            if (this.time < particleSystem.item.duration && particleSystem.isFrozen()) {
+                particleSystem.reset();
             }
             particleSystem.onUpdate(deltaTime);
         }
-        this.lastTime = this.time;
     };
     return ParticleBehaviourPlayable;
 }(Playable);
@@ -18721,9 +18721,9 @@ var AnimationClipPlayable = /*#__PURE__*/ function(Playable) {
         var localTime = time - this.start;
         var duration = this.duration;
         if (localTime - duration > 0.001) {
-            if (this.endBehaviour === ItemEndBehavior.loop) {
+            if (this.endBehavior === ItemEndBehavior.loop) {
                 localTime = localTime % duration;
-            } else if (this.endBehaviour === ItemEndBehavior.freeze) {
+            } else if (this.endBehavior === ItemEndBehavior.freeze) {
                 localTime = Math.min(duration, localTime);
             }
         }
@@ -18848,9 +18848,9 @@ var RuntimeClip = /*#__PURE__*/ function() {
         var weight = 1.0;
         var ended = false;
         var started = false;
-        var boundItem = this.track.binding;
-        if (localTime > clip.start + clip.duration + 0.001 && clip.endBehaviour === ItemEndBehavior.destroy) {
-            if (exports.VFXItem.isParticle(boundItem) && this.particleSystem && !this.particleSystem.destroyed) {
+        var boundObject = this.track.binding;
+        if (localTime > clip.start + clip.duration + 0.001 && clip.endBehavior === ItemEndBehavior.destroy) {
+            if (_instanceof1(boundObject, exports.VFXItem) && exports.VFXItem.isParticle(boundObject) && this.particleSystem && !this.particleSystem.destroyed) {
                 weight = 1.0;
             } else {
                 weight = 0.0;
@@ -18867,25 +18867,22 @@ var RuntimeClip = /*#__PURE__*/ function() {
         }
         this.parentMixer.setInputWeight(this.playable, weight);
         // 判断动画是否结束
-        if (ended && !boundItem.ended) {
-            boundItem.ended = true;
-            boundItem.onEnd();
-        }
-        if (ended && this.playable.getPlayState() === PlayState.Playing) {
-            this.playable.pause();
-            this.onClipEnd();
+        if (ended) {
+            if (_instanceof1(boundObject, exports.VFXItem) && !boundObject.ended) {
+                boundObject.ended = true;
+                boundObject.onEnd();
+                if (!boundObject.compositionReusable && !boundObject.reusable) {
+                    boundObject.dispose();
+                    this.playable.dispose();
+                }
+            }
+            if (this.playable.getPlayState() === PlayState.Playing) {
+                this.playable.pause();
+            }
         }
         var clipTime = clip.toLocalTime(localTime);
         this.playable.setTime(clipTime);
     };
-    _proto.onClipEnd = function onClipEnd() {
-        var boundItem = this.track.binding;
-        if (!boundItem.compositionReusable && !boundItem.reusable) {
-            boundItem.dispose();
-            this.playable.dispose();
-            return;
-        }
-    };
     _create_class(RuntimeClip, [
         {
             key: "enable",
@@ -18917,7 +18914,7 @@ exports.ObjectBindingTrack = /*#__PURE__*/ function(TrackAsset1) {
             var particleClip = particleTrack.createClip(ParticleBehaviourPlayableAsset);
             particleClip.start = boundItem.start;
             particleClip.duration = boundItem.duration;
-            particleClip.endBehaviour = boundItem.endBehavior;
+            particleClip.endBehavior = boundItem.endBehavior;
         }
     };
     return ObjectBindingTrack;
@@ -19218,7 +19215,7 @@ function compareTracks(a, b) {
                     if (!props) {
                         throw new Error("Referenced precomposition with Id: " + refId + " does not exist.");
                     }
-                    // endBehaviour 类型需优化
+                    // endBehavior 类型需优化
                     props.content = itemData.content;
                     item = assetLoader.loadGUID(itemData.id);
                     item.composition = this.item.composition;
@@ -22230,7 +22227,7 @@ function getStandardCameraContent(model) {
  */ function version30Migration(json) {
     var _loop = function() {
         var composition = _step1.value;
-        // composition 的 endbehaviour 兼容
+        // composition 的 endBehavior 兼容
         if (composition.endBehavior === CompositionEndBehavior.pause_destroy || composition.endBehavior === CompositionEndBehavior.pause) {
             composition.endBehavior = END_BEHAVIOR_FREEZE;
         }
@@ -22616,7 +22613,7 @@ function convertTimelineAsset(composition, guidToItemMap, jsonScene) {
                 {
                     start: item.delay,
                     duration: item.duration,
-                    endBehaviour: item.endBehavior,
+                    endBehavior: item.endBehavior,
                     asset: {
                         id: newActivationPlayableAsset.id
                     }
@@ -22647,7 +22644,7 @@ function convertTimelineAsset(composition, guidToItemMap, jsonScene) {
                     {
                         start: item.delay,
                         duration: item.duration,
-                        endBehaviour: item.endBehavior,
+                        endBehavior: item.endBehavior,
                         asset: {
                             id: newTransformPlayableAssetData.id
                         }
@@ -22675,7 +22672,7 @@ function convertTimelineAsset(composition, guidToItemMap, jsonScene) {
                     {
                         start: item.delay,
                         duration: item.duration,
-                        endBehaviour: item.endBehavior,
+                        endBehavior: item.endBehavior,
                         asset: {
                             id: newSpriteColorPlayableAssetData.id
                         }
@@ -22701,7 +22698,7 @@ function convertTimelineAsset(composition, guidToItemMap, jsonScene) {
                     {
                         start: item.delay,
                         duration: item.duration,
-                        endBehaviour: item.endBehavior,
+                        endBehavior: item.endBehavior,
                         asset: {
                             id: newSubCompositionPlayableAssetData.id
                         }
@@ -24043,7 +24040,7 @@ var tmpScale = new Vector3(1, 1, 1);
     function Camera(name, options) {
         if (options === void 0) options = {};
         this.name = name;
-        this.fovScaleRatio = 1.0;
+        this.viewportMatrix = Matrix4.fromIdentity();
         this.viewMatrix = Matrix4.fromIdentity();
         this.projectionMatrix = Matrix4.fromIdentity();
         this.viewProjectionMatrix = Matrix4.fromIdentity();
@@ -24071,12 +24068,12 @@ var tmpScale = new Vector3(1, 1, 1);
         this.updateMatrix();
     }
     var _proto = Camera.prototype;
-    _proto.setFovScaleRatio = function setFovScaleRatio(value) {
-        this.fovScaleRatio = value;
+    _proto.setViewportMatrix = function setViewportMatrix(matrix) {
+        this.viewportMatrix = matrix.clone();
         this.dirty = true;
     };
-    _proto.getFovScaleRatio = function getFovScaleRatio() {
-        return this.fovScaleRatio;
+    _proto.getViewportMatrix = function getViewportMatrix() {
+        return this.viewportMatrix;
     };
     /**
    * 获取相机的视图变换矩阵
@@ -24198,7 +24195,8 @@ var tmpScale = new Vector3(1, 1, 1);
    */ _proto.updateMatrix = function updateMatrix() {
         if (this.dirty) {
             var _this_options = this.options, fov = _this_options.fov, aspect = _this_options.aspect, near = _this_options.near, far = _this_options.far, clipMode = _this_options.clipMode, position = _this_options.position;
-            this.projectionMatrix.perspective(fov * DEG2RAD * this.fovScaleRatio, aspect, near, far, clipMode === CameraClipMode.portrait);
+            this.projectionMatrix.perspective(fov * DEG2RAD, aspect, near, far, clipMode === CameraClipMode.portrait);
+            this.projectionMatrix.premultiply(this.viewportMatrix);
             this.inverseViewMatrix.compose(position, this.getQuat(), tmpScale);
             this.viewMatrix.copyFrom(this.inverseViewMatrix).invert();
             this.viewProjectionMatrix.multiplyMatrices(this.projectionMatrix, this.viewMatrix);
@@ -25313,12 +25311,12 @@ var listOrder = 0;
             }
         },
         {
-            key: "editorScaleRatio",
+            key: "viewportMatrix",
             get: function get() {
-                return this.camera.getFovScaleRatio();
+                return this.camera.getViewportMatrix();
             },
-            set: function set(value) {
-                this.camera.setFovScaleRatio(value);
+            set: function set(matrix) {
+                this.camera.setViewportMatrix(matrix);
             }
         }
     ]);
@@ -25717,7 +25715,7 @@ registerPlugin("sprite", SpriteLoader, exports.VFXItem, true);
 registerPlugin("particle", ParticleLoader, exports.VFXItem, true);
 registerPlugin("cal", CalculateLoader, exports.VFXItem, true);
 registerPlugin("interact", InteractLoader, exports.VFXItem, true);
-var version = "2.0.0-alpha.23";
+var version = "2.0.0-alpha.25";
 logger.info("Core version: " + version + ".");
 
 exports.AbstractPlugin = AbstractPlugin;