@galacean/effects-core 1.5.0 → 1.6.0-beta.0

package/dist/composition.d.ts

@@ -1,5 +1,6 @@
 import * as spec from '@galacean/effects-specification';
-import type { Ray } from '@galacean/effects-math/es/core/index';
+import type { Ray } from '@galacean/effects-math/es/core/ray';
+import type { Vector3 } from '@galacean/effects-math/es/core/vector3';
 import type { SceneType } from './asset-manager';
 import type { Scene } from './scene';
 import type { Disposable, LostHandler } from './utils';
@@ -25,6 +26,12 @@ export interface MessageItem {
     phrase: number;
     compositionId: number;
 }
+export interface CompItemClickedData {
+    name: string;
+    id: string;
+    hitPositions: Vector3[];
+    position: Vector3;
+}
 /**
  *
  */
@@ -38,6 +45,7 @@ export interface CompositionProps {
     baseRenderOrder?: number;
     renderer: Renderer;
     onPlayerPause?: (item: VFXItem<any>) => void;
+    onItemClicked?: (item: VFXItem<any>) => void;
     onMessageItem?: (item: MessageItem) => void;
     onEnd?: (composition: Composition) => void;
     event?: EventSystem;
@@ -82,6 +90,11 @@ export declare class Composition implements Disposable, LostHandler {
      * 是否播放完成后销毁 texture 对象
      */
     keepResource: boolean;
+    /**
+     * 合成内的元素否允许点击、拖拽交互
+     * @since 1.6.0
+     */
+    interactive: boolean;
     /**
      * 合成结束行为是 spec.END_BEHAVIOR_PAUSE 或 spec.END_BEHAVIOR_PAUSE_AND_DESTROY 时执行的回调
      * @internal
@@ -95,6 +108,14 @@ export declare class Composition implements Disposable, LostHandler {
      * 合成中消息元素创建/销毁时触发的回调
      */
     onMessageItem?: (item: MessageItem) => void;
+    /**
+     * 合成中元素点击时触发的回调
+     * 注意：此接口随时可能下线，请务使用！
+     * @since 1.6.0
+     * @ignore
+     * @deprecated
+     */
+    onItemClicked?: (data: CompItemClickedData) => void;
     /**
      * 合成id
      */

package/dist/index.js

@@ -3,7 +3,7 @@
  * Description: Galacean Effects runtime core for the web
  * Author: Ant Group CO., Ltd.
  * Contributors: 燃然,飂兮,十弦,云垣,茂安,意绮
- * Version: v1.5.0
+ * Version: v1.6.0-beta.0
  */
 
 'use strict';
@@ -702,7 +702,7 @@ function isValidFontFamily(fontFamily) {
  * Name: @galacean/effects-specification
  * Description: Galacean Effects JSON Specification
  * Author: Ant Group CO., Ltd.
- * Version: v1.3.0-alpha.0
+ * Version: v1.3.0
  */
 
 /*********************************************/
@@ -10073,10 +10073,23 @@ var EventSystem = /** @class */ (function () {
         var getTouchEventValue = function (event, x, y, dx, dy) {
             if (dx === void 0) { dx = 0; }
             if (dy === void 0) { dy = 0; }
-            var _a = _this.target, width = _a.width, height = _a.height;
-            var ts = performance.now();
             var vx = 0;
             var vy = 0;
+            var ts = performance.now();
+            if (!_this.target) {
+                logger.error('Trigger TouchEvent after EventSystem is disposed');
+                return {
+                    x: x,
+                    y: y,
+                    vx: 0,
+                    vy: vy,
+                    dx: dx,
+                    dy: dy,
+                    ts: ts,
+                    width: 0, height: 0, origin: event,
+                };
+            }
+            var _a = _this.target, width = _a.width, height = _a.height;
             if (lastTouch) {
                 var dt = ts - lastTouch.ts;
                 vx = ((dx - lastTouch.dx) / dt) || 0;
@@ -13611,10 +13624,13 @@ var InteractVFXItem = /** @class */ (function (_super) {
         var dragEvent;
         var handlerMap = {
             touchstart: function (event) {
-                var _a;
+                var _a, _b;
+                if (!((_a = _this.composition) === null || _a === void 0 ? void 0 : _a.interactive)) {
+                    return;
+                }
                 _this.dragEvent = null;
                 _this.bouncingArg = null;
-                var camera = (_a = _this.composition) === null || _a === void 0 ? void 0 : _a.camera;
+                var camera = (_b = _this.composition) === null || _b === void 0 ? void 0 : _b.camera;
                 dragEvent = {
                     x: event.x,
                     y: event.y,
@@ -13629,6 +13645,10 @@ var InteractVFXItem = /** @class */ (function (_super) {
                 _this.bouncingArg = event;
             },
             touchend: function (event) {
+                var _a;
+                if (!((_a = _this.composition) === null || _a === void 0 ? void 0 : _a.interactive)) {
+                    return;
+                }
                 var bouncingArg = _this.bouncingArg;
                 if (!shouldIgnoreBouncing(bouncingArg, 3) && bouncingArg) {
                     var speed = 5;
@@ -13653,12 +13673,12 @@ var InteractVFXItem = /** @class */ (function (_super) {
         // OVERRIDE
     };
     InteractVFXItem.prototype.handleDragMove = function (evt, event) {
-        var _a, _b;
-        if (!(evt && evt.cameraParam) || !this.composition) {
+        var _a, _b, _c;
+        if (!(evt && evt.cameraParam) || !((_a = this.composition) === null || _a === void 0 ? void 0 : _a.interactive)) {
             return;
         }
         var options = this.ui.options;
-        var _c = evt.cameraParam, position = _c.position, fov = _c.fov;
+        var _d = evt.cameraParam, position = _d.position, fov = _d.fov;
         var dy = event.dy;
         var dx = event.dx * event.width / event.height;
         var depth = position[2];
@@ -13668,17 +13688,17 @@ var InteractVFXItem = /** @class */ (function (_super) {
         var nx = position[0] - width;
         var ny = position[1] - height;
         if (options.dxRange) {
-            var _d = __read$3(options.dxRange, 2), min = _d[0], max = _d[1];
+            var _e = __read$3(options.dxRange, 2), min = _e[0], max = _e[1];
             nx = clamp$1(nx, min, max);
             if (nx !== min && nx !== max && min !== max) {
-                (_a = event.origin) === null || _a === void 0 ? void 0 : _a.preventDefault();
+                (_b = event.origin) === null || _b === void 0 ? void 0 : _b.preventDefault();
             }
         }
         if (options.dyRange) {
-            var _e = __read$3(options.dyRange, 2), min = _e[0], max = _e[1];
+            var _f = __read$3(options.dyRange, 2), min = _f[0], max = _f[1];
             ny = clamp$1(ny, min, max);
             if (ny !== min && ny !== max && min !== max) {
-                (_b = event.origin) === null || _b === void 0 ? void 0 : _b.preventDefault();
+                (_c = event.origin) === null || _c === void 0 ? void 0 : _c.preventDefault();
             }
         }
         this.composition.camera.position = new Vector3(nx, ny, depth);
@@ -21883,7 +21903,7 @@ var filters = {
  * Name: @galacean/effects-specification
  * Description: Galacean Effects JSON Specification
  * Author: Ant Group CO., Ltd.
- * Version: v1.3.0-alpha.0
+ * Version: v1.3.0
  */
 
 /*********************************************/
@@ -25027,6 +25047,7 @@ var Composition = /** @class */ (function () {
         this.camera = new Camera(this.name, __assign$1(__assign$1({}, sourceContent === null || sourceContent === void 0 ? void 0 : sourceContent.camera), { aspect: width / height }));
         this.url = scene.url;
         this.assigned = true;
+        this.interactive = true;
         this.onPlayerPause = onPlayerPause;
         this.onMessageItem = onMessageItem;
         this.onEnd = onEnd;
@@ -25406,7 +25427,7 @@ var Composition = /** @class */ (function () {
      * @param options - 最大求交数和求交时的回调
      */
     Composition.prototype.hitTest = function (x, y, force, options) {
-        if (this.isDestroyed) {
+        if (this.isDestroyed || !this.interactive) {
             return [];
         }
         var regions = [];