Update tgfx to the lastest version. (#2583)

Tencent · Nov 12, 2024 · 7d78a48 · 7d78a48
1 parent f9bef34
commit 7d78a48
Show file tree

Hide file tree

Showing 8 changed files with 2,778 additions and 2,791 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -226,6 +226,7 @@ if (WEB)
         file(GLOB_RECURSE PLATFORM_FILES src/platform/web/*.*)
         list(APPEND PAG_FILES ${PLATFORM_FILES})
     endif ()
+    list(APPEND PAG_COMPILE_OPTIONS -fno-rtti -DEMSCRIPTEN_HAS_UNBOUND_TYPE_NAMES=0)
 elseif (IOS)
     # finds all required platform libraries.
     find_library(UIKit_LIBS UIKit REQUIRED)

diff --git a/DEPS b/DEPS
@@ -7,12 +7,12 @@
     "common": [
       {
         "url": "${PAG_GROUP}/vendor_tools.git",
-        "commit": "ce1f4d55330727eb3f02595999c1a1b4fab23ebf",
+        "commit": "b3125b9cf13bcc70e63212de1d0ed95e7beaa2a9",
         "dir": "third_party/vendor_tools"
       },
       {
         "url": "${PAG_GROUP}/tgfx.git",
-        "commit": "57dea46bc27c4815af6fcb14d47eb5faa9cfe360",
+        "commit": "0ee494ab8246bb051e66b4681832ebcac18b8e39",
         "dir": "third_party/tgfx"
       },
       {

diff --git a/src/base/utils/TGFXCast.cpp b/src/base/utils/TGFXCast.cpp
@@ -36,7 +36,7 @@ static constexpr std::pair<Enum, tgfx::BlendMode> BlendModeMap[] = {
     {BlendMode::Saturation, tgfx::BlendMode::Saturation},
     {BlendMode::Color, tgfx::BlendMode::Color},
     {BlendMode::Luminosity, tgfx::BlendMode::Luminosity},
-    {BlendMode::Add, tgfx::BlendMode::Plus}};
+    {BlendMode::Add, tgfx::BlendMode::PlusLighter}};
 
 tgfx::BlendMode ToTGFXBlend(Enum blendMode) {
   for (const auto& pair : BlendModeMap) {

diff --git a/src/rendering/graphics/Text.cpp b/src/rendering/graphics/Text.cpp
@@ -161,9 +161,8 @@ static void ApplyPaintToPath(const tgfx::Paint& paint, tgfx::Path* path) {
     return;
   }
   auto strokePath = *path;
-  auto strokeEffect = tgfx::PathEffect::MakeStroke(paint.getStroke());
-  if (strokeEffect) {
-    strokeEffect->applyTo(&strokePath);
+  if (const auto stroke = paint.getStroke()) {
+    stroke->applyToPath(&strokePath);
   }
   *path = strokePath;
 }

diff --git a/src/rendering/renderers/ShapeRenderer.cpp b/src/rendering/renderers/ShapeRenderer.cpp
@@ -635,7 +635,7 @@ void ApplyRoundCorners(RoundCornersElement* roundCorners, const tgfx::Matrix& pa
     return;
   }
   for (auto& path : pathList) {
-    effect->applyTo(path);
+    effect->filterPath(path);
   }
 }
 
@@ -828,21 +828,6 @@ std::unique_ptr<tgfx::PathEffect> CreateDashEffect(const std::vector<float>& das
 }
 
 void ApplyStrokeToPath(tgfx::Path* path, const StrokePaint& stroke) {
-  std::vector<std::unique_ptr<tgfx::PathEffect>> effects;
-  if (!stroke.dashes.empty()) {
-    auto dashEffect = CreateDashEffect(stroke.dashes, stroke.dashOffset);
-    if (dashEffect) {
-      effects.emplace_back(std::move(dashEffect));
-    }
-  }
-  auto strokeData = stroke.getStroke();
-  auto strokeEffect = tgfx::PathEffect::MakeStroke(&strokeData);
-  if (strokeEffect) {
-    effects.emplace_back(std::move(strokeEffect));
-  }
-  if (effects.empty()) {
-    return;
-  }
   auto applyMatrix = false;
   if (!stroke.matrix.isIdentity()) {
     auto matrix = tgfx::Matrix::I();
@@ -851,9 +836,14 @@ void ApplyStrokeToPath(tgfx::Path* path, const StrokePaint& stroke) {
       applyMatrix = true;
     }
   }
-  for (const auto& effect : effects) {
-    effect->applyTo(path);
+  if (!stroke.dashes.empty()) {
+    auto dashEffect = CreateDashEffect(stroke.dashes, stroke.dashOffset);
+    if (dashEffect) {
+      dashEffect->filterPath(path);
+    }
   }
+  auto strokeData = stroke.getStroke();
+  strokeData.applyToPath(path);
   if (applyMatrix) {
     path->transform(stroke.matrix);
   }

diff --git a/src/rendering/renderers/TextRenderer.cpp b/src/rendering/renderers/TextRenderer.cpp
@@ -463,7 +463,7 @@ std::shared_ptr<Graphic> RenderTextBackground(ID assetID,
   }
   auto effect = tgfx::PathEffect::MakeCorner(maxRadius);
   if (effect) {
-    effect->applyTo(&backgroundPath);
+    effect->filterPath(&backgroundPath);
   }
   auto graphic = Shape::MakeFrom(assetID, backgroundPath, ToTGFX(textDocument->backgroundColor));
   auto modifier =

diff --git a/src/rendering/utils/PathUtil.cpp b/src/rendering/utils/PathUtil.cpp
@@ -70,10 +70,7 @@ void ExpandPath(tgfx::Path* path, float expansion) {
   }
   auto strokePath = *path;
   tgfx::Stroke stroke(fabsf(expansion) * 2, tgfx::LineCap::Butt, tgfx::LineJoin::Round);
-  auto effect = tgfx::PathEffect::MakeStroke(&stroke);
-  if (effect) {
-    effect->applyTo(&strokePath);
-  }
+  stroke.applyToPath(&strokePath);
   if (expansion < 0) {
     path->addPath(strokePath, tgfx::PathOp::Difference);
   } else {