@galacean/effects-threejs 2.8.6 → 2.8.8

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.6
+ * Version: v2.8.8
  */
 
 'use strict';
@@ -2466,11 +2466,8 @@ function parsePercent$1(c) {
 }
 
 function getPixelRatio() {
-    if (typeof screen === "object" && typeof document === "object") {
-        var viewportWidth = Math.max(document.documentElement.clientWidth, window.innerWidth || 0);
-        var screenWidth = screen.width;
-        var viewportScale = screenWidth / viewportWidth;
-        return Math.min(2 * viewportScale, 2);
+    if (typeof window === "object") {
+        return Math.min(2, window.devicePixelRatio || 1);
     }
     return 1;
 }
@@ -17216,22 +17213,6 @@ exports.VFXItem = /*#__PURE__*/ function(EffectsObject) {
         this.transform.scaleBy(x, y, z);
     };
     /**
-   * 设置元素在画布上的像素位置
-   * Tips:
-   *  - 坐标原点在 canvas 左上角，x 正方向水平向右， y 正方向垂直向下
-   *  - 设置后会覆盖原有的位置信息
-   * @param x - x 坐标
-   * @param y - y 坐标
-   */ _proto.setPositionByPixel = function setPositionByPixel(x, y) {
-        if (this.composition) {
-            var z = this.transform.getWorldPosition().z;
-            var _this_composition_camera_getInverseVPRatio = this.composition.camera.getInverseVPRatio(z), rx = _this_composition_camera_getInverseVPRatio.x, ry = _this_composition_camera_getInverseVPRatio.y;
-            var width = this.composition.renderer.getWidth() / 2;
-            var height = this.composition.renderer.getHeight() / 2;
-            this.transform.setPosition((2 * x / width - 1) * rx, (1 - 2 * y / height) * ry, z);
-        }
-    };
-    /**
    * 设置本地坐标位置
    */ _proto.setPosition = function setPosition(x, y, z) {
         this.transform.setPosition(x, y, z);
@@ -17255,6 +17236,29 @@ exports.VFXItem = /*#__PURE__*/ function(EffectsObject) {
         this.transform.setWorldPosition(x, y, z);
     };
     /**
+   * 设置元素在画布上的像素位置
+   * Tips:
+   *  - 坐标原点在 canvas 左上角，x 正方向水平向右， y 正方向垂直向下
+   *  - 设置后会覆盖原有的位置信息
+   * @param x - x 坐标
+   * @param y - y 坐标
+   */ _proto.setPositionByPixel = function setPositionByPixel(x, y) {
+        if (this.composition) {
+            var z = this.transform.getWorldPosition().z;
+            var _this_composition_camera_getInverseVPRatio = this.composition.camera.getInverseVPRatio(z), rx = _this_composition_camera_getInverseVPRatio.x, ry = _this_composition_camera_getInverseVPRatio.y;
+            var _this_composition_getEngine_canvas_getBoundingClientRect = this.composition.getEngine().canvas.getBoundingClientRect(), width = _this_composition_getEngine_canvas_getBoundingClientRect.width, height = _this_composition_getEngine_canvas_getBoundingClientRect.height;
+            this.transform.setPosition((2 * x / width - 1) * rx, (1 - 2 * y / height) * ry, z);
+        }
+    };
+    _proto.translateByPixel = function translateByPixel(x, y) {
+        if (this.composition) {
+            var _this_composition_getEngine_canvas_getBoundingClientRect = this.composition.getEngine().canvas.getBoundingClientRect(), width = _this_composition_getEngine_canvas_getBoundingClientRect.width, height = _this_composition_getEngine_canvas_getBoundingClientRect.height;
+            var z = this.transform.getWorldPosition().z;
+            var _this_composition_camera_getInverseVPRatio = this.composition.camera.getInverseVPRatio(z), rx = _this_composition_camera_getInverseVPRatio.x, ry = _this_composition_camera_getInverseVPRatio.y;
+            this.transform.translate(2 * x * rx / width, -2 * y * ry / height, 0);
+        }
+    };
+    /**
    * 获取元素包围盒
    * @override
    */ _proto.getBoundingBox = function getBoundingBox() {
@@ -17442,14 +17446,6 @@ exports.VFXItem = /*#__PURE__*/ function(EffectsObject) {
         }
         this.defination.content = {};
     };
-    _proto.translateByPixel = function translateByPixel(x, y) {
-        if (this.composition) {
-            var _this_composition_getEngine_canvas_getBoundingClientRect = this.composition.getEngine().canvas.getBoundingClientRect(), width = _this_composition_getEngine_canvas_getBoundingClientRect.width, height = _this_composition_getEngine_canvas_getBoundingClientRect.height;
-            var z = this.transform.getWorldPosition().z;
-            var _this_composition_camera_getInverseVPRatio = this.composition.camera.getInverseVPRatio(z), rx = _this_composition_camera_getInverseVPRatio.x, ry = _this_composition_camera_getInverseVPRatio.y;
-            this.transform.translate(2 * x * rx / width, -2 * y * ry / height, 0);
-        }
-    };
     /**
    * 销毁元素
    */ _proto.dispose = function dispose() {
@@ -28890,7 +28886,6 @@ var TextComponentBase = /*#__PURE__*/ function() {
         this.lineCount = 0;
         this.maxLineWidth = 0;
         // 常量
-        this.SCALE_FACTOR = 0.1;
         this.ALPHA_FIX_VALUE = 1 / 255;
     }
     var _proto = TextComponentBase.prototype;
@@ -29012,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;
@@ -29238,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);
@@ -29253,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 {
@@ -29268,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++;
                 }
             }
         }
@@ -29417,7 +29419,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,
@@ -31647,7 +31652,7 @@ function getStandardSpriteContent(sprite, transform) {
     return ret;
 }
 
-var version$2 = "2.8.6";
+var version$2 = "2.8.8";
 var v0 = /^(\d+)\.(\d+)\.(\d+)(-(\w+)\.\d+)?$/;
 var standardVersion = /^(\d+)\.(\d+)$/;
 var reverseParticle = false;
@@ -35347,7 +35352,7 @@ registerPlugin("text", TextLoader);
 registerPlugin("sprite", SpriteLoader);
 registerPlugin("particle", ParticleLoader);
 registerPlugin("interact", InteractLoader);
-var version$1 = "2.8.6";
+var version$1 = "2.8.8";
 logger.info("Core version: " + version$1 + ".");
 
 var _obj;
@@ -36924,7 +36929,7 @@ applyMixins(exports.ThreeTextComponent, [
  */ Mesh.create = function(engine, props) {
     return new ThreeMesh(engine, props);
 };
-var version = "2.8.6";
+var version = "2.8.8";
 logger.info("THREEJS plugin version: " + version + ".");
 
 exports.ActivationMixerPlayable = ActivationMixerPlayable;