@galacean/effects-threejs 2.0.0-alpha.25 → 2.0.0-alpha.26

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.0.0-alpha.25
+ * Version: v2.0.0-alpha.26
  */
 
 import * as THREE from 'three';
@@ -4491,8 +4491,8 @@ var index$1 = /*#__PURE__*/Object.freeze({
     BuiltinObjectGUID: BuiltinObjectGUID
 });
 
-var decoratorInitialStore = {};
-var mergedStore = {};
+var decoratorInitialStore = new Map();
+var mergedStore = new Map();
 var effectsClassStore = {};
 function effectsClass(className) {
     return function(target, context) {
@@ -4507,22 +4507,22 @@ function serialize(type, sourceName) {
     return generateSerializableMember(type, sourceName); // value member
 }
 function getMergedStore(target) {
-    var classKey = target.constructor.name;
-    if (mergedStore[classKey]) {
-        return mergedStore[classKey];
+    var classKey = target.constructor;
+    if (mergedStore.get(classKey)) {
+        return mergedStore.get(classKey);
     }
-    mergedStore[classKey] = {};
-    var store = mergedStore[classKey];
+    var store = {};
+    mergedStore.set(classKey, store);
     var currentTarget = target;
     var currentKey = classKey;
     while(currentKey){
-        var initialStore = decoratorInitialStore[currentKey];
+        var initialStore = decoratorInitialStore.get(currentKey);
         for(var property in initialStore){
             store[property] = initialStore[property];
         }
         var parent = Object.getPrototypeOf(currentTarget);
-        currentKey = Object.getPrototypeOf(parent).constructor.name;
-        if (currentKey === "Object") {
+        currentKey = Object.getPrototypeOf(parent).constructor;
+        if (currentKey === Object) {
             break;
         }
         currentTarget = parent;
@@ -4532,6 +4532,9 @@ function getMergedStore(target) {
 function generateSerializableMember(type, sourceName) {
     return function(target, propertyKey) {
         var classStore = getDirectStore(target);
+        if (!classStore) {
+            return;
+        }
         if (!classStore[propertyKey]) {
             classStore[propertyKey] = {
                 type: type,
@@ -4541,11 +4544,11 @@ function generateSerializableMember(type, sourceName) {
     };
 }
 function getDirectStore(target) {
-    var classKey = target.constructor.name;
-    if (!decoratorInitialStore[classKey]) {
-        decoratorInitialStore[classKey] = {};
+    var classKey = target.constructor;
+    if (!decoratorInitialStore.get(classKey)) {
+        decoratorInitialStore.set(classKey, {});
     }
-    return decoratorInitialStore[classKey];
+    return decoratorInitialStore.get(classKey);
 }
 
 /**
@@ -19667,7 +19670,7 @@ var TextComponentBase = /*#__PURE__*/ function() {
     _proto.updateWithOptions = function updateWithOptions(options) {
         this.textStyle = new TextStyle(options);
         this.textLayout = new TextLayout(options);
-        this.text = options.text;
+        this.text = options.text.toString();
         this.lineCount = this.getLineCount(options.text, true);
     };
     _proto.getLineCount = function getLineCount(text, init) {
@@ -19738,7 +19741,7 @@ var TextComponentBase = /*#__PURE__*/ function() {
         if (this.text === value) {
             return;
         }
-        this.text = value;
+        this.text = value.toString();
         this.lineCount = this.getLineCount(value, false);
         this.isDirty = true;
     };
@@ -20847,29 +20850,31 @@ var SerializationHelper = /*#__PURE__*/ function() {
         effectsObject.toData();
         res[effectsObject.getInstanceId()] = effectsObject;
         var serializedProperties = getMergedStore(effectsObject);
-        for(var _iterator = _create_for_of_iterator_helper_loose(Object.keys(serializedProperties)), _step; !(_step = _iterator()).done;){
-            var key = _step.value;
-            // TODO 待移除，序列化属性通过 effectsObject 对象直接获取
-            var value = effectsObject.taggedProperties[key];
-            if (value === undefined) {
-                value = effectsObject[key];
-            }
-            if (EffectsObject.is(value)) {
-                SerializationHelper.collectSerializableObject(value, res);
-            } else if (isArray(value)) {
-                for(var _iterator1 = _create_for_of_iterator_helper_loose(value), _step1; !(_step1 = _iterator1()).done;){
-                    var arrayValue = _step1.value;
-                    if (EffectsObject.is(arrayValue)) {
-                        SerializationHelper.collectSerializableObject(arrayValue, res);
-                    }
+        if (serializedProperties) {
+            for(var _iterator = _create_for_of_iterator_helper_loose(Object.keys(serializedProperties)), _step; !(_step = _iterator()).done;){
+                var key = _step.value;
+                // TODO 待移除，序列化属性通过 effectsObject 对象直接获取
+                var value = effectsObject.taggedProperties[key];
+                if (value === undefined) {
+                    value = effectsObject[key];
                 }
-            } else if (isObject(value)) {
-                // 非 EffectsObject 对象只递归一层
-                for(var _iterator2 = _create_for_of_iterator_helper_loose(Object.keys(value)), _step2; !(_step2 = _iterator2()).done;){
-                    var objectKey = _step2.value;
-                    var objectValue = value[objectKey];
-                    if (EffectsObject.is(objectValue)) {
-                        SerializationHelper.collectSerializableObject(objectValue, res);
+                if (EffectsObject.is(value)) {
+                    SerializationHelper.collectSerializableObject(value, res);
+                } else if (isArray(value)) {
+                    for(var _iterator1 = _create_for_of_iterator_helper_loose(value), _step1; !(_step1 = _iterator1()).done;){
+                        var arrayValue = _step1.value;
+                        if (EffectsObject.is(arrayValue)) {
+                            SerializationHelper.collectSerializableObject(arrayValue, res);
+                        }
+                    }
+                } else if (isObject(value)) {
+                    // 非 EffectsObject 对象只递归一层
+                    for(var _iterator2 = _create_for_of_iterator_helper_loose(Object.keys(value)), _step2; !(_step2 = _iterator2()).done;){
+                        var objectKey = _step2.value;
+                        var objectValue = value[objectKey];
+                        if (EffectsObject.is(objectValue)) {
+                            SerializationHelper.collectSerializableObject(objectValue, res);
+                        }
                     }
                 }
             }
@@ -20900,27 +20905,29 @@ var SerializationHelper = /*#__PURE__*/ function() {
             serializedData = {};
         }
         var serializedProperties = getMergedStore(effectsObject);
-        for(var _iterator = _create_for_of_iterator_helper_loose(Object.keys(serializedProperties)), _step; !(_step = _iterator()).done;){
-            var key = _step.value;
-            var value = effectsObject[key];
-            if (typeof value === "number" || typeof value === "string" || typeof value === "boolean" || SerializationHelper.checkTypedArray(value)) {
-                // TODO json 数据避免传 typedArray
-                serializedData[key] = value;
-            } else if (isArray(value)) {
-                if (!serializedData[key]) {
-                    serializedData[key] = [];
-                }
-                SerializationHelper.serializeArrayProperty(value, serializedData[key], 0);
-            } else if (EffectsObject.is(value)) {
-                // TODO 处理 EffectsObject 递归序列化
-                serializedData[key] = {
-                    id: value.getInstanceId()
-                };
-            } else if (isObject(value)) {
-                if (!serializedData[key]) {
-                    serializedData[key] = {};
+        if (serializedProperties) {
+            for(var _iterator = _create_for_of_iterator_helper_loose(Object.keys(serializedProperties)), _step; !(_step = _iterator()).done;){
+                var key = _step.value;
+                var value = effectsObject[key];
+                if (typeof value === "number" || typeof value === "string" || typeof value === "boolean" || SerializationHelper.checkTypedArray(value)) {
+                    // TODO json 数据避免传 typedArray
+                    serializedData[key] = value;
+                } else if (isArray(value)) {
+                    if (!serializedData[key]) {
+                        serializedData[key] = [];
+                    }
+                    SerializationHelper.serializeArrayProperty(value, serializedData[key], 0);
+                } else if (EffectsObject.is(value)) {
+                    // TODO 处理 EffectsObject 递归序列化
+                    serializedData[key] = {
+                        id: value.getInstanceId()
+                    };
+                } else if (isObject(value)) {
+                    if (!serializedData[key]) {
+                        serializedData[key] = {};
+                    }
+                    SerializationHelper.serializeObjectProperty(value, serializedData[key], 0);
                 }
-                SerializationHelper.serializeObjectProperty(value, serializedData[key], 0);
             }
         }
         // TODO 待移除 tagggedProperties 为没有装饰器的临时方案
@@ -20955,22 +20962,24 @@ var SerializationHelper = /*#__PURE__*/ function() {
         var engine = effectsObject.engine;
         for(var _iterator = _create_for_of_iterator_helper_loose(Object.keys(serializedData)), _step; !(_step = _iterator()).done;){
             var key = _step.value;
-            if (serializedProperties[key]) {
+            if (serializedProperties && serializedProperties[key]) {
                 continue;
             }
             var value = serializedData[key];
             taggedProperties[key] = SerializationHelper.deserializeProperty(value, engine, 0);
         }
-        for(var _iterator1 = _create_for_of_iterator_helper_loose(Object.keys(serializedProperties)), _step1; !(_step1 = _iterator1()).done;){
-            var key1 = _step1.value;
-            var value1 = serializedData[key1];
-            if (value1 === undefined) {
-                continue;
+        if (serializedProperties) {
+            for(var _iterator1 = _create_for_of_iterator_helper_loose(Object.keys(serializedProperties)), _step1; !(_step1 = _iterator1()).done;){
+                var key1 = _step1.value;
+                var value1 = serializedData[key1];
+                if (value1 === undefined) {
+                    continue;
+                }
+                var propertyType = serializedProperties[key1].type;
+                // FIXME: taggedProperties 为 readonly，这里存在强制赋值
+                // @ts-expect-error
+                effectsObject[key1] = SerializationHelper.deserializeProperty(value1, engine, 0, propertyType);
             }
-            var propertyType = serializedProperties[key1].type;
-            // FIXME: taggedProperties 为 readonly，这里存在强制赋值
-            // @ts-expect-error
-            effectsObject[key1] = SerializationHelper.deserializeProperty(value1, engine, 0, propertyType);
         }
         effectsObject.fromData(taggedProperties);
     };
@@ -20991,7 +21000,7 @@ var SerializationHelper = /*#__PURE__*/ function() {
                             4
                         ];
                         key = _step.value;
-                        if (serializedProperties[key]) {
+                        if (serializedProperties && serializedProperties[key]) {
                             return [
                                 3,
                                 3
@@ -21011,6 +21020,10 @@ var SerializationHelper = /*#__PURE__*/ function() {
                             1
                         ];
                     case 4:
+                        if (!serializedProperties) return [
+                            3,
+                            8
+                        ];
                         _iterator1 = _create_for_of_iterator_helper_loose(Object.keys(serializedProperties));
                         _state.label = 5;
                     case 5:
@@ -24130,11 +24143,13 @@ var tmpScale = new Vector3(1, 1, 1);
    * 获取归一化坐标和 3D 世界坐标的换算比例
    * @param z - 当前的位置 z
    */ _proto.getInverseVPRatio = function getInverseVPRatio(z) {
-        var pos = new Vector3(0, 0, z);
+        var pos = new Vector3(this.position.x, this.position.y, z);
         var mat = this.getViewProjectionMatrix();
         var inverseVP = this.getInverseViewProjectionMatrix();
         var _mat_projectPoint = mat.projectPoint(pos), nz = _mat_projectPoint.z;
-        return inverseVP.projectPoint(new Vector3(1, 1, nz));
+        var _inverseVP_projectPoint = inverseVP.projectPoint(new Vector3(1, 1, nz)), xMax = _inverseVP_projectPoint.x, yMax = _inverseVP_projectPoint.y;
+        var _inverseVP_projectPoint1 = inverseVP.projectPoint(new Vector3(-1, -1, nz)), xMin = _inverseVP_projectPoint1.x, yMin = _inverseVP_projectPoint1.y;
+        return new Vector3((xMax - xMin) / 2, (yMax - yMin) / 2, 0);
     };
     /**
    * 设置相机的旋转四元数
@@ -24787,6 +24802,7 @@ var listOrder = 0;
         // this.extraCamera?.getComponent(TimelineComponent)?.update(deltaTime);
         this.updateCamera();
         if (this.shouldDispose()) {
+            this.onEnd == null ? void 0 : this.onEnd.call(this, this);
             this.dispose();
         } else {
             if (!skipRender) {
@@ -25713,7 +25729,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.0.0-alpha.25";
+var version$1 = "2.0.0-alpha.26";
 logger.info("Core version: " + version$1 + ".");
 
 var _obj;
@@ -27346,7 +27362,7 @@ setMaxSpriteMeshItemCount(8);
  */ Mesh.create = function(engine, props) {
     return new ThreeMesh(engine, props);
 };
-var version = "2.0.0-alpha.25";
+var version = "2.0.0-alpha.26";
 logger.info("THREEJS plugin version: " + version + ".");
 
 export { AbstractPlugin, ActivationPlayable, ActivationPlayableAsset, ActivationTrack, AnimationClip, AnimationClipPlayable, AssetLoader, AssetManager, BYTES_TYPE_MAP, 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, Component, Composition, CompositionComponent, CompositionSourceManager, DEFAULT_FONTS, Database, DestroyOptions, Downloader, EFFECTS_COPY_MESH_NAME, EVENT_TYPE_CLICK, EVENT_TYPE_TOUCH_END, EVENT_TYPE_TOUCH_MOVE, EVENT_TYPE_TOUCH_START, EffectComponent, EffectsObject, Engine, EventSystem, FilterMode, Float16ArrayWrapper, Framebuffer, GLSLVersion, GPUCapability, Geometry, GlobalUniforms, GradientValue, HELP_LINK, HitTestType, InteractComponent, InteractLoader, InteractMesh, Item, ItemBehaviour, KTXTexture, LineSegments, LinearValue, Material, MaterialDataBlock, MaterialRenderType, Mesh, ObjectBindingTrack, OrderType, PLAYER_OPTIONS_ENV_EDITOR, POST_PROCESS_SETTINGS, ParticleBehaviourPlayable, ParticleBehaviourPlayableAsset, ParticleLoader, ParticleMesh, ParticleSystem, ParticleSystemRenderer, PassTextureCache, PathSegments, PluginSystem, 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, SemanticMap, SerializationHelper, Shader, ShaderCompileResultStatus, ShaderType, ShaderVariant, SpriteColorPlayable, 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, addByOrder, addItem, addItemWithOrder, applyMixins, assertExist, asserts, base64ToFile, blend, calculateTranslation, canvasPool, colorGradingFrag, colorStopsFromGradient, colorToArr$1 as colorToArr, combineImageTemplate, compatible_frag as compatibleFrag, compatible_vert as compatibleVert, createCopyShader, createGLContext, createKeyFrameMeta, createShaderWithMacros, createShape, createVFXItem, createValueGetter, decimalEqual, defaultGlobalVolume, defaultPlugins, deserializeMipmapTexture, earcut, effectsClass, effectsClassStore, enlargeBuffer, ensureFixedNumber, ensureVec3, findPreviousRenderPass, gaussianDown_frag as gaussianDownFrag, gaussianDownHFrag, gaussianDownVFrag, gaussianUpFrag, generateEmptyTypedArray, generateGUID, generateHalfFloatTexture, generateTransparentTexture, generateWhiteTexture, getBackgroundImage, getColorFromGradientStops, getConfig, getDefaultTemplateCanvasPool, 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, isObject, isSceneJSON, isSceneURL, isSceneWithOptions, isSimulatorCellPhone, isString, isUniformStruct, isUniformStructArray, isValidFontFamily, isWebGL2, itemFrag, itemFrameFrag, itemVert, 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, pluginLoaderMap, pointOnLine, 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, vecAssign, vecFill, vecMulCombine, vecNormalize, version, vertexFormatType2GLType };