summaryrefslogtreecommitdiffstats
path: root/modules/text_server_adv
diff options
context:
space:
mode:
authorMartin Capitanio <capnm@capitanio.org>2023-09-29 14:58:36 +0200
committerMartin Capitanio <capnm@capitanio.org>2023-09-29 19:50:19 +0200
commitaab650f2ef97915e22312e5da543e01989bbfd76 (patch)
tree847d2e5c6033ab1d06122c57beefa6dc6c019aad /modules/text_server_adv
parent19890614c6a78ec36030ce65c7da05f07fcdb9ed (diff)
downloadredot-engine-aab650f2ef97915e22312e5da543e01989bbfd76.tar.gz
ThorVG: update to v0.11.0 release.
See https://github.com/thorvg/thorvg/releases/tag/v0.11.0 + Infrastructure Repository folder structure was make it more intuitive and coherent. "thorvg/src/lib" -> "thorvg/src/common" (providing essential common functionalities used internally among the renderer and sub-modules) "thorvg/src/lib" -> "thorvg/src/renderer" (for vector drawing features) + SVG related Fix stroke regression https://github.com/thorvg/thorvg/issues/1670 Support stroke dash offset function https://github.com/thorvg/thorvg/issues/1591#issuecomment-1681319321 Support Focal property in Radial Gradient https://github.com/thorvg/thorvg/issues/1558
Diffstat (limited to 'modules/text_server_adv')
-rw-r--r--modules/text_server_adv/SCsub6
-rw-r--r--modules/text_server_adv/gdextension_build/SConstruct73
2 files changed, 44 insertions, 35 deletions
diff --git a/modules/text_server_adv/SCsub b/modules/text_server_adv/SCsub
index 1acff68135..3c468e61d7 100644
--- a/modules/text_server_adv/SCsub
+++ b/modules/text_server_adv/SCsub
@@ -40,7 +40,11 @@ msdfgen_enabled = "msdfgen" in env.module_list
if "svg" in env.module_list:
env_text_server_adv.Prepend(
- CPPPATH=["#thirdparty/thorvg/inc", "#thirdparty/thorvg/src/lib", "#thirdparty/thorvg/src/utils"]
+ CPPPATH=[
+ "#thirdparty/thorvg/inc",
+ "#thirdparty/thorvg/src/common",
+ "#thirdparty/thorvg/src/renderer",
+ ]
)
# Enable ThorVG static object linking.
env_text_server_adv.Append(CPPDEFINES=["TVG_STATIC"])
diff --git a/modules/text_server_adv/gdextension_build/SConstruct b/modules/text_server_adv/gdextension_build/SConstruct
index bf29ad3016..b95c35f80d 100644
--- a/modules/text_server_adv/gdextension_build/SConstruct
+++ b/modules/text_server_adv/gdextension_build/SConstruct
@@ -42,51 +42,56 @@ if env["thorvg_enabled"] and env["freetype_enabled"]:
thirdparty_tvg_dir = "../../../thirdparty/thorvg/"
thirdparty_tvg_sources = [
- "src/lib/sw_engine/tvgSwFill.cpp",
- "src/lib/sw_engine/tvgSwImage.cpp",
- "src/lib/sw_engine/tvgSwMath.cpp",
- "src/lib/sw_engine/tvgSwMemPool.cpp",
- "src/lib/sw_engine/tvgSwRaster.cpp",
- "src/lib/sw_engine/tvgSwRenderer.cpp",
- "src/lib/sw_engine/tvgSwRle.cpp",
- "src/lib/sw_engine/tvgSwShape.cpp",
- "src/lib/sw_engine/tvgSwStroke.cpp",
- "src/lib/tvgAccessor.cpp",
- "src/lib/tvgCanvas.cpp",
- "src/lib/tvgFill.cpp",
- "src/lib/tvgGlCanvas.cpp",
- "src/lib/tvgInitializer.cpp",
- "src/lib/tvgLoader.cpp",
- "src/lib/tvgPaint.cpp",
- "src/lib/tvgPicture.cpp",
- "src/lib/tvgRender.cpp",
- "src/lib/tvgSaver.cpp",
- "src/lib/tvgScene.cpp",
- "src/lib/tvgShape.cpp",
- "src/lib/tvgSwCanvas.cpp",
- "src/lib/tvgTaskScheduler.cpp",
- "src/utils/tvgBezier.cpp",
- "src/utils/tvgCompressor.cpp",
- "src/utils/tvgStr.cpp",
- "src/loaders/raw/tvgRawLoader.cpp",
+ # common
+ "src/common/tvgBezier.cpp",
+ "src/common/tvgCompressor.cpp",
+ "src/common/tvgMath.cpp",
+ "src/common/tvgStr.cpp",
+ # SVG parser
"src/loaders/svg/tvgSvgCssStyle.cpp",
"src/loaders/svg/tvgSvgLoader.cpp",
"src/loaders/svg/tvgSvgPath.cpp",
"src/loaders/svg/tvgSvgSceneBuilder.cpp",
"src/loaders/svg/tvgSvgUtil.cpp",
"src/loaders/svg/tvgXmlParser.cpp",
+ "src/loaders/raw/tvgRawLoader.cpp",
+ # renderer common
+ "src/renderer/tvgAccessor.cpp",
+ # "src/renderer/tvgAnimation.cpp",
+ "src/renderer/tvgCanvas.cpp",
+ "src/renderer/tvgFill.cpp",
+ # "src/renderer/tvgGlCanvas.cpp",
+ "src/renderer/tvgInitializer.cpp",
+ "src/renderer/tvgLoader.cpp",
+ "src/renderer/tvgPaint.cpp",
+ "src/renderer/tvgPicture.cpp",
+ "src/renderer/tvgRender.cpp",
+ # "src/renderer/tvgSaver.cpp",
+ "src/renderer/tvgScene.cpp",
+ "src/renderer/tvgShape.cpp",
+ "src/renderer/tvgSwCanvas.cpp",
+ "src/renderer/tvgTaskScheduler.cpp",
+ # renderer sw_engine
+ "src/renderer/sw_engine/tvgSwFill.cpp",
+ "src/renderer/sw_engine/tvgSwImage.cpp",
+ "src/renderer/sw_engine/tvgSwMath.cpp",
+ "src/renderer/sw_engine/tvgSwMemPool.cpp",
+ "src/renderer/sw_engine/tvgSwRaster.cpp",
+ "src/renderer/sw_engine/tvgSwRenderer.cpp",
+ "src/renderer/sw_engine/tvgSwRle.cpp",
+ "src/renderer/sw_engine/tvgSwShape.cpp",
+ "src/renderer/sw_engine/tvgSwStroke.cpp",
]
thirdparty_tvg_sources = [thirdparty_tvg_dir + file for file in thirdparty_tvg_sources]
env_tvg.Append(
CPPPATH=[
"../../../thirdparty/thorvg/inc",
- "../../../thirdparty/thorvg/src/lib",
- "../../../thirdparty/thorvg/src/lib/sw_engine",
- "../../../thirdparty/thorvg/src/loaders/raw",
+ "../../../thirdparty/thorvg/src/common",
"../../../thirdparty/thorvg/src/loaders/svg",
- "../../../thirdparty/thorvg/src/utils",
- "../../../thirdparty/libpng",
+ "../../../thirdparty/thorvg/src/loaders/raw",
+ "../../../thirdparty/thorvg/src/renderer",
+ "../../../thirdparty/thorvg/src/renderer/sw_engine",
]
)
@@ -96,8 +101,8 @@ if env["thorvg_enabled"] and env["freetype_enabled"]:
env.Append(
CPPPATH=[
"../../../thirdparty/thorvg/inc",
- "../../../thirdparty/thorvg/src/lib",
- "../../../thirdparty/thorvg/src/utils",
+ "../../../thirdparty/thorvg/src/common",
+ "../../../thirdparty/thorvg/src/renderer",
]
)
env.Append(CPPDEFINES=["MODULE_SVG_ENABLED"])