Fix text renderer wrap error (#1914)

* fix(text): fix wrap error

Author: singlecoder

packages/core/src/2d/text/TextUtils.ts

@@ -215,8 +215,8 @@ export class TextUtils {
           } else {
             word += char;
             wordWidth += charInfo.xAdvance;
-            wordMaxAscent = lineMaxAscent = Math.max(wordMaxAscent, ascent);
-            wordMaxDescent = lineMaxDescent = Math.max(wordMaxDescent, descent);
+            wordMaxAscent = Math.max(wordMaxAscent, ascent);
+            wordMaxDescent = Math.max(wordMaxDescent, descent);
           }
         }
       }

tests/src/core/2d/text/TextUtils.test.ts

@@ -8,8 +8,12 @@ describe("TextUtils", () => {
   let scene: Scene;
   let textEntity1: Entity;
   let textEntity2: Entity;
+  let textEntity3: Entity;
+  let textEntity4: Entity;
   let textRendererTruncate: TextRenderer;
   let textRendererOverflow: TextRenderer;
+  let wrap1TextRenderer: TextRenderer;
+  let wrap2TextRenderer: TextRenderer;
 
   before(async function () {
     engine = await WebGLEngine.create({
@@ -29,13 +33,20 @@ describe("TextUtils", () => {
 
     textEntity1 = rootEntity.createChild("text1");
     textEntity2 = rootEntity.createChild("text2");
+    textEntity3 = rootEntity.createChild("text3");
+    textEntity4 = rootEntity.createChild("text4");
 
     textRendererTruncate = textEntity1.addComponent(TextRenderer);
     textRendererTruncate.font = Font.createFromOS(engine, "Arial");
 
     textRendererOverflow = textEntity2.addComponent(TextRenderer);
     textRendererOverflow.font = Font.createFromOS(engine, "Arial");
 
+    wrap1TextRenderer = textEntity3.addComponent(TextRenderer);
+    wrap1TextRenderer.font = Font.createFromOS(engine, "Arial");
+    wrap2TextRenderer = textEntity4.addComponent(TextRenderer);
+    wrap2TextRenderer.font = Font.createFromOS(engine, "Arial");
+
     engine.run();
   });
 
@@ -200,6 +211,18 @@ describe("TextUtils", () => {
     expect(result.height).to.be.equal(162);
     expect(result.lines).to.be.deep.equal(["  ", "  ", "W", "o", "rl", "d"]);
     expect(result.lineHeight).to.be.equal(27);
+
+    wrap1TextRenderer.enableWrapping = true;
+    wrap1TextRenderer.width = 5;
+    wrap1TextRenderer.fontSize = 60;
+    wrap1TextRenderer.text = "测试";
+    const text1Metrics = TextUtils.measureTextWithWrap(wrap1TextRenderer);
+    wrap2TextRenderer.enableWrapping = true;
+    wrap2TextRenderer.width = 5;
+    wrap2TextRenderer.fontSize = 60;
+    wrap2TextRenderer.text = "测试。";
+    const text2Metrics = TextUtils.measureTextWithWrap(wrap2TextRenderer);
+    expect(text1Metrics.lineMaxSizes[0].size).to.be.equal(text2Metrics.lineMaxSizes[0].size);
   });
 
   it("measureTextWithoutWrap", () => {