@galacean/effects-threejs 2.8.7 → 2.8.9

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.8.7
+ * Version: v2.8.9
  */
 
 'use strict';
@@ -17867,14 +17867,14 @@ exports.CompositionComponent = /*#__PURE__*/ function(Component) {
                         }
                     }
                 }
-                if (exports.VFXItem.isComposition(hitTestItem)) {
-                    if (hitTestItem.getComponent(CompositionComponent).hitTest(ray, x, y, regions, force, options)) {
-                        hitTestSuccess = true;
-                    }
-                } else {
-                    if (_this.hitTestRecursive(hitTestItem, ray, x, y, regions, force, options)) {
-                        hitTestSuccess = true;
-                    }
+            }
+            if (exports.VFXItem.isComposition(hitTestItem)) {
+                if (hitTestItem.getComponent(CompositionComponent).hitTest(ray, x, y, regions, force, options)) {
+                    hitTestSuccess = true;
+                }
+            } else {
+                if (_this.hitTestRecursive(hitTestItem, ray, x, y, regions, force, options)) {
+                    hitTestSuccess = true;
                 }
             }
         };
@@ -29007,8 +29007,8 @@ var TextComponentBase = /*#__PURE__*/ function() {
     };
     _proto.setupShadow = function setupShadow() {
         var context = this.context;
-        var _this_textStyle = this.textStyle, outlineColor = _this_textStyle.outlineColor, shadowBlur = _this_textStyle.shadowBlur, shadowOffsetX = _this_textStyle.shadowOffsetX, shadowOffsetY = _this_textStyle.shadowOffsetY;
-        var r = outlineColor[0], g = outlineColor[1], b = outlineColor[2], a = outlineColor[3];
+        var _this_textStyle = this.textStyle, shadowColor = _this_textStyle.shadowColor, shadowBlur = _this_textStyle.shadowBlur, shadowOffsetX = _this_textStyle.shadowOffsetX, shadowOffsetY = _this_textStyle.shadowOffsetY;
+        var r = shadowColor[0], g = shadowColor[1], b = shadowColor[2], a = shadowColor[3];
         if (context) {
             context.shadowColor = "rgba(" + r * 255 + ", " + g * 255 + ", " + b * 255 + ", " + a + ")";
             context.shadowBlur = shadowBlur;
@@ -29233,11 +29233,11 @@ exports.TextComponent = /*#__PURE__*/ function(MaskableGraphic) {
     _proto.getLineCount = function getLineCount(text) {
         var context = this.context;
         var _this_textLayout = this.textLayout, letterSpace = _this_textLayout.letterSpace, overflow = _this_textLayout.overflow;
-        // const fontScale = init ? this.textStyle.fontSize / 10 : 1 / this.textStyle.fontScale;
         this.maxLineWidth = 0;
         var width = this.textLayout.width + this.textStyle.fontOffset;
         var lineCount = 1;
         var x = 0;
+        var charCountInLine = 0; // 跟踪当前行的字符数
         // 设置 context.font 的字号，确保 measureText 能正确计算字宽
         if (context) {
             context.font = this.getFontDesc(this.textStyle.fontSize);
@@ -29248,14 +29248,19 @@ exports.TextComponent = /*#__PURE__*/ function(MaskableGraphic) {
             var _context_measureText_width;
             var textMetrics = (_context_measureText_width = context == null ? void 0 : (_context_measureText = context.measureText(str)) == null ? void 0 : _context_measureText.width) != null ? _context_measureText_width : 0;
             // 和浏览器行为保持一致
-            x += letterSpace;
+            // 字符间距只应用在字符之间，每行第一个字符不加间距
+            if (charCountInLine > 0) {
+                x += letterSpace;
+            }
             // 处理文本结束行为
             if (overflow === TextOverflow.display) {
                 if (str === "\n") {
                     lineCount++;
                     x = 0;
+                    charCountInLine = 0; // 重置行字符计数
                 } else {
                     x += textMetrics;
+                    charCountInLine++;
                     this.maxLineWidth = Math.max(this.maxLineWidth, x);
                 }
             } else {
@@ -29263,9 +29268,11 @@ exports.TextComponent = /*#__PURE__*/ function(MaskableGraphic) {
                     lineCount++;
                     this.maxLineWidth = Math.max(this.maxLineWidth, x);
                     x = 0;
+                    charCountInLine = 0; // 重置行字符计数
                 }
                 if (str !== "\n") {
                     x += textMetrics;
+                    charCountInLine++;
                 }
             }
         }
@@ -29394,12 +29401,6 @@ exports.TextComponent = /*#__PURE__*/ function(MaskableGraphic) {
             } else {
                 context.font = style.fontDesc;
             }
-            if (style.hasShadow) {
-                _this.setupShadow();
-            }
-            if (style.isOutlined) {
-                _this.setupOutline();
-            }
             // textColor 统一是 0-1，写入 canvas 时乘 255
             var _style_textColor = style.textColor, r = _style_textColor[0], g = _style_textColor[1], b = _style_textColor[2], a = _style_textColor[3];
             context.fillStyle = "rgba(" + r * 255 + ", " + g * 255 + ", " + b * 255 + ", " + a + ")";
@@ -29412,7 +29413,10 @@ exports.TextComponent = /*#__PURE__*/ function(MaskableGraphic) {
                 var str = char[i];
                 var textMetrics = context.measureText(str);
                 // 和浏览器行为保持一致
-                x += layout.letterSpace * fontScale;
+                // 字符间距只应用在字符之间，每行第一个字符不加间距
+                if (charsArray.length > 0) {
+                    x += layout.letterSpace * fontScale;
+                }
                 if (x + textMetrics.width > baseWidth && i > 0 || str === "\n") {
                     charsInfo.push({
                         y: y,
@@ -29437,8 +29441,13 @@ exports.TextComponent = /*#__PURE__*/ function(MaskableGraphic) {
                 chars: charsArray,
                 charOffsetX: charOffsetX
             });
-            // 先描边
-            if (style.isOutlined && style.outlineWidth > 0) {
+            var hasOutline = style.isOutlined && style.outlineWidth > 0;
+            if (hasOutline) {
+                // 有描边：在描边时启用阴影
+                if (style.hasShadow) {
+                    _this.setupShadow();
+                }
+                _this.setupOutline();
                 charsInfo.forEach(function(charInfo) {
                     var ox = layout.getOffsetX(style, charInfo.width);
                     for(var i = 0; i < charInfo.chars.length; i++){
@@ -29448,8 +29457,15 @@ exports.TextComponent = /*#__PURE__*/ function(MaskableGraphic) {
                         context.strokeText(str, drawX, drawY);
                     }
                 });
+                // 描边完成后立即禁用阴影，避免填充时重复绘制阴影
+                if (style.hasShadow) {
+                    context.shadowColor = "transparent";
+                }
+            }
+            // 填充阶段：无描边时才启用阴影
+            if (!hasOutline && style.hasShadow) {
+                _this.setupShadow();
             }
-            // 再填充
             charsInfo.forEach(function(charInfo) {
                 var ox = layout.getOffsetX(style, charInfo.width);
                 for(var i = 0; i < charInfo.chars.length; i++){
@@ -29459,6 +29475,7 @@ exports.TextComponent = /*#__PURE__*/ function(MaskableGraphic) {
                     context.fillText(str, drawX, drawY);
                 }
             });
+            // 清理阴影状态
             if (style.hasShadow) {
                 context.shadowColor = "transparent";
             }
@@ -31642,7 +31659,7 @@ function getStandardSpriteContent(sprite, transform) {
     return ret;
 }
 
-var version$2 = "2.8.7";
+var version$2 = "2.8.9";
 var v0 = /^(\d+)\.(\d+)\.(\d+)(-(\w+)\.\d+)?$/;
 var standardVersion = /^(\d+)\.(\d+)$/;
 var reverseParticle = false;
@@ -35342,7 +35359,7 @@ registerPlugin("text", TextLoader);
 registerPlugin("sprite", SpriteLoader);
 registerPlugin("particle", ParticleLoader);
 registerPlugin("interact", InteractLoader);
-var version$1 = "2.8.7";
+var version$1 = "2.8.9";
 logger.info("Core version: " + version$1 + ".");
 
 var _obj;
@@ -36919,7 +36936,7 @@ applyMixins(exports.ThreeTextComponent, [
  */ Mesh.create = function(engine, props) {
     return new ThreeMesh(engine, props);
 };
-var version = "2.8.7";
+var version = "2.8.9";
 logger.info("THREEJS plugin version: " + version + ".");
 
 exports.ActivationMixerPlayable = ActivationMixerPlayable;