@galacean/effects 1.5.0 → 1.6.0-beta.0

package/dist/alipay.js

@@ -696,7 +696,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
  */
 
 /*********************************************/
@@ -10067,10 +10067,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 = alipay.performance.now();
             var vx = 0;
             var vy = 0;
+            var ts = alipay.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;
@@ -13605,10 +13618,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,
@@ -13623,6 +13639,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;
@@ -13647,12 +13667,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];
@@ -13662,17 +13682,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);
@@ -21877,7 +21897,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
  */
 
 /*********************************************/
@@ -25021,6 +25041,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;
@@ -25400,7 +25421,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 = [];
@@ -30172,7 +30193,12 @@ var Player = /** @class */ (function () {
                     for (var i = 0; i < regions.length; i++) {
                         var behavior = regions[i].behavior || InteractBehavior$2.NOTIFY;
                         if (behavior === InteractBehavior$2.NOTIFY) {
-                            (_a = _this.handleItemClicked) === null || _a === void 0 ? void 0 : _a.call(_this, __assign$1(__assign$1({}, regions[i]), { composition: composition.name, player: _this }));
+                            if (composition.onItemClicked) {
+                                composition.onItemClicked(__assign$1({}, regions[i]));
+                            }
+                            else {
+                                (_a = _this.handleItemClicked) === null || _a === void 0 ? void 0 : _a.call(_this, __assign$1(__assign$1({}, regions[i]), { compositionId: composition.id, compositionName: composition.name, composition: composition.name, player: _this }));
+                            }
                         }
                         else if (behavior === InteractBehavior$2.RESUME_PLAYER) {
                             void _this.resume();
@@ -30935,7 +30961,7 @@ Renderer.create = function (canvas, framework, renderOptions) {
 Engine.create = function (gl) {
     return new GLEngine(gl);
 };
-var version = "1.5.0";
+var version = "1.6.0-beta.0";
 logger.info('player version: ' + version);
 
 exports.AbstractPlugin = AbstractPlugin;