@galacean/effects-threejs 2.2.4 → 2.2.6

package/dist/index.js

@@ -3,7 +3,7 @@
  * Description: Galacean Effects runtime threejs plugin for the web
  * Author: Ant Group CO., Ltd.
  * Contributors: 燃然,飂兮,十弦,云垣,茂安,意绮
- * Version: v2.2.4
+ * Version: v2.2.6
  */
 
 'use strict';
@@ -979,7 +979,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) {
@@ -5787,7 +5787,7 @@ exports.TextureSourceType = void 0;
             _this.finish(url, xhr.status, xhr.response);
         };
         var handleLoad = function() {
-            if (xhr.status == 200 || xhr.status == 0) {
+            if (xhr.status == 200) {
                 _this.finish(url, 200, xhr.response);
             } else {
                 handleError();
@@ -5813,7 +5813,7 @@ exports.TextureSourceType = void 0;
     _proto.finish = function finish(url, status, data) {
         var callbacks = this.callbacks[url];
         delete this.callbacks[url];
-        var args = status == 200 || status == 0 ? [
+        var args = status == 200 ? [
             data
         ] : [
             status,
@@ -11741,25 +11741,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
+            };
+        }
     },
     /**
    * 关键帧左侧是否为缓动类型（否则为线段）
@@ -12666,6 +12676,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) {
@@ -12673,12 +12685,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++){
@@ -16282,7 +16300,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,
@@ -20770,7 +20788,6 @@ exports.ParticleSystem = /*#__PURE__*/ function(Component) {
                         if (options.removeParticle) {
                             renderer.removeParticlePoint(pointIndex);
                             this.clearPointTrail(pointIndex);
-                            link.removeNode(node); // TODO: 会多移除一个粒子，为了通过帧对比先保留，等 2.0 合到主分支后移除。
                             node.content = [
                                 0
                             ];
@@ -26025,6 +26042,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) {
@@ -26852,6 +26881,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";
@@ -31394,7 +31425,7 @@ registerPlugin("sprite", SpriteLoader, exports.VFXItem, true);
 registerPlugin("particle", ParticleLoader, exports.VFXItem, true);
 registerPlugin("cal", CalculateLoader, exports.VFXItem, true);
 registerPlugin("interact", InteractLoader, exports.VFXItem, true);
-var version$1 = "2.2.4";
+var version$1 = "2.2.6";
 logger.info("Core version: " + version$1 + ".");
 
 var _obj;
@@ -33027,7 +33058,7 @@ setMaxSpriteMeshItemCount(8);
  */ Mesh.create = function(engine, props) {
     return new ThreeMesh(engine, props);
 };
-var version = "2.2.4";
+var version = "2.2.6";
 logger.info("THREEJS plugin version: " + version + ".");
 
 exports.AbstractPlugin = AbstractPlugin;