@galacean/effects-core 2.0.0-alpha.24 → 2.0.0-alpha.26

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/decorators.d.ts

@@ -2,4 +2,4 @@ import type { Constructor } from './utils';
 export declare const effectsClassStore: Record<string, any>;
 export declare function effectsClass(className: string): (target: Object, context?: unknown) => void;
 export declare function serialize(type?: Constructor, sourceName?: string): (target: Object, propertyKey: string | symbol) => void;
-export declare function getMergedStore(target: Object): Record<string, any>;
+export declare function getMergedStore(target: Object): Record<string, any> | undefined;

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.24
+ * Version: v2.0.0-alpha.26
  */
 
 'use strict';
@@ -4493,8 +4493,8 @@ var index$1 = /*#__PURE__*/Object.freeze({
     BuiltinObjectGUID: BuiltinObjectGUID
 });
 
-var decoratorInitialStore = {};
-var mergedStore = {};
+var decoratorInitialStore = new Map();
+var mergedStore = new Map();
 var effectsClassStore = {};
 function effectsClass(className) {
     return function(target, context) {
@@ -4509,22 +4509,22 @@ function serialize(type, sourceName) {
     return generateSerializableMember(type, sourceName); // value member
 }
 function getMergedStore(target) {
-    var classKey = target.constructor.name;
-    if (mergedStore[classKey]) {
-        return mergedStore[classKey];
+    var classKey = target.constructor;
+    if (mergedStore.get(classKey)) {
+        return mergedStore.get(classKey);
     }
-    mergedStore[classKey] = {};
-    var store = mergedStore[classKey];
+    var store = {};
+    mergedStore.set(classKey, store);
     var currentTarget = target;
     var currentKey = classKey;
     while(currentKey){
-        var initialStore = decoratorInitialStore[currentKey];
+        var initialStore = decoratorInitialStore.get(currentKey);
         for(var property in initialStore){
             store[property] = initialStore[property];
         }
         var parent = Object.getPrototypeOf(currentTarget);
-        currentKey = Object.getPrototypeOf(parent).constructor.name;
-        if (currentKey === "Object") {
+        currentKey = Object.getPrototypeOf(parent).constructor;
+        if (currentKey === Object) {
             break;
         }
         currentTarget = parent;
@@ -4534,6 +4534,9 @@ function getMergedStore(target) {
 function generateSerializableMember(type, sourceName) {
     return function(target, propertyKey) {
         var classStore = getDirectStore(target);
+        if (!classStore) {
+            return;
+        }
         if (!classStore[propertyKey]) {
             classStore[propertyKey] = {
                 type: type,
@@ -4543,11 +4546,11 @@ function generateSerializableMember(type, sourceName) {
     };
 }
 function getDirectStore(target) {
-    var classKey = target.constructor.name;
-    if (!decoratorInitialStore[classKey]) {
-        decoratorInitialStore[classKey] = {};
+    var classKey = target.constructor;
+    if (!decoratorInitialStore.get(classKey)) {
+        decoratorInitialStore.set(classKey, {});
     }
-    return decoratorInitialStore[classKey];
+    return decoratorInitialStore.get(classKey);
 }
 
 /**
@@ -8875,6 +8878,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) {
@@ -18720,9 +18724,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);
             }
         }
@@ -18847,9 +18851,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;
@@ -18866,25 +18870,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",
@@ -18916,7 +18917,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;
@@ -19217,7 +19218,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;
@@ -19671,7 +19672,7 @@ var TextComponentBase = /*#__PURE__*/ function() {
     _proto.updateWithOptions = function updateWithOptions(options) {
         this.textStyle = new TextStyle(options);
         this.textLayout = new TextLayout(options);
-        this.text = options.text;
+        this.text = options.text.toString();
         this.lineCount = this.getLineCount(options.text, true);
     };
     _proto.getLineCount = function getLineCount(text, init) {
@@ -19742,7 +19743,7 @@ var TextComponentBase = /*#__PURE__*/ function() {
         if (this.text === value) {
             return;
         }
-        this.text = value;
+        this.text = value.toString();
         this.lineCount = this.getLineCount(value, false);
         this.isDirty = true;
     };
@@ -20851,29 +20852,31 @@ var SerializationHelper = /*#__PURE__*/ function() {
         effectsObject.toData();
         res[effectsObject.getInstanceId()] = effectsObject;
         var serializedProperties = getMergedStore(effectsObject);
-        for(var _iterator = _create_for_of_iterator_helper_loose(Object.keys(serializedProperties)), _step; !(_step = _iterator()).done;){
-            var key = _step.value;
-            // TODO 待移除，序列化属性通过 effectsObject 对象直接获取
-            var value = effectsObject.taggedProperties[key];
-            if (value === undefined) {
-                value = effectsObject[key];
-            }
-            if (EffectsObject.is(value)) {
-                SerializationHelper.collectSerializableObject(value, res);
-            } else if (isArray(value)) {
-                for(var _iterator1 = _create_for_of_iterator_helper_loose(value), _step1; !(_step1 = _iterator1()).done;){
-                    var arrayValue = _step1.value;
-                    if (EffectsObject.is(arrayValue)) {
-                        SerializationHelper.collectSerializableObject(arrayValue, res);
-                    }
+        if (serializedProperties) {
+            for(var _iterator = _create_for_of_iterator_helper_loose(Object.keys(serializedProperties)), _step; !(_step = _iterator()).done;){
+                var key = _step.value;
+                // TODO 待移除，序列化属性通过 effectsObject 对象直接获取
+                var value = effectsObject.taggedProperties[key];
+                if (value === undefined) {
+                    value = effectsObject[key];
                 }
-            } else if (isObject(value)) {
-                // 非 EffectsObject 对象只递归一层
-                for(var _iterator2 = _create_for_of_iterator_helper_loose(Object.keys(value)), _step2; !(_step2 = _iterator2()).done;){
-                    var objectKey = _step2.value;
-                    var objectValue = value[objectKey];
-                    if (EffectsObject.is(objectValue)) {
-                        SerializationHelper.collectSerializableObject(objectValue, res);
+                if (EffectsObject.is(value)) {
+                    SerializationHelper.collectSerializableObject(value, res);
+                } else if (isArray(value)) {
+                    for(var _iterator1 = _create_for_of_iterator_helper_loose(value), _step1; !(_step1 = _iterator1()).done;){
+                        var arrayValue = _step1.value;
+                        if (EffectsObject.is(arrayValue)) {
+                            SerializationHelper.collectSerializableObject(arrayValue, res);
+                        }
+                    }
+                } else if (isObject(value)) {
+                    // 非 EffectsObject 对象只递归一层
+                    for(var _iterator2 = _create_for_of_iterator_helper_loose(Object.keys(value)), _step2; !(_step2 = _iterator2()).done;){
+                        var objectKey = _step2.value;
+                        var objectValue = value[objectKey];
+                        if (EffectsObject.is(objectValue)) {
+                            SerializationHelper.collectSerializableObject(objectValue, res);
+                        }
                     }
                 }
             }
@@ -20904,27 +20907,29 @@ var SerializationHelper = /*#__PURE__*/ function() {
             serializedData = {};
         }
         var serializedProperties = getMergedStore(effectsObject);
-        for(var _iterator = _create_for_of_iterator_helper_loose(Object.keys(serializedProperties)), _step; !(_step = _iterator()).done;){
-            var key = _step.value;
-            var value = effectsObject[key];
-            if (typeof value === "number" || typeof value === "string" || typeof value === "boolean" || SerializationHelper.checkTypedArray(value)) {
-                // TODO json 数据避免传 typedArray
-                serializedData[key] = value;
-            } else if (isArray(value)) {
-                if (!serializedData[key]) {
-                    serializedData[key] = [];
-                }
-                SerializationHelper.serializeArrayProperty(value, serializedData[key], 0);
-            } else if (EffectsObject.is(value)) {
-                // TODO 处理 EffectsObject 递归序列化
-                serializedData[key] = {
-                    id: value.getInstanceId()
-                };
-            } else if (isObject(value)) {
-                if (!serializedData[key]) {
-                    serializedData[key] = {};
+        if (serializedProperties) {
+            for(var _iterator = _create_for_of_iterator_helper_loose(Object.keys(serializedProperties)), _step; !(_step = _iterator()).done;){
+                var key = _step.value;
+                var value = effectsObject[key];
+                if (typeof value === "number" || typeof value === "string" || typeof value === "boolean" || SerializationHelper.checkTypedArray(value)) {
+                    // TODO json 数据避免传 typedArray
+                    serializedData[key] = value;
+                } else if (isArray(value)) {
+                    if (!serializedData[key]) {
+                        serializedData[key] = [];
+                    }
+                    SerializationHelper.serializeArrayProperty(value, serializedData[key], 0);
+                } else if (EffectsObject.is(value)) {
+                    // TODO 处理 EffectsObject 递归序列化
+                    serializedData[key] = {
+                        id: value.getInstanceId()
+                    };
+                } else if (isObject(value)) {
+                    if (!serializedData[key]) {
+                        serializedData[key] = {};
+                    }
+                    SerializationHelper.serializeObjectProperty(value, serializedData[key], 0);
                 }
-                SerializationHelper.serializeObjectProperty(value, serializedData[key], 0);
             }
         }
         // TODO 待移除 tagggedProperties 为没有装饰器的临时方案
@@ -20959,22 +20964,24 @@ var SerializationHelper = /*#__PURE__*/ function() {
         var engine = effectsObject.engine;
         for(var _iterator = _create_for_of_iterator_helper_loose(Object.keys(serializedData)), _step; !(_step = _iterator()).done;){
             var key = _step.value;
-            if (serializedProperties[key]) {
+            if (serializedProperties && serializedProperties[key]) {
                 continue;
             }
             var value = serializedData[key];
             taggedProperties[key] = SerializationHelper.deserializeProperty(value, engine, 0);
         }
-        for(var _iterator1 = _create_for_of_iterator_helper_loose(Object.keys(serializedProperties)), _step1; !(_step1 = _iterator1()).done;){
-            var key1 = _step1.value;
-            var value1 = serializedData[key1];
-            if (value1 === undefined) {
-                continue;
+        if (serializedProperties) {
+            for(var _iterator1 = _create_for_of_iterator_helper_loose(Object.keys(serializedProperties)), _step1; !(_step1 = _iterator1()).done;){
+                var key1 = _step1.value;
+                var value1 = serializedData[key1];
+                if (value1 === undefined) {
+                    continue;
+                }
+                var propertyType = serializedProperties[key1].type;
+                // FIXME: taggedProperties 为 readonly，这里存在强制赋值
+                // @ts-expect-error
+                effectsObject[key1] = SerializationHelper.deserializeProperty(value1, engine, 0, propertyType);
             }
-            var propertyType = serializedProperties[key1].type;
-            // FIXME: taggedProperties 为 readonly，这里存在强制赋值
-            // @ts-expect-error
-            effectsObject[key1] = SerializationHelper.deserializeProperty(value1, engine, 0, propertyType);
         }
         effectsObject.fromData(taggedProperties);
     };
@@ -20995,7 +21002,7 @@ var SerializationHelper = /*#__PURE__*/ function() {
                             4
                         ];
                         key = _step.value;
-                        if (serializedProperties[key]) {
+                        if (serializedProperties && serializedProperties[key]) {
                             return [
                                 3,
                                 3
@@ -21015,6 +21022,10 @@ var SerializationHelper = /*#__PURE__*/ function() {
                             1
                         ];
                     case 4:
+                        if (!serializedProperties) return [
+                            3,
+                            8
+                        ];
                         _iterator1 = _create_for_of_iterator_helper_loose(Object.keys(serializedProperties));
                         _state.label = 5;
                     case 5:
@@ -22229,7 +22240,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;
         }
@@ -22615,7 +22626,7 @@ function convertTimelineAsset(composition, guidToItemMap, jsonScene) {
                 {
                     start: item.delay,
                     duration: item.duration,
-                    endBehaviour: item.endBehavior,
+                    endBehavior: item.endBehavior,
                     asset: {
                         id: newActivationPlayableAsset.id
                     }
@@ -22646,7 +22657,7 @@ function convertTimelineAsset(composition, guidToItemMap, jsonScene) {
                     {
                         start: item.delay,
                         duration: item.duration,
-                        endBehaviour: item.endBehavior,
+                        endBehavior: item.endBehavior,
                         asset: {
                             id: newTransformPlayableAssetData.id
                         }
@@ -22674,7 +22685,7 @@ function convertTimelineAsset(composition, guidToItemMap, jsonScene) {
                     {
                         start: item.delay,
                         duration: item.duration,
-                        endBehaviour: item.endBehavior,
+                        endBehavior: item.endBehavior,
                         asset: {
                             id: newSpriteColorPlayableAssetData.id
                         }
@@ -22700,7 +22711,7 @@ function convertTimelineAsset(composition, guidToItemMap, jsonScene) {
                     {
                         start: item.delay,
                         duration: item.duration,
-                        endBehaviour: item.endBehavior,
+                        endBehavior: item.endBehavior,
                         asset: {
                             id: newSubCompositionPlayableAssetData.id
                         }
@@ -24042,7 +24053,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();
@@ -24070,12 +24081,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;
     };
     /**
    * 获取相机的视图变换矩阵
@@ -24134,11 +24145,13 @@ var tmpScale = new Vector3(1, 1, 1);
    * 获取归一化坐标和 3D 世界坐标的换算比例
    * @param z - 当前的位置 z
    */ _proto.getInverseVPRatio = function getInverseVPRatio(z) {
-        var pos = new Vector3(0, 0, z);
+        var pos = new Vector3(this.position.x, this.position.y, z);
         var mat = this.getViewProjectionMatrix();
         var inverseVP = this.getInverseViewProjectionMatrix();
         var _mat_projectPoint = mat.projectPoint(pos), nz = _mat_projectPoint.z;
-        return inverseVP.projectPoint(new Vector3(1, 1, nz));
+        var _inverseVP_projectPoint = inverseVP.projectPoint(new Vector3(1, 1, nz)), xMax = _inverseVP_projectPoint.x, yMax = _inverseVP_projectPoint.y;
+        var _inverseVP_projectPoint1 = inverseVP.projectPoint(new Vector3(-1, -1, nz)), xMin = _inverseVP_projectPoint1.x, yMin = _inverseVP_projectPoint1.y;
+        return new Vector3((xMax - xMin) / 2, (yMax - yMin) / 2, 0);
     };
     /**
    * 设置相机的旋转四元数
@@ -24197,7 +24210,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);
@@ -24790,6 +24804,7 @@ var listOrder = 0;
         // this.extraCamera?.getComponent(TimelineComponent)?.update(deltaTime);
         this.updateCamera();
         if (this.shouldDispose()) {
+            this.onEnd == null ? void 0 : this.onEnd.call(this, this);
             this.dispose();
         } else {
             if (!skipRender) {
@@ -25312,12 +25327,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);
             }
         }
     ]);
@@ -25716,7 +25731,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.24";
+var version = "2.0.0-alpha.26";
 logger.info("Core version: " + version + ".");
 
 exports.AbstractPlugin = AbstractPlugin;