@galacean/effects-threejs 2.2.2 → 2.2.3

package/dist/index.mjs

@@ -3,7 +3,7 @@
  * Description: Galacean Effects runtime threejs plugin for the web
  * Author: Ant Group CO., Ltd.
  * Contributors: 燃然,飂兮,十弦,云垣,茂安,意绮
- * Version: v2.2.2
+ * Version: v2.2.3
  */
 
 import * as THREE from 'three';
@@ -16622,8 +16622,16 @@ var 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) {
@@ -17159,6 +17167,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$4 = 1;
 // TODO 继承 Component
@@ -17629,83 +17714,6 @@ var seed$4 = 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;
-        })) || [];
-    };
-};
-
 var VFXItem = /*#__PURE__*/ function(EffectsObject) {
     _inherits(VFXItem, EffectsObject);
     function VFXItem(engine, props) {
@@ -18055,42 +18063,36 @@ var 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 = {
@@ -24882,9 +24884,23 @@ var 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
@@ -25202,7 +25218,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
@@ -25212,7 +25228,8 @@ var TextComponentBase = /*#__PURE__*/ function() {
             minFilter: glContext.LINEAR,
             wrapS: glContext.CLAMP_TO_EDGE,
             wrapT: glContext.CLAMP_TO_EDGE
-        }));
+        });
+        this.renderer.texture = texture;
         this.isDirty = false;
     };
     _proto.getFontDesc = function getFontDesc() {
@@ -28400,7 +28417,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;
@@ -28421,6 +28438,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;
@@ -28665,10 +28689,13 @@ var LateUpdateTickData = /*#__PURE__*/ function(TickData) {
         assertExist(sourceContent);
         _this.renderer = renderer;
         _this.refCompositionProps = refCompositionProps;
-        _this.rootItem = new VFXItem(_this.getEngine(), sourceContent);
+        // Instantiate composition rootItem
+        _this.rootItem = new 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;
@@ -31342,7 +31369,7 @@ registerPlugin("sprite", SpriteLoader, VFXItem, true);
 registerPlugin("particle", ParticleLoader, VFXItem, true);
 registerPlugin("cal", CalculateLoader, VFXItem, true);
 registerPlugin("interact", InteractLoader, VFXItem, true);
-var version$1 = "2.2.2";
+var version$1 = "2.2.3";
 logger.info("Core version: " + version$1 + ".");
 
 var _obj;
@@ -32975,7 +33002,7 @@ setMaxSpriteMeshItemCount(8);
  */ Mesh.create = function(engine, props) {
     return new ThreeMesh(engine, props);
 };
-var version = "2.2.2";
+var version = "2.2.3";
 logger.info("THREEJS plugin version: " + version + ".");
 
 export { AbstractPlugin, ActivationPlayable, ActivationPlayableAsset, ActivationTrack, AnimationClip, AnimationClipPlayable, Asset, AssetLoader, AssetManager, BYTES_TYPE_MAP, BaseRenderComponent, Behaviour, BezierCurve, BezierCurvePath, BezierCurveQuat, BinaryAsset, COMPRESSED_TEXTURE, CONSTANT_MAP_BLEND, CONSTANT_MAP_DEPTH, CONSTANT_MAP_STENCIL_FUNC, CONSTANT_MAP_STENCIL_OP, COPY_FRAGMENT_SHADER, COPY_MESH_SHADER_ID, COPY_VERTEX_SHADER, CalculateLoader, Camera, CameraController, CameraVFXItemLoader, ColorCurve, ColorPropertyPlayableAsset, ColorPropertyTrack, Component, Composition, CompositionComponent, CompositionSourceManager, DEFAULT_FONTS, DEFAULT_FPS, Database, DestroyOptions, Downloader, EFFECTS_COPY_MESH_NAME, EVENT_TYPE_CLICK, EVENT_TYPE_TOUCH_END, EVENT_TYPE_TOUCH_MOVE, EVENT_TYPE_TOUCH_START, EffectComponent, EffectsObject, EffectsPackage, Engine, EventEmitter, EventSystem, Fake3DAnimationMode, Fake3DComponent, FilterMode, Float16ArrayWrapper, FloatPropertyPlayableAsset, FloatPropertyTrack, Framebuffer, GLSLVersion, GPUCapability, Geometry, GlobalUniforms, GradientValue, HELP_LINK, HitTestType, InteractComponent, InteractLoader, InteractMesh, Item, KTXTexture, LineSegments, LinearValue, Material, MaterialDataBlock, MaterialRenderType, MaterialTrack, Mesh, MeshCollider, ObjectBindingTrack, OrderType, PLAYER_OPTIONS_ENV_EDITOR, POST_PROCESS_SETTINGS, ParticleBehaviourPlayable, ParticleBehaviourPlayableAsset, ParticleLoader, ParticleMesh, ParticleSystem, ParticleSystemRenderer, ParticleTrack, PassTextureCache, PathSegments, PluginSystem, PostProcessVolume, PropertyTrack, RENDER_PASS_NAME_PREFIX, RENDER_PREFER_LOOKUP_TEXTURE, RUNTIME_ENV, RandomSetValue, RandomValue, RandomVectorValue, RenderFrame, RenderPass, RenderPassAttachmentStorageType, RenderPassDestroyAttachmentType, RenderPassPriorityNormal, RenderPassPriorityPostprocess, RenderPassPriorityPrepare, RenderTargetHandle, RenderTextureFormat, Renderbuffer, Renderer, RendererComponent, RuntimeClip, 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, Scene, SemanticMap, SerializationHelper, Shader, ShaderCompileResultStatus, ShaderFactory, ShaderType, ShaderVariant, ShapeComponent, SpriteColorPlayableAsset, SpriteColorTrack, SpriteComponent, SpriteLoader, StaticValue, SubCompositionPlayableAsset, SubCompositionTrack, TEMPLATE_USE_OFFSCREEN_CANVAS, TEXTURE_UNIFORM_MAP, TextComponent, TextComponentBase, TextLayout, TextLoader, TextStyle, Texture, TextureFactory, TextureLoadAction, TextureSourceType, TextureStoreAction, ThreeComposition, ThreeDisplayObject, ThreeEngine, ThreeMaterial, ThreeSpriteComponent, ThreeTextComponent, ThreeTexture, Ticker, TimelineAsset, TimelineClip, TimelinePlayable, TrackAsset, TrackSortWrapper, TrackType, Transform, TransformAnimationPlayable, TransformPlayableAsset, TransformTrack, VFXItem, ValueGetter, Vector4Curve, Vector4PropertyPlayableAsset, Vector4PropertyTrack, addByOrder, addItem, addItemWithOrder, applyMixins, assertExist, asserts, base64ToFile, blend, calculateTranslation, canvasPool, colorGradingFrag, colorStopsFromGradient, colorToArr$1 as colorToArr, combineImageTemplate, createCopyShader, createGLContext, createKeyFrameMeta, createShape, createValueGetter, decimalEqual, defaultPlugins, deserializeMipmapTexture, earcut, effectsClass, effectsClassStore, enlargeBuffer, ensureFixedNumber, ensureVec3, findPreviousRenderPass, gaussianDown_frag as gaussianDownFrag, gaussianDownHFrag, gaussianDownVFrag, gaussianUpFrag, generateEmptyTypedArray, generateGUID, generateHalfFloatTexture, generateTransparentTexture, generateWhiteTexture, getBackgroundImage, getColorFromGradientStops, getConfig, getDefaultTextureFactory, getGeometryByShape, getGeometryTriangles, getImageItemRenderInfo, getKTXTextureOptions, getKeyFrameMetaByRawValue, getMergedStore, getParticleMeshShader, getPixelRatio, getPreMultiAlpha, getStandardComposition, getStandardImage, getStandardItem, getStandardJSON, getTextureSize, glContext, glType2VertexFormatType, gpuTimer, imageDataFromColor, imageDataFromGradient, initErrors, initGLContext, integrate, interpolateColor, isAlipayMiniApp, isAndroid, isArray, isCanvas, isFunction, isIOS, isIOSByUA, isMiniProgram, isObject, isSimulatorCellPhone, isString, isUniformStruct, isUniformStructArray, isValidFontFamily, isWebGL2, isWechatMiniApp, itemFrag, itemFrameFrag, itemVert, loadAVIFOptional, loadBinary, loadBlob, loadImage, loadMedia, loadVideo, loadWebPOptional, logger, index as math, maxSpriteMeshItemCount, modifyMaxKeyframeShader, nearestPowerOfTwo, noop, normalizeColor, numberToFix, parsePercent$1 as parsePercent, particleFrag, particleOriginTranslateMap$1 as particleOriginTranslateMap, particleUniformTypeMap, particleVert, passRenderLevel, pluginLoaderMap, randomInRange, registerPlugin, removeItem, rotateVec2, screenMeshVert, serialize, setBlendMode, setConfig, setDefaultTextureFactory, setMaskMode, setMaxSpriteMeshItemCount, setRayFromCamera, setSideMode, setSpriteMeshMaxItemCountByGPU, setUniformValue, sortByOrder, index$1 as spec, spriteMeshShaderFromFilter, spriteMeshShaderFromRenderInfo, spriteMeshShaderIdFromRenderInfo, thresholdFrag, throwDestroyedError, trailVert, translatePoint, trianglesFromRect, unregisterPlugin, valIfUndefined, value, valueDefine, vecFill, vecMulCombine, version, vertexFormatType2GLType };