@galacean/effects-core 2.2.2 → 2.2.4

package/dist/asset-loader.d.ts

@@ -1,7 +1,6 @@
 import * as spec from '@galacean/effects-specification';
 import type { EffectsObject } from './effects-object';
 import type { Engine } from './engine';
-import type { VFXItemProps } from './vfx-item';
 /**
  * @since 2.0.0
  */
@@ -22,7 +21,7 @@ export interface EffectComponentData extends spec.EffectsObjectData {
     materials: spec.DataPath[];
     geometry: spec.DataPath;
 }
-export type VFXItemData = VFXItemProps & {
+export type VFXItemData = spec.Item & {
     dataType: spec.DataType;
     components: spec.DataPath[];
 };

package/dist/index.js

@@ -3,7 +3,7 @@
  * Description: Galacean Effects runtime core for the web
  * Author: Ant Group CO., Ltd.
  * Contributors: 燃然,飂兮,十弦,云垣,茂安,意绮
- * Version: v2.2.2
+ * Version: v2.2.4
  */
 
 'use strict';
@@ -16624,8 +16624,16 @@ exports.InteractComponent = /*#__PURE__*/ function(RendererComponent) {
     _proto.onEnable = function onEnable() {
         RendererComponent.prototype.onEnable.call(this);
         var type = this.interactData.options.type;
+        var env = this.item.engine.renderer.env;
         if (type === InteractType.CLICK) {
             this.clickable = true;
+        } else if (type === InteractType.DRAG) {
+            var options = this.interactData.options;
+            var enableInEditor = options.enableInEditor;
+            if (env !== PLAYER_OPTIONS_ENV_EDITOR || enableInEditor) {
+                var _this_item_composition;
+                ((_this_item_composition = this.item.composition) == null ? void 0 : _this_item_composition.event) && this.beginDragTarget(options, this.item.composition.event);
+            }
         }
     };
     _proto.onUpdate = function onUpdate(dt) {
@@ -17161,6 +17169,83 @@ var PlayState;
     PlayState[PlayState["Paused"] = 1] = "Paused";
 })(PlayState || (PlayState = {}));
 
+/**
+ *
+ */ /**
+ * 事件监听器
+ */ 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;
+        })) || [];
+    };
+};
+
 var tempQuat$1 = new Quaternion();
 var seed$3 = 1;
 // TODO 继承 Component
@@ -17631,83 +17716,6 @@ var seed$3 = 1;
     return Transform;
 }();
 
-/**
- *
- */ /**
- * 事件监听器
- */ 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) {
@@ -18057,42 +18065,36 @@ exports.VFXItem = /*#__PURE__*/ function(EffectsObject) {
         EffectsObject.prototype.fromData.call(this, data);
         var id = data.id, name = data.name, delay = data.delay, parentId = data.parentId, endBehavior = data.endBehavior, transform = data.transform, _data_duration = data.duration, duration = _data_duration === void 0 ? 0 : _data_duration;
         this.props = data;
-        //@ts-expect-error
         this.type = data.type;
         this.id = id.toString(); // TODO 老数据 id 是 number，需要转换
         this.name = name;
         this.start = delay ? delay : this.start;
+        var transformProps = {};
         if (transform) {
-            //@ts-expect-error TODO 数据改造后移除 expect-error
-            transform.position = new Vector3().copyFrom(transform.position);
+            transformProps.position = new Vector3().copyFrom(transform.position);
             // FIXME: transform.rotation待删除
+            //@ts-expect-error
             if (transform.quat) {
                 //@ts-expect-error
-                transform.quat = new Quaternion(transform.quat.x, transform.quat.y, transform.quat.z, transform.quat.w);
+                transformProps.quat = new Quaternion(transform.quat.x, transform.quat.y, transform.quat.z, transform.quat.w);
             } else {
                 var _transform_eulerHint;
                 //@ts-expect-error
-                transform.rotation = new Euler().copyFrom((_transform_eulerHint = transform.eulerHint) != null ? _transform_eulerHint : transform.rotation);
+                transformProps.rotation = new Euler().copyFrom((_transform_eulerHint = transform.eulerHint) != null ? _transform_eulerHint : transform.rotation);
             }
-            //@ts-expect-error
-            transform.scale = new Vector3().copyFrom(transform.scale);
-            //@ts-expect-error
+            transformProps.scale = new Vector3().copyFrom(transform.scale);
             if (transform.size) {
-                //@ts-expect-error
-                transform.size = new Vector2().copyFrom(transform.size);
+                transformProps.size = new Vector2().copyFrom(transform.size);
             }
-            //@ts-expect-error
             if (transform.anchor) {
-                //@ts-expect-error
-                transform.anchor = new Vector2().copyFrom(transform.anchor);
+                transformProps.anchor = new Vector2().copyFrom(transform.anchor);
             }
-            this.transform.setTransform(transform);
+            this.transform.setTransform(transformProps);
         }
         this.transform.name = this.name;
         this.transform.engine = this.engine;
         this.parentId = parentId;
         this.duration = duration;
-        // TODO spec endbehavior 类型修正
         this.endBehavior = endBehavior;
         if (!data.content) {
             data.content = {
@@ -24884,9 +24886,23 @@ exports.TextComponent = /*#__PURE__*/ function(BaseRenderComponent) {
             order: listIndex
         };
         this.interaction = interaction;
+        this.cachePrefix = "-";
+        this.renderInfo = getImageItemRenderInfo(this);
+        var material = this.createMaterial(this.renderInfo, 2);
+        this.worldMatrix = Matrix4.fromIdentity();
+        this.material = material;
+        this.material.setVector4("_TexOffset", new Vector4().setFromArray([
+            0,
+            0,
+            1,
+            1
+        ]));
+        // TextComponentBase
         this.updateWithOptions(options);
-        // Text
         this.updateTexture();
+        this.setItem();
+        // 恢复默认颜色
+        this.material.setVector4("_Color", new Vector4(1, 1, 1, 1));
     };
     _proto.updateWithOptions = function updateWithOptions(options) {
     // OVERRIDE by mixins
@@ -25204,7 +25220,7 @@ var TextComponentBase = /*#__PURE__*/ function() {
         }
         //与 toDataURL() 两种方式都需要像素读取操作
         var imageData = context.getImageData(0, 0, this.canvas.width, this.canvas.height);
-        this.material.setTexture("_MainTex", Texture.createWithData(this.engine, {
+        var texture = Texture.createWithData(this.engine, {
             data: new Uint8Array(imageData.data),
             width: imageData.width,
             height: imageData.height
@@ -25214,7 +25230,9 @@ var TextComponentBase = /*#__PURE__*/ function() {
             minFilter: glContext.LINEAR,
             wrapS: glContext.CLAMP_TO_EDGE,
             wrapT: glContext.CLAMP_TO_EDGE
-        }));
+        });
+        this.renderer.texture = texture;
+        this.material.setTexture("_MainTex", texture);
         this.isDirty = false;
     };
     _proto.getFontDesc = function getFontDesc() {
@@ -28402,7 +28420,7 @@ var tmpScale = new Vector3(1, 1, 1);
             var sourceItemData = this.engine.jsonSceneData[itemDataPath.id];
             var itemProps = sourceItemData;
             if (passRenderLevel(sourceItemData.renderLevel, this.renderLevel)) {
-                if (itemProps.type === ItemType.sprite || itemProps.type === ItemType.particle || itemProps.type === ItemType.spine || //@ts-expect-error
+                if (itemProps.type === ItemType.sprite || itemProps.type === ItemType.particle || itemProps.type === ItemType.spine || itemProps.type === ItemType.text || itemProps.type === ItemType.video || //@ts-expect-error
                 itemProps.type === ItemType.shape) {
                     for(var _iterator2 = _create_for_of_iterator_helper_loose(itemProps.components), _step2; !(_step2 = _iterator2()).done;){
                         var componentPath = _step2.value;
@@ -28423,6 +28441,13 @@ var tmpScale = new Vector3(1, 1, 1);
                     }
                 }
                 items.push(itemDataPath);
+            } else {
+                // 非预合成元素未达到渲染等级的转化为空节点。
+                // 预合成元素有根据 item type 的子元素加载判断，没法保留空节点，这边先整体过滤掉。
+                if (itemProps.type !== ItemType.composition) {
+                    itemProps.components = [];
+                    items.push(itemDataPath);
+                }
             }
         }
         composition.items = items;
@@ -28667,10 +28692,13 @@ var LateUpdateTickData = /*#__PURE__*/ function(TickData) {
         assertExist(sourceContent);
         _this.renderer = renderer;
         _this.refCompositionProps = refCompositionProps;
-        _this.rootItem = new exports.VFXItem(_this.getEngine(), sourceContent);
+        // Instantiate composition rootItem
+        _this.rootItem = new exports.VFXItem(_this.getEngine());
         _this.rootItem.name = "rootItem";
+        _this.rootItem.duration = sourceContent.duration;
+        _this.rootItem.endBehavior = sourceContent.endBehavior;
         _this.rootItem.composition = _assert_this_initialized(_this);
-        // Spawn rootCompositionComponent
+        // Create rootCompositionComponent
         _this.rootComposition = _this.rootItem.addComponent(CompositionComponent);
         _this.width = width;
         _this.height = height;
@@ -31344,7 +31372,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.2.2";
+var version = "2.2.4";
 logger.info("Core version: " + version + ".");
 
 exports.AbstractPlugin = AbstractPlugin;