@galacean/effects-threejs 2.2.5 → 2.2.6

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.5
+ * Version: v2.2.6
  */
 
 import * as THREE from 'three';
@@ -955,7 +955,7 @@ var pluginInfoMap = {
     "video": "@galacean/effects-plugin-multimedia",
     "audio": "@galacean/effects-plugin-multimedia",
     "orientation-transformer": "@galacean/effects-plugin-orientation-transformer",
-    "richtext": "@galacean/effects-plugin-rich-text",
+    "rich-text": "@galacean/effects-plugin-rich-text",
     "spine": "@galacean/effects-plugin-spine"
 };
 function getPluginUsageInfo(name) {
@@ -11717,25 +11717,35 @@ function numberToFix(a, fixed) {
 }
 
 var keyframeInfo = {
+    pointIndexCache: {
+        xIndex: 0,
+        yIndex: 0
+    },
     /**
    * 根据不同关键帧类型，获取位于曲线上的点
    */ getPointInCurve: function getPointInCurve(keyframe) {
         keyframe[0]; var data = keyframe[1];
-        var _this_getPointIndexInCurve = this.getPointIndexInCurve(keyframe), xIndex = _this_getPointIndexInCurve.xIndex, yIndex = _this_getPointIndexInCurve.yIndex;
+        var _this_getPointIndexInCurve = this.getPointIndexInCurve(keyframe, this.pointIndexCache), xIndex = _this_getPointIndexInCurve.xIndex, yIndex = _this_getPointIndexInCurve.yIndex;
         var time = data[xIndex];
         var value = data[yIndex];
         return new Vector2(time, value);
     },
     /**
    * 根据不同关键帧类型，获取位于曲线上的点的索引
-   */ getPointIndexInCurve: function getPointIndexInCurve(keyframe) {
+   */ getPointIndexInCurve: function getPointIndexInCurve(keyframe, res) {
         var type = keyframe[0], markType = keyframe[2];
         // 不同类型，存放的时间不同
         var index = type === BezierKeyframeType.LINE ? 0 : type === BezierKeyframeType.EASE_OUT ? 0 : type === BezierKeyframeType.EASE_IN ? 2 : type === BezierKeyframeType.EASE ? 2 : type === BezierKeyframeType.HOLD ? markType === BezierKeyframeType.EASE_IN ? 2 : 0 : 0;
-        return {
-            xIndex: index,
-            yIndex: index + 1
-        };
+        if (res) {
+            res.xIndex = index;
+            res.yIndex = index + 1;
+            return res;
+        } else {
+            return {
+                xIndex: index,
+                yIndex: index + 1
+            };
+        }
     },
     /**
    * 关键帧左侧是否为缓动类型（否则为线段）
@@ -12642,6 +12652,8 @@ var BezierCurve = /*#__PURE__*/ function(ValueGetter) {
                 timeEnd: Number(e.x)
             };
         }
+        this.startKeyframe = keyframes[0];
+        this.endKeyframe = keyframes[keyframes.length - 1];
         this.keyTimeData = Object.keys(this.curveMap);
     };
     _proto.getValue = function getValue(time) {
@@ -12649,12 +12661,18 @@ var BezierCurve = /*#__PURE__*/ function(ValueGetter) {
         var keyTimeData = this.keyTimeData;
         var keyTimeStart = this.curveMap[keyTimeData[0]].timeStart;
         var keyTimeEnd = this.curveMap[keyTimeData[keyTimeData.length - 1]].timeEnd;
-        // const keyTimeStart = Number(keyTimeData[0].split('&')[0]);
-        // const keyTimeEnd = Number(keyTimeData[keyTimeData.length - 1].split('&')[1]);
         if (time <= keyTimeStart) {
+            if (this.startKeyframe[0] === BezierKeyframeType.LINE || this.startKeyframe[0] === BezierKeyframeType.HOLD) {
+                keyframeInfo.getPointIndexInCurve(this.startKeyframe, keyframeInfo.pointIndexCache);
+                return this.endKeyframe[1][keyframeInfo.pointIndexCache.yIndex];
+            }
             return this.getCurveValue(keyTimeData[0], keyTimeStart);
         }
         if (time >= keyTimeEnd) {
+            if (this.endKeyframe[0] === BezierKeyframeType.LINE || this.endKeyframe[0] === BezierKeyframeType.HOLD) {
+                keyframeInfo.getPointIndexInCurve(this.endKeyframe, keyframeInfo.pointIndexCache);
+                return this.endKeyframe[1][keyframeInfo.pointIndexCache.yIndex];
+            }
             return this.getCurveValue(keyTimeData[keyTimeData.length - 1], keyTimeEnd);
         }
         for(var i = 0; i < keyTimeData.length; i++){
@@ -16258,7 +16276,7 @@ var EventSystem = /*#__PURE__*/ function() {
             var vy = 0;
             var ts = performance.now();
             if (!_this.target) {
-                logger.error("Trigger TouchEvent after EventSystem is disposed.");
+                logger.warn("Trigger TouchEvent after EventSystem is disposed.");
                 return {
                     x: x,
                     y: y,
@@ -26000,6 +26018,18 @@ function getStandardInteractContent(ui) {
     });
     return json;
 }
+/**
+ * 3.1 版本数据适配
+ * - 富文本插件名称的适配
+ */ function version31Migration(json) {
+    var _json_plugins;
+    (_json_plugins = json.plugins) == null ? void 0 : _json_plugins.forEach(function(plugin, index) {
+        if (plugin === "richtext") {
+            json.plugins[index] = "rich-text";
+        }
+    });
+    return json;
+}
 /**
  * 3.0 以下版本数据适配（runtime 2.0及以上版本支持）
  */ function version30Migration(json) {
@@ -26827,6 +26857,8 @@ function getStandardJSON(json) {
     }
     // 修正老版本数据中，meshItem 以及 lightItem 结束行为错误问题
     version22Migration(json);
+    // 修正老版本数据中，富文本插件名称的问题
+    version31Migration(json);
     if (v0.test(json.version)) {
         var _exec;
         reverseParticle = ((_exec = /^(\d+)/.exec(json.version)) == null ? void 0 : _exec[0]) === "0";
@@ -31369,7 +31401,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.5";
+var version$1 = "2.2.6";
 logger.info("Core version: " + version$1 + ".");
 
 var _obj;
@@ -33002,7 +33034,7 @@ setMaxSpriteMeshItemCount(8);
  */ Mesh.create = function(engine, props) {
     return new ThreeMesh(engine, props);
 };
-var version = "2.2.5";
+var version = "2.2.6";
 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 };