@galacean/effects-core 2.0.0-beta.0 → 2.0.0-beta.2

package/dist/camera.d.ts

@@ -159,7 +159,7 @@ export declare class Camera {
      */
     getModelViewProjection(out: Matrix4, model: Matrix4): Matrix4;
     /**
-     * 获取归一化坐标和 3D 世界坐标的换算比例
+     * 获取归一化坐标和 3D 世界坐标的换算比例，使用 ViewProjection 矩阵
      * @param z - 当前的位置 z
      */
     getInverseVPRatio(z: number): Vector3;

package/dist/components/component.d.ts

@@ -24,6 +24,8 @@ export declare abstract class Component extends EffectsObject {
  * @internal
  */
 export declare abstract class Behaviour extends Component {
+    isAwakeCalled: boolean;
+    isStartCalled: boolean;
     private _enabled;
     /**
      * 组件是否可以更新，true 更新，false 不更新
@@ -31,7 +33,10 @@ export declare abstract class Behaviour extends Component {
     get isActiveAndEnabled(): boolean;
     get enabled(): boolean;
     set enabled(value: boolean);
-    isStartCalled: boolean;
+    /**
+     * 生命周期函数，初始化后调用，生命周期内只调用一次
+     */
+    awake(): void;
     /**
      * 在每次设置 enabled 为 true 时触发
      */

package/dist/composition.d.ts

@@ -296,6 +296,7 @@ export declare class Composition extends EventEmitter<CompositionEvent<Compositi
     private toLocalTime;
     private shouldDispose;
     private getUpdateTime;
+    private callAwake;
     private callStart;
     private callUpdate;
     private callLateUpdate;

package/dist/effects-object.d.ts

@@ -1,12 +1,10 @@
 import type * as spec from '@galacean/effects-specification';
 import type { Engine } from './engine';
-import type { ItemEvent } from './events';
-import { EventEmitter } from './events';
 /**
  * @since 2.0.0
  * @internal
  */
-export declare abstract class EffectsObject extends EventEmitter<ItemEvent> {
+export declare abstract class EffectsObject {
     engine: Engine;
     static is(obj: unknown): obj is EffectsObject;
     protected guid: string;

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-beta.0
+ * Version: v2.0.0-beta.2
  */
 
 'use strict';
@@ -4567,97 +4567,15 @@ function getDirectStore(target) {
     return decoratorInitialStore.get(classKey);
 }
 
-function _assert_this_initialized(self) {
-    if (self === void 0) throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
-    return self;
-}
-
-var EventEmitter = function EventEmitter() {
-    var _this = this;
-    var _this1 = this;
-    this.listeners = {};
-    /**
-   * 移除事件监听器
-   * @param eventName - 事件名称
-   * @param listener - 事件监听器
-   * @returns
-   */ this.off = function(eventName, listener) {
-        if (!_this.listeners[eventName]) {
-            return;
-        }
-        _this.listeners[eventName] = _this.listeners[eventName].filter(function(param) {
-            var l = param.listener;
-            return l !== listener;
-        });
-    };
-    /**
-   * 监听事件
-   * @param eventName - 事件名称
-   * @param listener - 事件监听器
-   * @param options - 事件监听器选项
-   * @returns
-   */ this.on = function(eventName, listener, options) {
-        _this.listeners[eventName] = _this.listeners[eventName] || [];
-        _this.listeners[eventName].push({
-            listener: listener,
-            options: options
-        });
-        return function() {
-            return _this.off(eventName, listener);
-        };
-    };
-    /**
-   * 一次性监听事件
-   * @param eventName - 事件名称
-   * @param listener - 事件监听器
-   */ this.once = function(eventName, listener) {
-        _this.on(eventName, listener, {
-            once: true
-        });
-    };
-    /**
-   * 触发事件
-   * @param eventName - 事件名称
-   * @param args - 事件参数
-   */ this.emit = function(eventName) {
-        for(var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++){
-            args[_key - 1] = arguments[_key];
-        }
-        var _this_listeners_eventName;
-        (_this_listeners_eventName = _this1.listeners[eventName]) == null ? void 0 : _this_listeners_eventName.forEach(function(param) {
-            var listener = param.listener, options = param.options;
-            listener.apply(void 0, [].concat(args));
-            if (options == null ? void 0 : options.once) {
-                _this1.off(eventName, listener);
-            }
-        });
-    };
-    /**
-   * 获取事件名称对应的所有监听器
-   * @param eventName - 事件名称
-   * @returns - 返回事件名称对应的所有监听器
-   */ this.getListeners = function(eventName) {
-        var _this_listeners_eventName;
-        return ((_this_listeners_eventName = _this.listeners[eventName]) == null ? void 0 : _this_listeners_eventName.map(function(param) {
-            var listener = param.listener;
-            return listener;
-        })) || [];
-    };
-};
-
 /**
  * @since 2.0.0
  * @internal
- */ var EffectsObject = /*#__PURE__*/ function(EventEmitter) {
-    _inherits(EffectsObject, EventEmitter);
+ */ var EffectsObject = /*#__PURE__*/ function() {
     function EffectsObject(engine) {
-        var _this;
-        _this = EventEmitter.call(this) || this;
-        _this.engine = engine;
-        _this.guid = generateGUID();
-        _this.taggedProperties = {};
-        _this.engine.addInstance(_assert_this_initialized(_this));
-        return _this;
+        this.engine = engine;
+        this.guid = generateGUID();
+        this.taggedProperties = {};
+        this.engine.addInstance(this);
     }
     var _proto = EffectsObject.prototype;
     _proto.getInstanceId = function getInstanceId() {
@@ -4683,7 +4601,7 @@ var EventEmitter = function EventEmitter() {
         return _instanceof1(obj, EffectsObject) && "guid" in obj;
     };
     return EffectsObject;
-}(EventEmitter);
+}();
 
 /**
  * @since 2.0.0
@@ -4728,17 +4646,17 @@ var EventEmitter = function EventEmitter() {
     function Behaviour() {
         var _this;
         _this = Component.apply(this, arguments) || this;
-        _this._enabled = true;
+        _this.isAwakeCalled = false;
         _this.isStartCalled = false;
+        _this._enabled = true;
         return _this;
     }
     var _proto = Behaviour.prototype;
-    // /**
-    //  * 生命周期函数，初始化后调用，生命周期内只调用一次
-    //  */
-    // awake () {
-    //   // OVERRIDE
-    // }
+    /**
+   * 生命周期函数，初始化后调用，生命周期内只调用一次
+   */ _proto.awake = function awake() {
+    // OVERRIDE
+    };
     /**
    * 在每次设置 enabled 为 true 时触发
    */ _proto.onEnable = function onEnable() {
@@ -4761,6 +4679,10 @@ var EventEmitter = function EventEmitter() {
     };
     _proto.onAttached = function onAttached() {
         this.item.itemBehaviours.push(this);
+        if (!this.isAwakeCalled) {
+            this.awake();
+            this.isAwakeCalled = true;
+        }
     };
     _proto.dispose = function dispose() {
         if (this.item) {
@@ -4785,7 +4707,9 @@ var EventEmitter = function EventEmitter() {
             set: function set(value) {
                 this._enabled = value;
                 if (value) {
-                    this.onEnable();
+                    if (this.isActiveAndEnabled) {
+                        this.onEnable();
+                    }
                     if (!this.isStartCalled) {
                         this.start();
                         this.isStartCalled = true;
@@ -13631,6 +13555,11 @@ var SpriteLoader = /*#__PURE__*/ function(AbstractPlugin) {
     return SpriteLoader;
 }(AbstractPlugin);
 
+function _assert_this_initialized(self) {
+    if (self === void 0) throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
+    return self;
+}
+
 /**
  * 动画图，负责更新所有的动画节点
  * @since 2.0.0
@@ -17252,12 +17181,6 @@ exports.ParticleSystem = /*#__PURE__*/ function(Component) {
             area: area
         };
     };
-    _proto.onAttached = function onAttached() {
-        Component.prototype.onAttached.call(this);
-        this.renderer.item = this.item;
-        this.item.components.push(this.renderer);
-        this.item.rendererComponents.push(this.renderer);
-    };
     _proto.fromData = function fromData(data) {
         Component.prototype.fromData.call(this, data);
         var props = data;
@@ -20492,6 +20415,79 @@ exports.PostProcessVolume = __decorate([
     effectsClass("PostProcessVolume")
 ], exports.PostProcessVolume);
 
+var EventEmitter = function EventEmitter() {
+    var _this = this;
+    var _this1 = this;
+    this.listeners = {};
+    /**
+   * 移除事件监听器
+   * @param eventName - 事件名称
+   * @param listener - 事件监听器
+   * @returns
+   */ this.off = function(eventName, listener) {
+        if (!_this.listeners[eventName]) {
+            return;
+        }
+        _this.listeners[eventName] = _this.listeners[eventName].filter(function(param) {
+            var l = param.listener;
+            return l !== listener;
+        });
+    };
+    /**
+   * 监听事件
+   * @param eventName - 事件名称
+   * @param listener - 事件监听器
+   * @param options - 事件监听器选项
+   * @returns
+   */ this.on = function(eventName, listener, options) {
+        _this.listeners[eventName] = _this.listeners[eventName] || [];
+        _this.listeners[eventName].push({
+            listener: listener,
+            options: options
+        });
+        return function() {
+            return _this.off(eventName, listener);
+        };
+    };
+    /**
+   * 一次性监听事件
+   * @param eventName - 事件名称
+   * @param listener - 事件监听器
+   */ this.once = function(eventName, listener) {
+        _this.on(eventName, listener, {
+            once: true
+        });
+    };
+    /**
+   * 触发事件
+   * @param eventName - 事件名称
+   * @param args - 事件参数
+   */ this.emit = function(eventName) {
+        for(var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++){
+            args[_key - 1] = arguments[_key];
+        }
+        var _this_listeners_eventName;
+        (_this_listeners_eventName = _this1.listeners[eventName]) == null ? void 0 : _this_listeners_eventName.forEach(function(param) {
+            var listener = param.listener, options = param.options;
+            listener.apply(void 0, [].concat(args));
+            if (options == null ? void 0 : options.once) {
+                _this1.off(eventName, listener);
+            }
+        });
+    };
+    /**
+   * 获取事件名称对应的所有监听器
+   * @param eventName - 事件名称
+   * @returns - 返回事件名称对应的所有监听器
+   */ this.getListeners = function(eventName) {
+        var _this_listeners_eventName;
+        return ((_this_listeners_eventName = _this.listeners[eventName]) == null ? void 0 : _this_listeners_eventName.map(function(param) {
+            var listener = param.listener;
+            return listener;
+        })) || [];
+    };
+};
+
 exports.VFXItem = /*#__PURE__*/ function(EffectsObject) {
     _inherits(VFXItem, EffectsObject);
     function VFXItem(engine, props) {
@@ -20526,6 +20522,7 @@ exports.VFXItem = /*#__PURE__*/ function(EffectsObject) {
    * 元素动画的速度
    */ _this.speed = 1;
         _this.listIndex = 0;
+        _this.eventProcessor = new EventEmitter();
         _this.name = "VFXItem";
         _this.transform.name = _this.name;
         _this.transform.engine = engine;
@@ -20536,6 +20533,50 @@ exports.VFXItem = /*#__PURE__*/ function(EffectsObject) {
     }
     var _proto = VFXItem.prototype;
     /**
+   * 元素监听事件
+   * @param eventName - 事件名称
+   * @param listener - 事件监听器
+   * @param options - 事件监听器选项
+   * @returns
+   */ _proto.on = function on(eventName, listener, options) {
+        this.eventProcessor.on(eventName, listener, options);
+    };
+    /**
+   * 移除事件监听器
+   * @param eventName - 事件名称
+   * @param listener - 事件监听器
+   * @returns
+   */ _proto.off = function off(eventName, listener) {
+        this.eventProcessor.off(eventName, listener);
+    };
+    /**
+   * 一次性监听事件
+   * @param eventName - 事件名称
+   * @param listener - 事件监听器
+   */ _proto.once = function once(eventName, listener) {
+        this.eventProcessor.once(eventName, listener);
+    };
+    /**
+   * 触发事件
+   * @param eventName - 事件名称
+   * @param args - 事件参数
+   */ _proto.emit = function emit(eventName) {
+        for(var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++){
+            args[_key - 1] = arguments[_key];
+        }
+        var _this_eventProcessor;
+        (_this_eventProcessor = this.eventProcessor).emit.apply(_this_eventProcessor, [].concat([
+            eventName
+        ], args));
+    };
+    /**
+   * 获取事件名称对应的所有监听器
+   * @param eventName - 事件名称
+   * @returns - 返回事件名称对应的所有监听器
+   */ _proto.getListeners = function getListeners(eventName) {
+        return this.eventProcessor.getListeners(eventName);
+    };
+    /**
    * 设置元素的动画速度
    * @param speed - 速度
    */ _proto.setSpeed = function setSpeed(speed) {
@@ -20805,10 +20846,24 @@ exports.VFXItem = /*#__PURE__*/ function(EffectsObject) {
         if (duration <= 0) {
             throw new Error("Item duration can't be less than 0, see " + HELP_LINK["Item duration can't be less than 0"] + ".");
         }
+        this.itemBehaviours.length = 0;
+        this.rendererComponents.length = 0;
         for(var _iterator = _create_for_of_iterator_helper_loose(this.components), _step; !(_step = _iterator()).done;){
             var component = _step.value;
             component.item = this;
-            component.onAttached();
+            if (_instanceof1(component, Behaviour)) {
+                this.itemBehaviours.push(component);
+            }
+            if (_instanceof1(component, RendererComponent)) {
+                this.rendererComponents.push(component);
+            }
+            // TODO ParticleSystemRenderer 现在是动态生成的，后面需要在 json 中单独表示为一个组件
+            if (_instanceof1(component, exports.ParticleSystem)) {
+                if (!this.components.includes(component.renderer)) {
+                    this.components.push(component.renderer);
+                }
+                this.rendererComponents.push(component.renderer);
+            }
         }
         // renderOrder 在 component 初始化后设置。确保能拿到 rendererComponent。
         this.renderOrder = listIndex;
@@ -24446,15 +24501,20 @@ var tmpScale = new Vector3(1, 1, 1);
         return out.multiplyMatrices(this.viewProjectionMatrix, model);
     };
     /**
-   * 获取归一化坐标和 3D 世界坐标的换算比例
+   * 获取归一化坐标和 3D 世界坐标的换算比例，使用 ViewProjection 矩阵
    * @param z - 当前的位置 z
    */ _proto.getInverseVPRatio = function getInverseVPRatio(z) {
         var pos = new Vector3(this.position.x, this.position.y, z);
         var mat = this.getViewProjectionMatrix();
-        var inverseVP = this.getInverseViewProjectionMatrix();
+        var inverseMat = this.getInverseViewProjectionMatrix();
+        if (!this.viewportMatrix.isIdentity()) {
+            var viewportMatrix = this.viewportMatrix.clone();
+            inverseMat.premultiply(viewportMatrix);
+            mat.multiply(viewportMatrix.invert());
+        }
         var _mat_projectPoint = mat.projectPoint(pos), nz = _mat_projectPoint.z;
-        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;
+        var _inverseMat_projectPoint = inverseMat.projectPoint(new Vector3(1, 1, nz)), xMax = _inverseMat_projectPoint.x, yMax = _inverseMat_projectPoint.y;
+        var _inverseMat_projectPoint1 = inverseMat.projectPoint(new Vector3(-1, -1, nz)), xMin = _inverseMat_projectPoint1.x, yMin = _inverseMat_projectPoint1.y;
         return new Vector3((xMax - xMin) / 2, (yMax - yMin) / 2, 0);
     };
     /**
@@ -24881,6 +24941,7 @@ var listOrder = 0;
         _this.rendererOptions = null;
         _this.rootComposition.createContent();
         _this.buildItemTree(_this.rootItem);
+        _this.callAwake(_this.rootItem);
         _this.rootItem.onEnd = function() {
             window.setTimeout(function() {
                 _this.emit("end", {
@@ -25125,6 +25186,19 @@ var listOrder = 0;
         }
         return t;
     };
+    _proto.callAwake = function callAwake(item) {
+        for(var _iterator = _create_for_of_iterator_helper_loose(item.itemBehaviours), _step; !(_step = _iterator()).done;){
+            var itemBehaviour = _step.value;
+            if (!itemBehaviour.isAwakeCalled) {
+                itemBehaviour.awake();
+                itemBehaviour.isAwakeCalled = true;
+            }
+        }
+        for(var _iterator1 = _create_for_of_iterator_helper_loose(item.children), _step1; !(_step1 = _iterator1()).done;){
+            var child = _step1.value;
+            this.callAwake(child);
+        }
+    };
     _proto.callStart = function callStart(item) {
         for(var _iterator = _create_for_of_iterator_helper_loose(item.itemBehaviours), _step; !(_step = _iterator()).done;){
             var itemBehaviour = _step.value;
@@ -27612,7 +27686,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-beta.0";
+var version = "2.0.0-beta.2";
 logger.info("Core version: " + version + ".");
 
 exports.AbstractPlugin = AbstractPlugin;