@galacean/effects 1.6.0-beta.2 → 1.6.1

package/dist/alipay.js

@@ -20278,13 +20278,21 @@ var TextLayout = /** @class */ (function () {
         this.textAlign = textAlign;
         this.lineHeight = lineHeight;
     }
-    TextLayout.prototype.getOffsetY = function (style, lineCount, lineHeight) {
+    /**
+     * 获取初始的行高偏移值
+     * @param style - 字体基础数据
+     * @param lineCount - 渲染行数
+     * @param lineHeight - 渲染时的字体行高
+     * @param fontSize - 渲染时的字体大小
+     * @returns - 行高偏移值
+     */
+    TextLayout.prototype.getOffsetY = function (style, lineCount, lineHeight, fontSize) {
         var offsetResult = 0;
-        var fontSize = style.fontSize, outlineWidth = style.outlineWidth, fontScale = style.fontScale;
-        // 计算基础偏移量
-        var baseOffset = (fontSize + outlineWidth) * fontScale;
+        var outlineWidth = style.outlineWidth, fontScale = style.fontScale;
         // /3 计算Y轴偏移量，以匹配编辑器行为
         var offsetY = (lineHeight - fontSize) / 3;
+        // 计算基础偏移量
+        var baseOffset = fontSize + outlineWidth * fontScale;
         var commonCalculation = lineHeight * (lineCount - 1);
         switch (this.textBaseline) {
             case TextBaseline$1.top:
@@ -20331,6 +20339,10 @@ var TextItem = /** @class */ (function (_super) {
     function TextItem(props, opts, vfxItem) {
         var _this = _super.call(this, props, opts, vfxItem) || this;
         _this.isDirty = true;
+        /**
+         * 文本行数
+         */
+        _this.lineCount = 0;
         var options = props.options;
         _this.canvas = canvasPool.getCanvas();
         canvasPool.saveCanvas(_this.canvas);
@@ -20339,10 +20351,34 @@ var TextItem = /** @class */ (function (_super) {
         _this.textStyle = new TextStyle(options);
         _this.textLayout = new TextLayout(options);
         _this.text = options.text;
+        _this.lineCount = _this.getLineCount(options.text, true);
         // Text
         _this.mesh = new TextMesh(_this.engine, _this.renderInfo, vfxItem.composition);
         return _this;
     }
+    TextItem.prototype.getLineCount = function (text, init) {
+        var _a, _b;
+        var context = this.context;
+        var letterSpace = this.textLayout.letterSpace;
+        var fontScale = init ? this.textStyle.fontSize / 10 : 1 / this.textStyle.fontScale;
+        var width = (this.textLayout.width + this.textStyle.fontOffset);
+        var lineCount = 1;
+        var x = 0;
+        for (var i = 0; i < text.length; i++) {
+            var str = text[i];
+            var textMetrics = ((_b = (_a = context === null || context === void 0 ? void 0 : context.measureText(str)) === null || _a === void 0 ? void 0 : _a.width) !== null && _b !== void 0 ? _b : 0) * fontScale;
+            // 和浏览器行为保持一致
+            x += letterSpace;
+            if (((x + textMetrics) > width && i > 0) || str === '\n') {
+                lineCount++;
+                x = 0;
+            }
+            if (str !== '\n') {
+                x += textMetrics;
+            }
+        }
+        return lineCount;
+    };
     /**
      * 设置字号大小
      * @param value - 字号
@@ -20392,6 +20428,7 @@ var TextItem = /** @class */ (function (_super) {
             return;
         }
         this.text = value;
+        this.lineCount = this.getLineCount(value, false);
         this.isDirty = true;
     };
     /**
@@ -20542,7 +20579,7 @@ var TextItem = /** @class */ (function (_super) {
         var fontScale = style.fontScale;
         var width = (layout.width + style.fontOffset) * fontScale;
         var height = layout.height * fontScale;
-        style.fontSize * fontScale;
+        var fontSize = style.fontSize * fontScale;
         var lineHeight = layout.lineHeight * fontScale;
         this.char = (this.text || '').split('');
         this.canvas.width = width;
@@ -20563,8 +20600,7 @@ var TextItem = /** @class */ (function (_super) {
         context.fillStyle = "rgba(".concat(style.textColor[0], ", ").concat(style.textColor[1], ", ").concat(style.textColor[2], ", ").concat(style.textColor[3], ")");
         var charsInfo = [];
         var x = 0;
-        var lineCount = this.text.split('\n').length;
-        var y = layout.getOffsetY(style, lineCount, lineHeight);
+        var y = layout.getOffsetY(style, this.lineCount, lineHeight, fontSize);
         var charsArray = [];
         var charOffsetX = [];
         for (var i = 0; i < this.char.length; i++) {
@@ -30996,7 +31032,7 @@ Renderer.create = function (canvas, framework, renderOptions) {
 Engine.create = function (gl) {
     return new GLEngine(gl);
 };
-var version = "1.6.0-beta.2";
+var version = "1.6.1";
 logger.info('player version: ' + version);
 
 exports.AbstractPlugin = AbstractPlugin;