@galacean/effects 1.5.1 → 1.6.0-beta.0

package/dist/index.mjs

@@ -3,7 +3,7 @@
  * Description: Galacean Effects runtime player for the web
  * Author: Ant Group CO., Ltd.
  * Contributors: 燃然,飂兮,十弦,云垣,茂安,意绮
- * Version: v1.5.1
+ * Version: v1.6.0-beta.0
  */
 
 /******************************************************************************
@@ -10069,10 +10069,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;
@@ -13607,10 +13620,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,
@@ -13625,6 +13641,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;
@@ -13649,12 +13669,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];
@@ -13664,17 +13684,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);
@@ -25023,6 +25043,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;
@@ -25402,7 +25423,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 = [];
@@ -30174,7 +30195,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();
@@ -30937,7 +30963,7 @@ Renderer.create = function (canvas, framework, renderOptions) {
 Engine.create = function (gl) {
     return new GLEngine(gl);
 };
-var version = "1.5.1";
+var version = "1.6.0-beta.0";
 logger.info('player version: ' + version);
 
 export { AbstractPlugin, AssetManager, BYTES_TYPE_MAP, BezierCurve, BezierCurvePath, COMPRESSED_TEXTURE, COPY_FRAGMENT_SHADER, COPY_MESH_SHADER_ID, COPY_VERTEX_SHADER, CalculateItem, CalculateLoader, CalculateVFXItem, Camera, CameraController, CameraVFXItem, CameraVFXItemLoader, Composition, CompositionSourceManager, DEFAULT_FONTS, DestroyOptions, Downloader, EFFECTS_COPY_MESH_NAME, EVENT_TYPE_CLICK, EVENT_TYPE_TOUCH_END, EVENT_TYPE_TOUCH_MOVE, EVENT_TYPE_TOUCH_START, Engine, EventSystem, FILTER_NAME_NONE, FilterMode, FilterSpriteVFXItem, Float16ArrayWrapper, FrameBuffer, GLEngine, GLGeometry, GLRenderer, GLSLVersion, GPUCapability, Geometry, GlobalUniforms, GradientValue, HELP_LINK$1 as HELP_LINK, HitTestType, InteractBehavior$1 as InteractBehavior, InteractItem, InteractLoader, InteractMesh, InteractVFXItem, Item, KTXTexture, LineSegments, LinearValue, Material, MaterialDataBlock, MaterialRenderType, Mesh, OrderType, PLAYER_OPTIONS_ENV_EDITOR, POST_PROCESS_SETTINGS, ParticleLoader, ParticleMesh, ParticleSystem, ParticleVFXItem, PassTextureCache, Player, PluginSystem, QCanvasViewer, QText, QTextWrapMode, RENDER_PASS_NAME_PREFIX, RENDER_PREFER_LOOKUP_TEXTURE, RUNTIME_ENV, RandomSetValue, RandomValue, RandomVectorValue, RenderBuffer, RenderFrame, RenderPass, RenderPassAttachmentStorageType, RenderPassDestroyAttachmentType, RenderPassPriorityNormal, RenderPassPriorityPostprocess, RenderPassPriorityPrepare, RenderTargetHandle, RenderTextureFormat, Renderer, SEMANTIC_MAIN_PRE_COLOR_ATTACHMENT_0, SEMANTIC_MAIN_PRE_COLOR_ATTACHMENT_SIZE_0, SEMANTIC_PRE_COLOR_ATTACHMENT_0, SEMANTIC_PRE_COLOR_ATTACHMENT_SIZE_0, SPRITE_VERTEX_STRIDE, SemanticMap, Shader, ShaderCompileResultStatus, ShaderType, SpriteItem, SpriteLoader, SpriteMesh, SpriteVFXItem, StaticValue, TEMPLATE_USE_OFFSCREEN_CANVAS, TextItem, TextLoader, TextMesh, TextVFXItem, Texture, TextureFactory, TextureLoadAction, TextureSourceType, TextureStoreAction, Ticker, TimelineComponent, Transform, VFXItem, ValueGetter, addByOrder, addItem, addItemWithOrder, alphaFrameFrag, alphaMaskFrag, assertExist, asserts, blend, bloomMixVert, bloomThresholdVert, calculateTranslation, cameraMove_frag as cameraMoveFrag, cameraMoveVert, canvasPool, colorGradingFrag, colorStopsFromGradient, colorToArr$1 as colorToArr, combineImageTemplate, combineImageTemplate1, combineImageTemplate1Async, combineImageTemplate2, combineImageTemplate2Async, combineImageTemplateAsync, compatible_frag as compatibleFrag, compatible_vert as compatibleVert, convertAnchor, copyFrag, createCopyShader, createFilter, createFilterShaders, createGLContext, createKeyFrameMeta, createShaderWithMarcos, createShape, createVFXItem, createValueGetter, decimalEqual, deepClone, defaultGlobalVolume, defaultPlugins, delayFrag, deserializeMipmapTexture, disableAllPlayer, distortionFrag, distortionVert, earcut, enlargeBuffer, ensureVec3, filters, findPreviousRenderPass, gaussianDown_frag as gaussianDownFrag, gaussianDownHFrag, gaussianDownVFrag, gaussianUpFrag, generateEmptyTypedArray, generateHalfFloatTexture, getActivePlayers, getBackgroundImage, getColorFromGradientStops, getConfig, getDefaultTemplateCanvasPool, getDefaultTextureFactory, getGeometryByShape, getGeometryTriangles, getImageItemRenderInfo, getKTXTextureOptions, getKeyFrameMetaByRawValue, getParticleMeshShader, getPixelRatio, getPlayerByCanvas, getPreMultiAlpha, getStandardComposition, getStandardImage, getStandardItem, getStandardJSON, getTextureSize, glContext, gpuTimer, imageDataFromColor, imageDataFromGradient, initErrors, initGLContext, integrate, interpolateColor, isAlipayMiniApp, isAndroid, isArray, isCanvasUsedByPlayer, isFunction, isIOS, isObject, isScene, isSceneWithOptions, isSimulatorCellPhone, isString, isUniformStruct, isUniformStructArray, isValidFontFamily, isWebGL2, itemFrag, itemFrameFrag, itemVert, loadBinary, loadBlob, loadImage, loadMedia, loadVideo, loadWebPOptional, logger, index as math, maxSpriteMeshItemCount, maxSpriteTextureCount, modifyMaxKeyframeShader, nearestPowerOfTwo, noop, numberToFix, parsePercent$1 as parsePercent, particleFrag, particleOriginTranslateMap, particleUniformTypeMap, particleVert, pluginLoaderMap, pointOnLine, random, registerFilter, registerFilters, registerPlugin, removeItem, requestAsync, rotateVec2, screenMeshVert, setBlendMode, setConfig, setDefaultTextureFactory, setMaskMode, setMaxSpriteMeshItemCount, setRayFromCamera, setSideMode, setSpriteMeshMaxFragmentTextures, setSpriteMeshMaxItemCountByGPU, sortByOrder, index$1 as spec, spriteMeshShaderFromFilter, spriteMeshShaderFromRenderInfo, spriteMeshShaderIdFromRenderInfo, thresholdFrag, throwDestroyedError$1 as throwDestroyedError, trailVert, translatePoint, trianglesFromRect, unregisterPlugin, valIfUndefined, value, valueDefine, vecAssign, vecFill, vecMulCombine, vecNormalize, version };