From 6aac6320dee267d69bc49a82139fbd2368f00288 Mon Sep 17 00:00:00 2001 From: Martin Capitanio Date: Fri, 29 Sep 2023 14:58:36 +0200 Subject: [PATCH] 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 --- modules/svg/SCsub | 71 ++++++------ modules/text_server_adv/SCsub | 6 +- .../gdextension_build/SConstruct | 76 +++++++------ modules/text_server_fb/SCsub | 2 +- .../gdextension_build/SConstruct | 76 +++++++------ thirdparty/README.md | 2 +- thirdparty/thorvg/AUTHORS | 2 + thirdparty/thorvg/inc/config.h | 6 +- thirdparty/thorvg/inc/thorvg.h | 34 ++---- .../thorvg/src/{utils => common}/tvgArray.h | 33 ++++++ .../src/{utils => common}/tvgBezier.cpp | 0 .../thorvg/src/{utils => common}/tvgBezier.h | 0 .../src/{utils => common}/tvgCompressor.cpp | 0 .../src/{utils => common}/tvgCompressor.h | 0 thirdparty/thorvg/src/common/tvgList.h | 90 +++++++++++++++ thirdparty/thorvg/src/common/tvgMath.cpp | 102 +++++++++++++++++ .../thorvg/src/{utils => common}/tvgMath.h | 84 ++------------ .../thorvg/src/{utils => common}/tvgStr.cpp | 0 .../thorvg/src/{utils => common}/tvgStr.h | 0 .../thorvg/src/loaders/svg/tvgSvgLoader.cpp | 65 ++++++----- .../thorvg/src/loaders/svg/tvgSvgLoader.h | 2 +- .../src/loaders/svg/tvgSvgLoaderCommon.h | 1 + .../src/loaders/svg/tvgSvgSceneBuilder.cpp | 107 +++++++----------- .../thorvg/src/loaders/svg/tvgSvgUtil.cpp | 21 ++-- .../thorvg/src/loaders/svg/tvgSvgUtil.h | 2 +- .../{lib => renderer}/sw_engine/tvgSwCommon.h | 3 + .../{lib => renderer}/sw_engine/tvgSwFill.cpp | 0 .../sw_engine/tvgSwImage.cpp | 2 +- .../{lib => renderer}/sw_engine/tvgSwMath.cpp | 0 .../sw_engine/tvgSwMemPool.cpp | 75 ++++++------ .../sw_engine/tvgSwRaster.cpp | 4 +- .../sw_engine/tvgSwRasterAvx.h | 0 .../sw_engine/tvgSwRasterC.h | 0 .../sw_engine/tvgSwRasterNeon.h | 0 .../sw_engine/tvgSwRasterTexmap.h | 0 .../sw_engine/tvgSwRenderer.cpp | 12 +- .../sw_engine/tvgSwRenderer.h | 0 .../{lib => renderer}/sw_engine/tvgSwRle.cpp | 0 .../sw_engine/tvgSwShape.cpp | 27 ++--- .../sw_engine/tvgSwStroke.cpp | 4 + .../src/{lib => renderer}/tvgAccessor.cpp | 0 .../src/{lib => renderer}/tvgAnimation.cpp | 7 +- .../src/{lib => renderer}/tvgBinaryDesc.h | 5 +- .../src/{lib => renderer}/tvgCanvas.cpp | 2 +- .../tvgCanvasImpl.h => renderer/tvgCanvas.h} | 16 +-- .../thorvg/src/{lib => renderer}/tvgCommon.h | 0 .../thorvg/src/{lib => renderer}/tvgFill.cpp | 0 .../thorvg/src/{lib => renderer}/tvgFill.h | 0 .../src/{lib => renderer}/tvgFrameModule.h | 0 .../src/{lib => renderer}/tvgGlCanvas.cpp | 2 +- .../src/{lib => renderer}/tvgInitializer.cpp | 0 .../{lib => renderer}/tvgIteratorAccessor.h | 0 .../src/{lib => renderer}/tvgLoadModule.h | 0 .../src/{lib => renderer}/tvgLoader.cpp | 2 +- .../thorvg/src/{lib => renderer}/tvgLoader.h | 0 .../thorvg/src/{lib => renderer}/tvgPaint.cpp | 2 +- .../thorvg/src/{lib => renderer}/tvgPaint.h | 5 +- .../src/{lib => renderer}/tvgPicture.cpp | 52 ++++++--- .../tvgPicture.h} | 47 +++----- .../src/{lib => renderer}/tvgRender.cpp | 7 +- .../thorvg/src/{lib => renderer}/tvgRender.h | 0 .../src/{lib => renderer}/tvgSaveModule.h | 0 .../thorvg/src/{lib => renderer}/tvgSaver.cpp | 0 .../thorvg/src/{lib => renderer}/tvgScene.cpp | 3 +- .../tvgSceneImpl.h => renderer/tvgScene.h} | 8 +- .../thorvg/src/{lib => renderer}/tvgShape.cpp | 2 +- .../tvgShapeImpl.h => renderer/tvgShape.h} | 0 .../src/{lib => renderer}/tvgSwCanvas.cpp | 2 +- .../{lib => renderer}/tvgTaskScheduler.cpp | 0 .../src/{lib => renderer}/tvgTaskScheduler.h | 0 thirdparty/thorvg/update-thorvg.sh | 38 +++++-- 71 files changed, 639 insertions(+), 470 deletions(-) rename thirdparty/thorvg/src/{utils => common}/tvgArray.h (78%) rename thirdparty/thorvg/src/{utils => common}/tvgBezier.cpp (100%) rename thirdparty/thorvg/src/{utils => common}/tvgBezier.h (100%) rename thirdparty/thorvg/src/{utils => common}/tvgCompressor.cpp (100%) rename thirdparty/thorvg/src/{utils => common}/tvgCompressor.h (100%) create mode 100644 thirdparty/thorvg/src/common/tvgList.h create mode 100644 thirdparty/thorvg/src/common/tvgMath.cpp rename thirdparty/thorvg/src/{utils => common}/tvgMath.h (63%) rename thirdparty/thorvg/src/{utils => common}/tvgStr.cpp (100%) rename thirdparty/thorvg/src/{utils => common}/tvgStr.h (100%) rename thirdparty/thorvg/src/{lib => renderer}/sw_engine/tvgSwCommon.h (99%) rename thirdparty/thorvg/src/{lib => renderer}/sw_engine/tvgSwFill.cpp (100%) rename thirdparty/thorvg/src/{lib => renderer}/sw_engine/tvgSwImage.cpp (99%) rename thirdparty/thorvg/src/{lib => renderer}/sw_engine/tvgSwMath.cpp (100%) rename thirdparty/thorvg/src/{lib => renderer}/sw_engine/tvgSwMemPool.cpp (73%) rename thirdparty/thorvg/src/{lib => renderer}/sw_engine/tvgSwRaster.cpp (99%) rename thirdparty/thorvg/src/{lib => renderer}/sw_engine/tvgSwRasterAvx.h (100%) rename thirdparty/thorvg/src/{lib => renderer}/sw_engine/tvgSwRasterC.h (100%) rename thirdparty/thorvg/src/{lib => renderer}/sw_engine/tvgSwRasterNeon.h (100%) rename thirdparty/thorvg/src/{lib => renderer}/sw_engine/tvgSwRasterTexmap.h (100%) rename thirdparty/thorvg/src/{lib => renderer}/sw_engine/tvgSwRenderer.cpp (98%) rename thirdparty/thorvg/src/{lib => renderer}/sw_engine/tvgSwRenderer.h (100%) rename thirdparty/thorvg/src/{lib => renderer}/sw_engine/tvgSwRle.cpp (100%) rename thirdparty/thorvg/src/{lib => renderer}/sw_engine/tvgSwShape.cpp (97%) rename thirdparty/thorvg/src/{lib => renderer}/sw_engine/tvgSwStroke.cpp (99%) rename thirdparty/thorvg/src/{lib => renderer}/tvgAccessor.cpp (100%) rename thirdparty/thorvg/src/{lib => renderer}/tvgAnimation.cpp (94%) rename thirdparty/thorvg/src/{lib => renderer}/tvgBinaryDesc.h (95%) rename thirdparty/thorvg/src/{lib => renderer}/tvgCanvas.cpp (98%) rename thirdparty/thorvg/src/{lib/tvgCanvasImpl.h => renderer/tvgCanvas.h} (93%) rename thirdparty/thorvg/src/{lib => renderer}/tvgCommon.h (100%) rename thirdparty/thorvg/src/{lib => renderer}/tvgFill.cpp (100%) rename thirdparty/thorvg/src/{lib => renderer}/tvgFill.h (100%) rename thirdparty/thorvg/src/{lib => renderer}/tvgFrameModule.h (100%) rename thirdparty/thorvg/src/{lib => renderer}/tvgGlCanvas.cpp (99%) rename thirdparty/thorvg/src/{lib => renderer}/tvgInitializer.cpp (100%) rename thirdparty/thorvg/src/{lib => renderer}/tvgIteratorAccessor.h (100%) rename thirdparty/thorvg/src/{lib => renderer}/tvgLoadModule.h (100%) rename thirdparty/thorvg/src/{lib => renderer}/tvgLoader.cpp (98%) rename thirdparty/thorvg/src/{lib => renderer}/tvgLoader.h (100%) rename thirdparty/thorvg/src/{lib => renderer}/tvgPaint.cpp (99%) rename thirdparty/thorvg/src/{lib => renderer}/tvgPaint.h (98%) rename thirdparty/thorvg/src/{lib => renderer}/tvgPicture.cpp (75%) rename thirdparty/thorvg/src/{lib/tvgPictureImpl.h => renderer/tvgPicture.h} (91%) rename thirdparty/thorvg/src/{lib => renderer}/tvgRender.cpp (90%) rename thirdparty/thorvg/src/{lib => renderer}/tvgRender.h (100%) rename thirdparty/thorvg/src/{lib => renderer}/tvgSaveModule.h (100%) rename thirdparty/thorvg/src/{lib => renderer}/tvgSaver.cpp (100%) rename thirdparty/thorvg/src/{lib => renderer}/tvgScene.cpp (98%) rename thirdparty/thorvg/src/{lib/tvgSceneImpl.h => renderer/tvgScene.h} (96%) rename thirdparty/thorvg/src/{lib => renderer}/tvgShape.cpp (99%) rename thirdparty/thorvg/src/{lib/tvgShapeImpl.h => renderer/tvgShape.h} (100%) rename thirdparty/thorvg/src/{lib => renderer}/tvgSwCanvas.cpp (99%) rename thirdparty/thorvg/src/{lib => renderer}/tvgTaskScheduler.cpp (100%) rename thirdparty/thorvg/src/{lib => renderer}/tvgTaskScheduler.h (100%) diff --git a/modules/svg/SCsub b/modules/svg/SCsub index 55b8c4f4a0506d..a99bc8df60cce1 100644 --- a/modules/svg/SCsub +++ b/modules/svg/SCsub @@ -11,39 +11,45 @@ thirdparty_obj = [] thirdparty_dir = "#thirdparty/thorvg/" thirdparty_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_sources = [thirdparty_dir + file for file in thirdparty_sources] @@ -57,16 +63,13 @@ env_thirdparty = env_svg.Clone() env_thirdparty.disable_warnings() env_thirdparty.Prepend( CPPPATH=[ - thirdparty_dir + "src/lib", - thirdparty_dir + "src/lib/sw_engine", - thirdparty_dir + "src/loaders/raw", + thirdparty_dir + "src/common", thirdparty_dir + "src/loaders/svg", - thirdparty_dir + "src/utils", + thirdparty_dir + "src/renderer", + thirdparty_dir + "src/renderer/sw_engine", + thirdparty_dir + "src/loaders/raw", ] ) -# Also requires libpng headers -if env["builtin_libpng"]: - env_thirdparty.Prepend(CPPPATH=["#thirdparty/libpng"]) env_thirdparty.add_source_files(thirdparty_obj, thirdparty_sources) env.modules_sources += thirdparty_obj diff --git a/modules/text_server_adv/SCsub b/modules/text_server_adv/SCsub index 1acff681358d90..3c468e61d7cd36 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 bf29ad3016f0df..d7894d38b56957 100644 --- a/modules/text_server_adv/gdextension_build/SConstruct +++ b/modules/text_server_adv/gdextension_build/SConstruct @@ -42,51 +42,59 @@ 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 +104,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"]) diff --git a/modules/text_server_fb/SCsub b/modules/text_server_fb/SCsub index 8705bc430d7a46..e808864512b670 100644 --- a/modules/text_server_fb/SCsub +++ b/modules/text_server_fb/SCsub @@ -10,7 +10,7 @@ env_text_server_fb = env_modules.Clone() if "svg" in env.module_list: env_text_server_fb.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_fb.Append(CPPDEFINES=["TVG_STATIC"]) diff --git a/modules/text_server_fb/gdextension_build/SConstruct b/modules/text_server_fb/gdextension_build/SConstruct index 40bb2dc1b9162b..150e596d589ad8 100644 --- a/modules/text_server_fb/gdextension_build/SConstruct +++ b/modules/text_server_fb/gdextension_build/SConstruct @@ -37,51 +37,59 @@ 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", ] ) @@ -91,8 +99,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"]) diff --git a/thirdparty/README.md b/thirdparty/README.md index 9fc9106170c87f..7b2b20ec8436f1 100644 --- a/thirdparty/README.md +++ b/thirdparty/README.md @@ -784,7 +784,7 @@ instead of `miniz.h` as an external dependency. ## thorvg - Upstream: https://github.com/thorvg/thorvg -- Version: 0.10.7 (026ff4ce7eda10dd0cf80eeaef56fe3a5ed89f93, 2023) +- Version: 0.11.0 (12260198d12719ea20939b68492accfc155d9ff5, 2023) - License: MIT Files extracted from upstream source: diff --git a/thirdparty/thorvg/AUTHORS b/thirdparty/thorvg/AUTHORS index da15a2a024c76d..3a459e9bb494e7 100644 --- a/thirdparty/thorvg/AUTHORS +++ b/thirdparty/thorvg/AUTHORS @@ -21,3 +21,5 @@ EunSik Jeong Samsung Electronics Co., Ltd Rafał Mikrut Martin Capitanio +RuiwenTang +YouJin Lee diff --git a/thirdparty/thorvg/inc/config.h b/thirdparty/thorvg/inc/config.h index b2efe3def34660..735b4df9da7bfa 100644 --- a/thirdparty/thorvg/inc/config.h +++ b/thirdparty/thorvg/inc/config.h @@ -2,8 +2,10 @@ #define THORVG_CONFIG_H #define THORVG_SW_RASTER_SUPPORT - #define THORVG_SVG_LOADER_SUPPORT -#define THORVG_VERSION_STRING "0.10.7" +// For internal debugging: +//#define THORVG_LOG_ENABLED + +#define THORVG_VERSION_STRING "0.11.0" #endif diff --git a/thirdparty/thorvg/inc/thorvg.h b/thirdparty/thorvg/inc/thorvg.h index a5efc5ec17f3ad..1b9c2d70d3398f 100644 --- a/thirdparty/thorvg/inc/thorvg.h +++ b/thirdparty/thorvg/inc/thorvg.h @@ -171,7 +171,7 @@ enum class CompositeMethod AlphaMask, ///< Alpha Masking using the compositing target's pixels as an alpha value. InvAlphaMask, ///< Alpha Masking using the complement to the compositing target's pixels as an alpha value. LumaMask, ///< Alpha Masking using the grayscale (0.2125R + 0.7154G + 0.0721*B) of the compositing target's pixels. @since 0.9 - InvLumaMask, ///< Alpha Masking using the grayscale (0.2125R + 0.7154G + 0.0721*B) of the complement to the compositing target's pixels. @BETA_API + InvLumaMask, ///< Alpha Masking using the grayscale (0.2125R + 0.7154G + 0.0721*B) of the complement to the compositing target's pixels. AddMask, ///< Combines the target and source objects pixels using target alpha. (T * TA) + (S * (255 - TA)) @BETA_API SubtractMask, ///< Subtracts the source color from the target color while considering their respective target alpha. (T * TA) - (S * (255 - TA)) @BETA_API IntersectMask, ///< Computes the result by taking the minimum value between the target alpha and the source alpha and multiplies it with the target color. (T * min(TA, SA)) @BETA_API @@ -240,6 +240,7 @@ struct Matrix float e31, e32, e33; }; + /** * @brief A data structure representing a texture mesh vertex * @@ -622,14 +623,16 @@ class TVG_API Canvas virtual Result push(std::unique_ptr paint) noexcept; /** - * @brief Sets the total number of the paints pushed into the canvas to be zero. - * Depending on the value of the @p free argument, the paints are freed or not. + * @brief Clear the internal canvas resources that used for the drawing. + * + * This API sets the total number of paints pushed into the canvas to zero. + * Depending on the value of the @p free argument, the paints are either freed or retained. + * So if you need to update paint properties while maintaining the existing scene structure, you can set @p free = false. * * @param[in] free If @c true, the memory occupied by paints is deallocated, otherwise it is not. * * @return Result::Success when succeed, Result::InsufficientCondition otherwise. * - * @warning If you don't free the paints they become dangled. They are supposed to be reused, otherwise you are responsible for their lives. Thus please use the @p free argument only when you know how it works, otherwise it's not recommended. * @see Canvas::push() * @see Canvas::paints() */ @@ -818,7 +821,7 @@ class TVG_API Shape final : public Paint /** * @brief Resets the properties of the shape path. * - * The color, the fill and the stroke properties are retained. + * The transformation matrix, the color, the fill and the stroke properties are retained. * * @return Result::Success when succeed. * @@ -1038,7 +1041,7 @@ class TVG_API Shape final : public Paint * * @return Result::Success when succeed, Result::NonSupport unsupported value, Result::FailedAllocation otherwise. * - * @BETA_API + * @since 0.11 */ Result strokeMiterlimit(float miterlimit) noexcept; @@ -1192,7 +1195,7 @@ class TVG_API Shape final : public Paint * * @return The stroke miterlimit value when succeed, 4 if no stroke was set. * - * @BETA_API + * @since 0.11 */ float strokeMiterlimit() const noexcept; @@ -1306,17 +1309,6 @@ class TVG_API Picture final : public Paint */ Result size(float* w, float* h) const noexcept; - /** - * @brief Gets the pixels information of the picture. - * - * @note The data must be pre-multiplied by the alpha channels. - * - * @warning Please do not use it, this API is not official one. It could be modified in the next version. - * - * @BETA_API - */ - const uint32_t* data(uint32_t* w, uint32_t* h) const noexcept; - /** * @brief Loads a raw data from a memory block with a given size. * @@ -1863,8 +1855,7 @@ class TVG_API Accessor final /** * @brief The cast() function is a utility function used to cast a 'Paint' to type 'T'. - * - * @BETA_API + * @since 0.11 */ template std::unique_ptr cast(Paint* paint) @@ -1875,8 +1866,7 @@ std::unique_ptr cast(Paint* paint) /** * @brief The cast() function is a utility function used to cast a 'Fill' to type 'T'. - * - * @BETA_API + * @since 0.11 */ template std::unique_ptr cast(Fill* fill) diff --git a/thirdparty/thorvg/src/utils/tvgArray.h b/thirdparty/thorvg/src/common/tvgArray.h similarity index 78% rename from thirdparty/thorvg/src/utils/tvgArray.h rename to thirdparty/thorvg/src/common/tvgArray.h index 919da7e108f04c..08eb25329cf797 100644 --- a/thirdparty/thorvg/src/utils/tvgArray.h +++ b/thirdparty/thorvg/src/common/tvgArray.h @@ -24,6 +24,7 @@ #define _TVG_ARRAY_H_ #include +#include namespace tvg { @@ -135,6 +136,12 @@ struct Array return count == 0; } + template + void sort() + { + qsort(data, 0, static_cast(count) - 1); + } + void operator=(const Array& rhs) { reserve(rhs.count); @@ -146,6 +153,32 @@ struct Array { free(data); } + +private: + template + void qsort(T* arr, int32_t low, int32_t high) + { + if (low < high) { + int32_t i = low; + int32_t j = high; + T tmp = arr[low]; + while (i < j) { + while (i < j && !COMPARE{}(arr[j], tmp)) --j; + if (i < j) { + arr[i] = arr[j]; + ++i; + } + while (i < j && COMPARE{}(arr[i], tmp)) ++i; + if (i < j) { + arr[j] = arr[i]; + --j; + } + } + arr[i] = tmp; + qsort(arr, low, i - 1); + qsort(arr, i + 1, high); + } + } }; } diff --git a/thirdparty/thorvg/src/utils/tvgBezier.cpp b/thirdparty/thorvg/src/common/tvgBezier.cpp similarity index 100% rename from thirdparty/thorvg/src/utils/tvgBezier.cpp rename to thirdparty/thorvg/src/common/tvgBezier.cpp diff --git a/thirdparty/thorvg/src/utils/tvgBezier.h b/thirdparty/thorvg/src/common/tvgBezier.h similarity index 100% rename from thirdparty/thorvg/src/utils/tvgBezier.h rename to thirdparty/thorvg/src/common/tvgBezier.h diff --git a/thirdparty/thorvg/src/utils/tvgCompressor.cpp b/thirdparty/thorvg/src/common/tvgCompressor.cpp similarity index 100% rename from thirdparty/thorvg/src/utils/tvgCompressor.cpp rename to thirdparty/thorvg/src/common/tvgCompressor.cpp diff --git a/thirdparty/thorvg/src/utils/tvgCompressor.h b/thirdparty/thorvg/src/common/tvgCompressor.h similarity index 100% rename from thirdparty/thorvg/src/utils/tvgCompressor.h rename to thirdparty/thorvg/src/common/tvgCompressor.h diff --git a/thirdparty/thorvg/src/common/tvgList.h b/thirdparty/thorvg/src/common/tvgList.h new file mode 100644 index 00000000000000..01e87a840fa535 --- /dev/null +++ b/thirdparty/thorvg/src/common/tvgList.h @@ -0,0 +1,90 @@ +/* + * Copyright (c) 2023 the ThorVG project. All rights reserved. + + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +#ifndef _TVG_LIST_H_ +#define _TVG_LIST_H_ + +namespace tvg { + +template +struct LinkedList +{ + T *head = nullptr; + T *tail = nullptr; + + LinkedList() = default; + LinkedList(T *head, T *tail) : head(head), tail(tail) + { + } + + template + static void insert(T *t, T *prev, T *next, T **head, T **tail) + { + t->*Prev = prev; + t->*Next = next; + + if (prev) { + prev->*Next = t; + } else if (head) { + *head = t; + } + + if (next) { + next->*Prev = t; + } else if (tail) { + *tail = t; + } + } + + template + static void remove(T *t, T **head, T **tail) + { + if (t->*Prev) { + t->*Prev->*Next = t->*Next; + } else if (head) { + *head = t->*Next; + } + + if (t->*Next) { + t->*Next->*Prev = t->*Prev; + } else if (tail) { + *tail = t->*Prev; + } + + t->*Prev = t->*Next = nullptr; + } + + template + static bool contains(T *t, T **head, T **tail) { + for (T *it = *head; it; it = it->*Next) { + if (it == t) { + return true; + } + } + + return false; + } +}; + +} + +#endif // _TVG_LIST_H_ diff --git a/thirdparty/thorvg/src/common/tvgMath.cpp b/thirdparty/thorvg/src/common/tvgMath.cpp new file mode 100644 index 00000000000000..a9463c80773ebb --- /dev/null +++ b/thirdparty/thorvg/src/common/tvgMath.cpp @@ -0,0 +1,102 @@ +/* + * Copyright (c) 2021 - 2023 the ThorVG project. All rights reserved. + + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +#include "tvgMath.h" + + +bool mathInverse(const Matrix* m, Matrix* out) +{ + auto det = m->e11 * (m->e22 * m->e33 - m->e32 * m->e23) - + m->e12 * (m->e21 * m->e33 - m->e23 * m->e31) + + m->e13 * (m->e21 * m->e32 - m->e22 * m->e31); + + if (mathZero(det)) return false; + + auto invDet = 1 / det; + + out->e11 = (m->e22 * m->e33 - m->e32 * m->e23) * invDet; + out->e12 = (m->e13 * m->e32 - m->e12 * m->e33) * invDet; + out->e13 = (m->e12 * m->e23 - m->e13 * m->e22) * invDet; + out->e21 = (m->e23 * m->e31 - m->e21 * m->e33) * invDet; + out->e22 = (m->e11 * m->e33 - m->e13 * m->e31) * invDet; + out->e23 = (m->e21 * m->e13 - m->e11 * m->e23) * invDet; + out->e31 = (m->e21 * m->e32 - m->e31 * m->e22) * invDet; + out->e32 = (m->e31 * m->e12 - m->e11 * m->e32) * invDet; + out->e33 = (m->e11 * m->e22 - m->e21 * m->e12) * invDet; + + return true; +} + + +Matrix mathMultiply(const Matrix* lhs, const Matrix* rhs) +{ + Matrix m; + + m.e11 = lhs->e11 * rhs->e11 + lhs->e12 * rhs->e21 + lhs->e13 * rhs->e31; + m.e12 = lhs->e11 * rhs->e12 + lhs->e12 * rhs->e22 + lhs->e13 * rhs->e32; + m.e13 = lhs->e11 * rhs->e13 + lhs->e12 * rhs->e23 + lhs->e13 * rhs->e33; + + m.e21 = lhs->e21 * rhs->e11 + lhs->e22 * rhs->e21 + lhs->e23 * rhs->e31; + m.e22 = lhs->e21 * rhs->e12 + lhs->e22 * rhs->e22 + lhs->e23 * rhs->e32; + m.e23 = lhs->e21 * rhs->e13 + lhs->e22 * rhs->e23 + lhs->e23 * rhs->e33; + + m.e31 = lhs->e31 * rhs->e11 + lhs->e32 * rhs->e21 + lhs->e33 * rhs->e31; + m.e32 = lhs->e31 * rhs->e12 + lhs->e32 * rhs->e22 + lhs->e33 * rhs->e32; + m.e33 = lhs->e31 * rhs->e13 + lhs->e32 * rhs->e23 + lhs->e33 * rhs->e33; + + return m; +} + + +void mathRotate(Matrix* m, float degree) +{ + if (degree == 0.0f) return; + + auto radian = degree / 180.0f * M_PI; + auto cosVal = cosf(radian); + auto sinVal = sinf(radian); + + m->e12 = m->e11 * -sinVal; + m->e11 *= cosVal; + m->e21 = m->e22 * sinVal; + m->e22 *= cosVal; +} + + +bool mathIdentity(const Matrix* m) +{ + if (m->e11 != 1.0f || m->e12 != 0.0f || m->e13 != 0.0f || + m->e21 != 0.0f || m->e22 != 1.0f || m->e23 != 0.0f || + m->e31 != 0.0f || m->e32 != 0.0f || m->e33 != 1.0f) { + return false; + } + return true; +} + + +void mathMultiply(Point* pt, const Matrix* transform) +{ + auto tx = pt->x * transform->e11 + pt->y * transform->e12 + transform->e13; + auto ty = pt->x * transform->e21 + pt->y * transform->e22 + transform->e23; + pt->x = tx; + pt->y = ty; +} diff --git a/thirdparty/thorvg/src/utils/tvgMath.h b/thirdparty/thorvg/src/common/tvgMath.h similarity index 63% rename from thirdparty/thorvg/src/utils/tvgMath.h rename to thirdparty/thorvg/src/common/tvgMath.h index 897ff464274fc2..004fff1e7b095c 100644 --- a/thirdparty/thorvg/src/utils/tvgMath.h +++ b/thirdparty/thorvg/src/common/tvgMath.h @@ -36,6 +36,13 @@ #define mathMax(x, y) (((x) > (y)) ? (x) : (y)) +bool mathInverse(const Matrix* m, Matrix* out); +Matrix mathMultiply(const Matrix* lhs, const Matrix* rhs); +void mathRotate(Matrix* m, float degree); +bool mathIdentity(const Matrix* m); +void mathMultiply(Point* pt, const Matrix* transform); + + static inline bool mathZero(float a) { return (fabsf(a) < FLT_EPSILON) ? true : false; @@ -73,41 +80,6 @@ static inline bool mathSkewed(const Matrix* m) } -static inline bool mathIdentity(const Matrix* m) -{ - if (!mathEqual(m->e11, 1.0f) || !mathZero(m->e12) || !mathZero(m->e13) || - !mathZero(m->e21) || !mathEqual(m->e22, 1.0f) || !mathZero(m->e23) || - !mathZero(m->e31) || !mathZero(m->e32) || !mathEqual(m->e33, 1.0f)) { - return false; - } - return true; -} - - -static inline bool mathInverse(const Matrix* m, Matrix* out) -{ - auto det = m->e11 * (m->e22 * m->e33 - m->e32 * m->e23) - - m->e12 * (m->e21 * m->e33 - m->e23 * m->e31) + - m->e13 * (m->e21 * m->e32 - m->e22 * m->e31); - - if (mathZero(det)) return false; - - auto invDet = 1 / det; - - out->e11 = (m->e22 * m->e33 - m->e32 * m->e23) * invDet; - out->e12 = (m->e13 * m->e32 - m->e12 * m->e33) * invDet; - out->e13 = (m->e12 * m->e23 - m->e13 * m->e22) * invDet; - out->e21 = (m->e23 * m->e31 - m->e21 * m->e33) * invDet; - out->e22 = (m->e11 * m->e33 - m->e13 * m->e31) * invDet; - out->e23 = (m->e21 * m->e13 - m->e11 * m->e23) * invDet; - out->e31 = (m->e21 * m->e32 - m->e31 * m->e22) * invDet; - out->e32 = (m->e31 * m->e12 - m->e11 * m->e32) * invDet; - out->e33 = (m->e11 * m->e22 - m->e21 * m->e12) * invDet; - - return true; -} - - static inline void mathIdentity(Matrix* m) { m->e11 = 1.0f; @@ -158,48 +130,6 @@ static inline void mathTranslate(Matrix* m, float x, float y) } -static inline void mathRotate(Matrix* m, float degree) -{ - auto radian = degree / 180.0f * M_PI; - auto cosVal = cosf(radian); - auto sinVal = sinf(radian); - - m->e12 = m->e11 * -sinVal; - m->e11 *= cosVal; - m->e21 = m->e22 * sinVal; - m->e22 *= cosVal; -} - - -static inline void mathMultiply(Point* pt, const Matrix* transform) -{ - auto tx = pt->x * transform->e11 + pt->y * transform->e12 + transform->e13; - auto ty = pt->x * transform->e21 + pt->y * transform->e22 + transform->e23; - pt->x = tx; - pt->y = ty; -} - - -static inline Matrix mathMultiply(const Matrix* lhs, const Matrix* rhs) -{ - Matrix m; - - m.e11 = lhs->e11 * rhs->e11 + lhs->e12 * rhs->e21 + lhs->e13 * rhs->e31; - m.e12 = lhs->e11 * rhs->e12 + lhs->e12 * rhs->e22 + lhs->e13 * rhs->e32; - m.e13 = lhs->e11 * rhs->e13 + lhs->e12 * rhs->e23 + lhs->e13 * rhs->e33; - - m.e21 = lhs->e21 * rhs->e11 + lhs->e22 * rhs->e21 + lhs->e23 * rhs->e31; - m.e22 = lhs->e21 * rhs->e12 + lhs->e22 * rhs->e22 + lhs->e23 * rhs->e32; - m.e23 = lhs->e21 * rhs->e13 + lhs->e22 * rhs->e23 + lhs->e23 * rhs->e33; - - m.e31 = lhs->e31 * rhs->e11 + lhs->e32 * rhs->e21 + lhs->e33 * rhs->e31; - m.e32 = lhs->e31 * rhs->e12 + lhs->e32 * rhs->e22 + lhs->e33 * rhs->e32; - m.e33 = lhs->e31 * rhs->e13 + lhs->e32 * rhs->e23 + lhs->e33 * rhs->e33; - - return m; -} - - static inline void mathTranslateR(Matrix* m, float x, float y) { if (x == 0.0f && y == 0.0f) return; diff --git a/thirdparty/thorvg/src/utils/tvgStr.cpp b/thirdparty/thorvg/src/common/tvgStr.cpp similarity index 100% rename from thirdparty/thorvg/src/utils/tvgStr.cpp rename to thirdparty/thorvg/src/common/tvgStr.cpp diff --git a/thirdparty/thorvg/src/utils/tvgStr.h b/thirdparty/thorvg/src/common/tvgStr.h similarity index 100% rename from thirdparty/thorvg/src/utils/tvgStr.h rename to thirdparty/thorvg/src/common/tvgStr.h diff --git a/thirdparty/thorvg/src/loaders/svg/tvgSvgLoader.cpp b/thirdparty/thorvg/src/loaders/svg/tvgSvgLoader.cpp index 9825fd8cc4b480..be99ec085ca965 100644 --- a/thirdparty/thorvg/src/loaders/svg/tvgSvgLoader.cpp +++ b/thirdparty/thorvg/src/loaders/svg/tvgSvgLoader.cpp @@ -48,13 +48,9 @@ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - -#define _USE_MATH_DEFINES //Math Constants are not defined in Standard C/C++. - #include #include #include -#include #include "tvgLoader.h" #include "tvgXmlParser.h" #include "tvgSvgLoader.h" @@ -3508,8 +3504,29 @@ static bool _svgLoaderParserForValidCheck(void* data, SimpleXMLType type, const } -void SvgLoader::clear() +void SvgLoader::clear(bool all) { + //flush out the intermediate data + free(loaderData.svgParse); + loaderData.svgParse = nullptr; + + for (auto gradient = loaderData.gradients.data; gradient < loaderData.gradients.end(); ++gradient) { + (*gradient)->clear(); + free(*gradient); + } + loaderData.gradients.reset(); + + _freeNode(loaderData.doc); + loaderData.doc = nullptr; + loaderData.stack.reset(); + + if (!all) return; + + for (auto p = loaderData.images.data; p < loaderData.images.end(); ++p) { + free(*p); + } + loaderData.images.reset(); + if (copy) free((char*)content); size = 0; content = nullptr; @@ -3561,6 +3578,20 @@ void SvgLoader::run(unsigned tid) if (defs) _updateGradient(&loaderData, loaderData.doc, &defs->node.defs.gradients); } root = svgSceneBuild(loaderData, {vx, vy, vw, vh}, w, h, align, meetOrSlice, svgPath, viewFlag); + + //In case no viewbox and width/height data is provided the completion of loading + //has to be forced, in order to establish this data based on the whole picture. + if (!(viewFlag & SvgViewFlag::Viewbox)) { + //Override viewbox & size again after svg loading. + vx = loaderData.doc->node.doc.vx; + vy = loaderData.doc->node.doc.vy; + vw = loaderData.doc->node.doc.vw; + vh = loaderData.doc->node.doc.vh; + w = loaderData.doc->node.doc.w; + h = loaderData.doc->node.doc.h; + } + + clear(false); } @@ -3630,14 +3661,6 @@ bool SvgLoader::header() } run(0); - - //Override viewbox & size again after svg loading. - vx = loaderData.doc->node.doc.vx; - vy = loaderData.doc->node.doc.vy; - vw = loaderData.doc->node.doc.vw; - vh = loaderData.doc->node.doc.vh; - w = loaderData.doc->node.doc.w; - h = loaderData.doc->node.doc.h; } return true; @@ -3717,22 +3740,6 @@ bool SvgLoader::close() { this->done(); - if (loaderData.svgParse) { - free(loaderData.svgParse); - loaderData.svgParse = nullptr; - } - auto gradients = loaderData.gradients.data; - for (size_t i = 0; i < loaderData.gradients.count; ++i) { - (*gradients)->clear(); - free(*gradients); - ++gradients; - } - loaderData.gradients.reset(); - - _freeNode(loaderData.doc); - loaderData.doc = nullptr; - loaderData.stack.reset(); - clear(); return true; diff --git a/thirdparty/thorvg/src/loaders/svg/tvgSvgLoader.h b/thirdparty/thorvg/src/loaders/svg/tvgSvgLoader.h index 8331bf4c16d47b..4bac52e0b97e49 100644 --- a/thirdparty/thorvg/src/loaders/svg/tvgSvgLoader.h +++ b/thirdparty/thorvg/src/loaders/svg/tvgSvgLoader.h @@ -61,7 +61,7 @@ class SvgLoader : public LoadModule, public Task float vh = 0; bool header(); - void clear(); + void clear(bool all = true); void run(unsigned tid) override; }; diff --git a/thirdparty/thorvg/src/loaders/svg/tvgSvgLoaderCommon.h b/thirdparty/thorvg/src/loaders/svg/tvgSvgLoaderCommon.h index 1809c7749c4368..b4ee3e8e0d11b7 100644 --- a/thirdparty/thorvg/src/loaders/svg/tvgSvgLoaderCommon.h +++ b/thirdparty/thorvg/src/loaders/svg/tvgSvgLoaderCommon.h @@ -556,6 +556,7 @@ struct SvgLoaderData SvgParser* svgParse = nullptr; Array cloneNodes; Array nodesToStyle; + Array images; //embedded images int level = 0; bool result = false; bool style = false; diff --git a/thirdparty/thorvg/src/loaders/svg/tvgSvgSceneBuilder.cpp b/thirdparty/thorvg/src/loaders/svg/tvgSvgSceneBuilder.cpp index 71712442e8e0e0..2e018e27996d85 100644 --- a/thirdparty/thorvg/src/loaders/svg/tvgSvgSceneBuilder.cpp +++ b/thirdparty/thorvg/src/loaders/svg/tvgSvgSceneBuilder.cpp @@ -20,39 +20,10 @@ * SOFTWARE. */ -/* - * Copyright notice for the EFL: - - * Copyright (C) EFL developers (see AUTHORS) - - * All rights reserved. - - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - - * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, - * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - - #include "tvgMath.h" /* to include math.h before cstring */ #include #include -#include "tvgShapeImpl.h" +#include "tvgShape.h" #include "tvgCompressor.h" #include "tvgPaint.h" #include "tvgFill.h" @@ -66,9 +37,9 @@ /* Internal Class Implementation */ /************************************************************************/ -static bool _appendShape(SvgNode* node, Shape* shape, const Box& vBox, const string& svgPath); -static bool _appendClipShape(SvgNode* node, Shape* shape, const Box& vBox, const string& svgPath, const Matrix* transform); -static unique_ptr _sceneBuildHelper(const SvgNode* node, const Box& vBox, const string& svgPath, bool mask, int depth, bool* isMaskWhite = nullptr); +static bool _appendShape(SvgLoaderData& loaderData, SvgNode* node, Shape* shape, const Box& vBox, const string& svgPath); +static bool _appendClipShape(SvgLoaderData& loaderData, SvgNode* node, Shape* shape, const Box& vBox, const string& svgPath, const Matrix* transform); +static unique_ptr _sceneBuildHelper(SvgLoaderData& loaderData, const SvgNode* node, const Box& vBox, const string& svgPath, bool mask, int depth, bool* isMaskWhite = nullptr); static inline bool _isGroupType(SvgNodeType type) @@ -223,7 +194,7 @@ static unique_ptr _applyRadialGradientProperty(SvgStyleGradient* //The SVG standard allows only for 'use' nodes that point directly to a basic shape. -static bool _appendClipUseNode(SvgNode* node, Shape* shape, const Box& vBox, const string& svgPath) +static bool _appendClipUseNode(SvgLoaderData& loaderData, SvgNode* node, Shape* shape, const Box& vBox, const string& svgPath) { if (node->child.count != 1) return false; auto child = *(node->child.data); @@ -236,16 +207,16 @@ static bool _appendClipUseNode(SvgNode* node, Shape* shape, const Box& vBox, con } if (child->transform) finalTransform = mathMultiply(child->transform, &finalTransform); - return _appendClipShape(child, shape, vBox, svgPath, mathIdentity((const Matrix*)(&finalTransform)) ? nullptr : &finalTransform); + return _appendClipShape(loaderData, child, shape, vBox, svgPath, mathIdentity((const Matrix*)(&finalTransform)) ? nullptr : &finalTransform); } -static bool _appendClipChild(SvgNode* node, Shape* shape, const Box& vBox, const string& svgPath, bool clip) +static bool _appendClipChild(SvgLoaderData& loaderData, SvgNode* node, Shape* shape, const Box& vBox, const string& svgPath, bool clip) { if (node->type == SvgNodeType::Use) { - return _appendClipUseNode(node, shape, vBox, svgPath); + return _appendClipUseNode(loaderData, node, shape, vBox, svgPath); } - return _appendClipShape(node, shape, vBox, svgPath, nullptr); + return _appendClipShape(loaderData, node, shape, vBox, svgPath, nullptr); } @@ -269,7 +240,7 @@ static Matrix _compositionTransform(Paint* paint, const SvgNode* node, const Svg } -static void _applyComposition(Paint* paint, const SvgNode* node, const Box& vBox, const string& svgPath) +static void _applyComposition(SvgLoaderData& loaderData, Paint* paint, const SvgNode* node, const Box& vBox, const string& svgPath) { /* ClipPath */ /* Do not drop in Circular Dependency for ClipPath. @@ -287,7 +258,7 @@ static void _applyComposition(Paint* paint, const SvgNode* node, const Box& vBox auto valid = false; //Composite only when valid shapes exist for (uint32_t i = 0; i < compNode->child.count; ++i, ++child) { - if (_appendClipChild(*child, comp.get(), vBox, svgPath, compNode->child.count > 1)) valid = true; + if (_appendClipChild(loaderData, *child, comp.get(), vBox, svgPath, compNode->child.count > 1)) valid = true; } if (valid) { @@ -312,7 +283,7 @@ static void _applyComposition(Paint* paint, const SvgNode* node, const Box& vBox node->style->mask.applying = true; bool isMaskWhite = true; - if (auto comp = _sceneBuildHelper(compNode, vBox, svgPath, true, 0, &isMaskWhite)) { + if (auto comp = _sceneBuildHelper(loaderData, compNode, vBox, svgPath, true, 0, &isMaskWhite)) { Matrix finalTransform = _compositionTransform(paint, node, compNode, SvgNodeType::Mask); comp->transform(finalTransform); @@ -329,7 +300,7 @@ static void _applyComposition(Paint* paint, const SvgNode* node, const Box& vBox } -static void _applyProperty(SvgNode* node, Shape* vg, const Box& vBox, const string& svgPath, bool clip) +static void _applyProperty(SvgLoaderData& loaderData, SvgNode* node, Shape* vg, const Box& vBox, const string& svgPath, bool clip) { SvgStyleProperty* style = node->style; @@ -404,14 +375,14 @@ static void _applyProperty(SvgNode* node, Shape* vg, const Box& vBox, const stri vg->stroke(style->stroke.paint.color.r, style->stroke.paint.color.g, style->stroke.paint.color.b, style->stroke.opacity); } - _applyComposition(vg, node, vBox, svgPath); + _applyComposition(loaderData, vg, node, vBox, svgPath); } -static unique_ptr _shapeBuildHelper(SvgNode* node, const Box& vBox, const string& svgPath) +static unique_ptr _shapeBuildHelper(SvgLoaderData& loaderData, SvgNode* node, const Box& vBox, const string& svgPath) { auto shape = Shape::gen(); - if (_appendShape(node, shape.get(), vBox, svgPath)) return shape; + if (_appendShape(loaderData, node, shape.get(), vBox, svgPath)) return shape; else return nullptr; } @@ -473,16 +444,16 @@ static bool _recognizeShape(SvgNode* node, Shape* shape) } -static bool _appendShape(SvgNode* node, Shape* shape, const Box& vBox, const string& svgPath) +static bool _appendShape(SvgLoaderData& loaderData, SvgNode* node, Shape* shape, const Box& vBox, const string& svgPath) { if (!_recognizeShape(node, shape)) return false; - _applyProperty(node, shape, vBox, svgPath, false); + _applyProperty(loaderData, node, shape, vBox, svgPath, false); return true; } -static bool _appendClipShape(SvgNode* node, Shape* shape, const Box& vBox, const string& svgPath, const Matrix* transform) +static bool _appendClipShape(SvgLoaderData& loaderData, SvgNode* node, Shape* shape, const Box& vBox, const string& svgPath, const Matrix* transform) { //The 'transform' matrix has higher priority than the node->transform, since it already contains it auto m = transform ? transform : (node->transform ? node->transform : nullptr); @@ -503,7 +474,7 @@ static bool _appendClipShape(SvgNode* node, Shape* shape, const Box& vBox, const while (currentPtsCnt++ < ptsCnt) mathMultiply(p++, m); } - _applyProperty(node, shape, vBox, svgPath, true); + _applyProperty(loaderData, node, shape, vBox, svgPath, true); return true; } @@ -581,7 +552,7 @@ static bool _isValidImageMimeTypeAndEncoding(const char** href, const char** mim #include "tvgTaskScheduler.h" -static unique_ptr _imageBuildHelper(SvgNode* node, const Box& vBox, const string& svgPath) +static unique_ptr _imageBuildHelper(SvgLoaderData& loaderData, SvgNode* node, const Box& vBox, const string& svgPath) { if (!node->node.image.href) return nullptr; auto picture = Picture::gen(); @@ -594,24 +565,23 @@ static unique_ptr _imageBuildHelper(SvgNode* node, const Box& vBox, con const char* mimetype; imageMimeTypeEncoding encoding; if (!_isValidImageMimeTypeAndEncoding(&href, &mimetype, &encoding)) return nullptr; //not allowed mime type or encoding + char *decoded = nullptr; if (encoding == imageMimeTypeEncoding::base64) { - char* decoded = nullptr; auto size = b64Decode(href, strlen(href), &decoded); - //OPTIMIZE: Skip data copy. - if (picture->load(decoded, size, mimetype, true) != Result::Success) { + if (picture->load(decoded, size, mimetype, false) != Result::Success) { free(decoded); TaskScheduler::async(true); return nullptr; } - free(decoded); } else { - string decoded = svgUtilURLDecode(href); - //OPTIMIZE: Skip data copy. - if (picture->load(decoded.c_str(), decoded.size(), mimetype, true) != Result::Success) { + auto size = svgUtilURLDecode(href, &decoded); + if (picture->load(decoded, size, mimetype, false) != Result::Success) { + free(decoded); TaskScheduler::async(true); return nullptr; } } + loaderData.images.push(decoded); } else { if (!strncmp(href, "file://", sizeof("file://") - 1)) href += sizeof("file://") - 1; //TODO: protect against recursive svg image loading @@ -645,7 +615,8 @@ static unique_ptr _imageBuildHelper(SvgNode* node, const Box& vBox, con if (node->transform) m = mathMultiply(node->transform, &m); picture->transform(m); - _applyComposition(picture.get(), node, vBox, svgPath); + _applyComposition(loaderData, picture.get(), node, vBox, svgPath); + return picture; } @@ -724,10 +695,10 @@ static Matrix _calculateAspectRatioMatrix(AspectRatioAlign align, AspectRatioMee } -static unique_ptr _useBuildHelper(const SvgNode* node, const Box& vBox, const string& svgPath, int depth, bool* isMaskWhite) +static unique_ptr _useBuildHelper(SvgLoaderData& loaderData, const SvgNode* node, const Box& vBox, const string& svgPath, int depth, bool* isMaskWhite) { unique_ptr finalScene; - auto scene = _sceneBuildHelper(node, vBox, svgPath, false, depth + 1, isMaskWhite); + auto scene = _sceneBuildHelper(loaderData, node, vBox, svgPath, false, depth + 1, isMaskWhite); // mUseTransform = mUseTransform * mTranslate Matrix mUseTransform = {1, 0, 0, 0, 1, 0, 0, 0, 1}; @@ -786,7 +757,7 @@ static unique_ptr _useBuildHelper(const SvgNode* node, const Box& vBox, c finalScene = std::move(root); } } else { - if (!mathIdentity((const Matrix*)(&mUseTransform))) scene->transform(mUseTransform); + scene->transform(mUseTransform); finalScene = std::move(scene); } @@ -794,7 +765,7 @@ static unique_ptr _useBuildHelper(const SvgNode* node, const Box& vBox, c } -static unique_ptr _sceneBuildHelper(const SvgNode* node, const Box& vBox, const string& svgPath, bool mask, int depth, bool* isMaskWhite) +static unique_ptr _sceneBuildHelper(SvgLoaderData& loaderData, const SvgNode* node, const Box& vBox, const string& svgPath, bool mask, int depth, bool* isMaskWhite) { /* Exception handling: Prevent invalid SVG data input. The size is the arbitrary value, we need an experimental size. */ @@ -813,17 +784,17 @@ static unique_ptr _sceneBuildHelper(const SvgNode* node, const Box& vBox, for (uint32_t i = 0; i < node->child.count; ++i, ++child) { if (_isGroupType((*child)->type)) { if ((*child)->type == SvgNodeType::Use) - scene->push(_useBuildHelper(*child, vBox, svgPath, depth + 1, isMaskWhite)); + scene->push(_useBuildHelper(loaderData, *child, vBox, svgPath, depth + 1, isMaskWhite)); else - scene->push(_sceneBuildHelper(*child, vBox, svgPath, false, depth + 1, isMaskWhite)); + scene->push(_sceneBuildHelper(loaderData, *child, vBox, svgPath, false, depth + 1, isMaskWhite)); } else if ((*child)->type == SvgNodeType::Image) { - auto image = _imageBuildHelper(*child, vBox, svgPath); + auto image = _imageBuildHelper(loaderData, *child, vBox, svgPath); if (image) { scene->push(std::move(image)); if (isMaskWhite) *isMaskWhite = false; } } else if ((*child)->type != SvgNodeType::Mask) { - auto shape = _shapeBuildHelper(*child, vBox, svgPath); + auto shape = _shapeBuildHelper(loaderData, *child, vBox, svgPath); if (shape) { if (isMaskWhite) { uint8_t r, g, b; @@ -837,7 +808,7 @@ static unique_ptr _sceneBuildHelper(const SvgNode* node, const Box& vBox, } } } - _applyComposition(scene.get(), node, vBox, svgPath); + _applyComposition(loaderData, scene.get(), node, vBox, svgPath); scene->opacity(node->style->opacity); } return scene; @@ -876,7 +847,7 @@ unique_ptr svgSceneBuild(SvgLoaderData& loaderData, Box vBox, float w, fl if (!loaderData.doc || (loaderData.doc->type != SvgNodeType::Doc)) return nullptr; - auto docNode = _sceneBuildHelper(loaderData.doc, vBox, svgPath, false, 0); + auto docNode = _sceneBuildHelper(loaderData, loaderData.doc, vBox, svgPath, false, 0); if (!(viewFlag & SvgViewFlag::Viewbox)) _updateInvalidViewSize(docNode.get(), vBox, w, h, viewFlag); diff --git a/thirdparty/thorvg/src/loaders/svg/tvgSvgUtil.cpp b/thirdparty/thorvg/src/loaders/svg/tvgSvgUtil.cpp index 763a357f99e9ba..7940188ade9371 100644 --- a/thirdparty/thorvg/src/loaders/svg/tvgSvgUtil.cpp +++ b/thirdparty/thorvg/src/loaders/svg/tvgSvgUtil.cpp @@ -39,29 +39,32 @@ static uint8_t _hexCharToDec(const char c) /* External Class Implementation */ /************************************************************************/ -string svgUtilURLDecode(const char *src) +size_t svgUtilURLDecode(const char *src, char** dst) { - if (!src) return nullptr; + if (!src) return 0; auto length = strlen(src); - if (length == 0) return nullptr; + if (length == 0) return 0; - string decoded; - decoded.reserve(length); + char* decoded = (char*)malloc(sizeof(char) * length + 1); + decoded[length] = '\0'; char a, b; + int idx =0; while (*src) { if (*src == '%' && ((a = src[1]) && (b = src[2])) && (isxdigit(a) && isxdigit(b))) { - decoded += (_hexCharToDec(a) << 4) + _hexCharToDec(b); + decoded[idx++] = (_hexCharToDec(a) << 4) + _hexCharToDec(b); src+=3; } else if (*src == '+') { - decoded += ' '; + decoded[idx++] = ' '; src++; } else { - decoded += *src++; + decoded[idx++] = *src++; } } - return decoded; + + *dst = decoded; + return length + 1; } diff --git a/thirdparty/thorvg/src/loaders/svg/tvgSvgUtil.h b/thirdparty/thorvg/src/loaders/svg/tvgSvgUtil.h index e914eadc6588d3..ee0e3f88610c97 100644 --- a/thirdparty/thorvg/src/loaders/svg/tvgSvgUtil.h +++ b/thirdparty/thorvg/src/loaders/svg/tvgSvgUtil.h @@ -25,6 +25,6 @@ #include "tvgCommon.h" -string svgUtilURLDecode(const char *src); +size_t svgUtilURLDecode(const char *src, char** dst); #endif //_TVG_SVG_UTIL_H_ diff --git a/thirdparty/thorvg/src/lib/sw_engine/tvgSwCommon.h b/thirdparty/thorvg/src/renderer/sw_engine/tvgSwCommon.h similarity index 99% rename from thirdparty/thorvg/src/lib/sw_engine/tvgSwCommon.h rename to thirdparty/thorvg/src/renderer/sw_engine/tvgSwCommon.h index 4cee0b18e280a5..c0cd8863a277dc 100644 --- a/thirdparty/thorvg/src/lib/sw_engine/tvgSwCommon.h +++ b/thirdparty/thorvg/src/renderer/sw_engine/tvgSwCommon.h @@ -273,6 +273,7 @@ struct SwMpool { SwOutline* outline; SwOutline* strokeOutline; + SwOutline* dashOutline; unsigned allocSize; }; @@ -544,6 +545,8 @@ SwOutline* mpoolReqOutline(SwMpool* mpool, unsigned idx); void mpoolRetOutline(SwMpool* mpool, unsigned idx); SwOutline* mpoolReqStrokeOutline(SwMpool* mpool, unsigned idx); void mpoolRetStrokeOutline(SwMpool* mpool, unsigned idx); +SwOutline* mpoolReqDashOutline(SwMpool* mpool, unsigned idx); +void mpoolRetDashOutline(SwMpool* mpool, unsigned idx); bool rasterCompositor(SwSurface* surface); bool rasterGradientShape(SwSurface* surface, SwShape* shape, unsigned id); diff --git a/thirdparty/thorvg/src/lib/sw_engine/tvgSwFill.cpp b/thirdparty/thorvg/src/renderer/sw_engine/tvgSwFill.cpp similarity index 100% rename from thirdparty/thorvg/src/lib/sw_engine/tvgSwFill.cpp rename to thirdparty/thorvg/src/renderer/sw_engine/tvgSwFill.cpp diff --git a/thirdparty/thorvg/src/lib/sw_engine/tvgSwImage.cpp b/thirdparty/thorvg/src/renderer/sw_engine/tvgSwImage.cpp similarity index 99% rename from thirdparty/thorvg/src/lib/sw_engine/tvgSwImage.cpp rename to thirdparty/thorvg/src/renderer/sw_engine/tvgSwImage.cpp index fb8581b412ac8e..b1624037bc1fff 100644 --- a/thirdparty/thorvg/src/lib/sw_engine/tvgSwImage.cpp +++ b/thirdparty/thorvg/src/renderer/sw_engine/tvgSwImage.cpp @@ -48,7 +48,7 @@ static bool _genOutline(SwImage* image, const RenderMesh* mesh, const Matrix* tr if (mesh->triangleCnt > 0) { // TODO: Optimise me. We appear to calculate this exact min/max bounding area in multiple // places. We should be able to re-use one we have already done? Also see: - // tvgPictureImpl.h --> bounds + // tvgPicture.h --> bounds // tvgSwRasterTexmap.h --> _rasterTexmapPolygonMesh // // TODO: Should we calculate the exact path(s) of the triangle mesh instead? diff --git a/thirdparty/thorvg/src/lib/sw_engine/tvgSwMath.cpp b/thirdparty/thorvg/src/renderer/sw_engine/tvgSwMath.cpp similarity index 100% rename from thirdparty/thorvg/src/lib/sw_engine/tvgSwMath.cpp rename to thirdparty/thorvg/src/renderer/sw_engine/tvgSwMath.cpp diff --git a/thirdparty/thorvg/src/lib/sw_engine/tvgSwMemPool.cpp b/thirdparty/thorvg/src/renderer/sw_engine/tvgSwMemPool.cpp similarity index 73% rename from thirdparty/thorvg/src/lib/sw_engine/tvgSwMemPool.cpp rename to thirdparty/thorvg/src/renderer/sw_engine/tvgSwMemPool.cpp index 936d9cbdeded92..54ae594bffdc07 100644 --- a/thirdparty/thorvg/src/lib/sw_engine/tvgSwMemPool.cpp +++ b/thirdparty/thorvg/src/renderer/sw_engine/tvgSwMemPool.cpp @@ -62,54 +62,52 @@ void mpoolRetStrokeOutline(SwMpool* mpool, unsigned idx) } +SwOutline* mpoolReqDashOutline(SwMpool* mpool, unsigned idx) +{ + return &mpool->dashOutline[idx]; +} + + +void mpoolRetDashOutline(SwMpool* mpool, unsigned idx) +{ + mpool->dashOutline[idx].pts.clear(); + mpool->dashOutline[idx].cntrs.clear(); + mpool->dashOutline[idx].types.clear(); + mpool->dashOutline[idx].closed.clear(); +} + + SwMpool* mpoolInit(unsigned threads) { auto allocSize = threads + 1; auto mpool = static_cast(calloc(sizeof(SwMpool), 1)); mpool->outline = static_cast(calloc(1, sizeof(SwOutline) * allocSize)); - if (!mpool->outline) goto err; - mpool->strokeOutline = static_cast(calloc(1, sizeof(SwOutline) * allocSize)); - if (!mpool->strokeOutline) goto err; - + mpool->dashOutline = static_cast(calloc(1, sizeof(SwOutline) * allocSize)); mpool->allocSize = allocSize; return mpool; - -err: - if (mpool->outline) { - free(mpool->outline); - mpool->outline = nullptr; - } - - if (mpool->strokeOutline) { - free(mpool->strokeOutline); - mpool->strokeOutline = nullptr; - } - free(mpool); - return nullptr; } bool mpoolClear(SwMpool* mpool) { - SwOutline* p; - for (unsigned i = 0; i < mpool->allocSize; ++i) { - //Outline - p = &mpool->outline[i]; - p->pts.reset(); - p->cntrs.reset(); - p->types.reset(); - p->closed.reset(); - - //StrokeOutline - p = &mpool->strokeOutline[i]; - p->pts.reset(); - p->cntrs.reset(); - p->types.reset(); - p->closed.reset(); + mpool->outline[i].pts.reset(); + mpool->outline[i].cntrs.reset(); + mpool->outline[i].types.reset(); + mpool->outline[i].closed.reset(); + + mpool->strokeOutline[i].pts.reset(); + mpool->strokeOutline[i].cntrs.reset(); + mpool->strokeOutline[i].types.reset(); + mpool->strokeOutline[i].closed.reset(); + + mpool->dashOutline[i].pts.reset(); + mpool->dashOutline[i].cntrs.reset(); + mpool->dashOutline[i].types.reset(); + mpool->dashOutline[i].closed.reset(); } return true; @@ -122,16 +120,9 @@ bool mpoolTerm(SwMpool* mpool) mpoolClear(mpool); - if (mpool->outline) { - free(mpool->outline); - mpool->outline = nullptr; - } - - if (mpool->strokeOutline) { - free(mpool->strokeOutline); - mpool->strokeOutline = nullptr; - } - + free(mpool->outline); + free(mpool->strokeOutline); + free(mpool->dashOutline); free(mpool); return true; diff --git a/thirdparty/thorvg/src/lib/sw_engine/tvgSwRaster.cpp b/thirdparty/thorvg/src/renderer/sw_engine/tvgSwRaster.cpp similarity index 99% rename from thirdparty/thorvg/src/lib/sw_engine/tvgSwRaster.cpp rename to thirdparty/thorvg/src/renderer/sw_engine/tvgSwRaster.cpp index 8fd54c2a4f2103..4b1ba59100d169 100644 --- a/thirdparty/thorvg/src/lib/sw_engine/tvgSwRaster.cpp +++ b/thirdparty/thorvg/src/renderer/sw_engine/tvgSwRaster.cpp @@ -2024,11 +2024,11 @@ bool rasterConvertCS(Surface* surface, ColorSpace to) //TOOD: Support SIMD accelerations auto from = surface->cs; - if ((from == ColorSpace::ABGR8888 && to == ColorSpace::ARGB8888) || (from == ColorSpace::ABGR8888S && to == ColorSpace::ARGB8888S)) { + if (((from == ColorSpace::ABGR8888) || (from == ColorSpace::ABGR8888S)) && ((to == ColorSpace::ARGB8888) || (to == ColorSpace::ARGB8888S))) { surface->cs = to; return cRasterABGRtoARGB(surface); } - if ((from == ColorSpace::ARGB8888 && to == ColorSpace::ABGR8888) || (from == ColorSpace::ARGB8888S && to == ColorSpace::ABGR8888S)) { + if (((from == ColorSpace::ARGB8888) || (from == ColorSpace::ARGB8888S)) && ((to == ColorSpace::ABGR8888) || (to == ColorSpace::ABGR8888S))) { surface->cs = to; return cRasterARGBtoABGR(surface); } diff --git a/thirdparty/thorvg/src/lib/sw_engine/tvgSwRasterAvx.h b/thirdparty/thorvg/src/renderer/sw_engine/tvgSwRasterAvx.h similarity index 100% rename from thirdparty/thorvg/src/lib/sw_engine/tvgSwRasterAvx.h rename to thirdparty/thorvg/src/renderer/sw_engine/tvgSwRasterAvx.h diff --git a/thirdparty/thorvg/src/lib/sw_engine/tvgSwRasterC.h b/thirdparty/thorvg/src/renderer/sw_engine/tvgSwRasterC.h similarity index 100% rename from thirdparty/thorvg/src/lib/sw_engine/tvgSwRasterC.h rename to thirdparty/thorvg/src/renderer/sw_engine/tvgSwRasterC.h diff --git a/thirdparty/thorvg/src/lib/sw_engine/tvgSwRasterNeon.h b/thirdparty/thorvg/src/renderer/sw_engine/tvgSwRasterNeon.h similarity index 100% rename from thirdparty/thorvg/src/lib/sw_engine/tvgSwRasterNeon.h rename to thirdparty/thorvg/src/renderer/sw_engine/tvgSwRasterNeon.h diff --git a/thirdparty/thorvg/src/lib/sw_engine/tvgSwRasterTexmap.h b/thirdparty/thorvg/src/renderer/sw_engine/tvgSwRasterTexmap.h similarity index 100% rename from thirdparty/thorvg/src/lib/sw_engine/tvgSwRasterTexmap.h rename to thirdparty/thorvg/src/renderer/sw_engine/tvgSwRasterTexmap.h diff --git a/thirdparty/thorvg/src/lib/sw_engine/tvgSwRenderer.cpp b/thirdparty/thorvg/src/renderer/sw_engine/tvgSwRenderer.cpp similarity index 98% rename from thirdparty/thorvg/src/lib/sw_engine/tvgSwRenderer.cpp rename to thirdparty/thorvg/src/renderer/sw_engine/tvgSwRenderer.cpp index 091b72fa9701ce..049aa3d1d0fa9b 100644 --- a/thirdparty/thorvg/src/lib/sw_engine/tvgSwRenderer.cpp +++ b/thirdparty/thorvg/src/renderer/sw_engine/tvgSwRenderer.cpp @@ -742,6 +742,12 @@ void* SwRenderer::prepareCommon(SwTask* task, const RenderTransform* transform, task->transform = nullptr; } + //zero size? + if (task->transform) { + if (task->transform->e11 == 0.0f && task->transform->e12 == 0.0f) return task; //zero width + if (task->transform->e21 == 0.0f && task->transform->e22 == 0.0f) return task; //zero height + } + task->opacity = opacity; task->surface = surface; task->mpool = mpool; @@ -767,10 +773,8 @@ RenderData SwRenderer::prepare(Surface* surface, const RenderMesh* mesh, RenderD //prepare task auto task = static_cast(data); if (!task) task = new SwImageTask; - if (flags & RenderUpdateFlag::Image) { - task->source = surface; - task->mesh = mesh; - } + task->source = surface; + task->mesh = mesh; return prepareCommon(task, transform, clips, opacity, flags); } diff --git a/thirdparty/thorvg/src/lib/sw_engine/tvgSwRenderer.h b/thirdparty/thorvg/src/renderer/sw_engine/tvgSwRenderer.h similarity index 100% rename from thirdparty/thorvg/src/lib/sw_engine/tvgSwRenderer.h rename to thirdparty/thorvg/src/renderer/sw_engine/tvgSwRenderer.h diff --git a/thirdparty/thorvg/src/lib/sw_engine/tvgSwRle.cpp b/thirdparty/thorvg/src/renderer/sw_engine/tvgSwRle.cpp similarity index 100% rename from thirdparty/thorvg/src/lib/sw_engine/tvgSwRle.cpp rename to thirdparty/thorvg/src/renderer/sw_engine/tvgSwRle.cpp diff --git a/thirdparty/thorvg/src/lib/sw_engine/tvgSwShape.cpp b/thirdparty/thorvg/src/renderer/sw_engine/tvgSwShape.cpp similarity index 97% rename from thirdparty/thorvg/src/lib/sw_engine/tvgSwShape.cpp rename to thirdparty/thorvg/src/renderer/sw_engine/tvgSwShape.cpp index 651eaee45242fc..159898c750d325 100644 --- a/thirdparty/thorvg/src/lib/sw_engine/tvgSwShape.cpp +++ b/thirdparty/thorvg/src/renderer/sw_engine/tvgSwShape.cpp @@ -212,7 +212,7 @@ static void _dashCubicTo(SwDashStroke& dash, const Point* ctrl1, const Point* ct } -static SwOutline* _genDashOutline(const RenderShape* rshape, const Matrix* transform, float length) +static SwOutline* _genDashOutline(const RenderShape* rshape, const Matrix* transform, float length, SwMpool* mpool, unsigned tid) { const PathCommand* cmds = rshape->path.cmds.data; auto cmdCnt = rshape->path.cmds.count; @@ -283,8 +283,7 @@ static SwOutline* _genDashOutline(const RenderShape* rshape, const Matrix* trans } } - //OPTMIZE ME: Use mempool??? - dash.outline = static_cast(calloc(1, sizeof(SwOutline))); + dash.outline = mpoolReqDashOutline(mpool, tid); //smart reservation auto closeCnt = 0; @@ -567,16 +566,16 @@ bool shapeGenStrokeRle(SwShape* shape, const RenderShape* rshape, const Matrix* { SwOutline* shapeOutline = nullptr; SwOutline* strokeOutline = nullptr; - bool freeOutline = false; - bool ret = true; + auto dashStroking = false; + auto ret = true; auto length = rshape->strokeTrim() ? _outlineLength(rshape) : 0.0f; //Dash style (+trimming) if (rshape->stroke->dashCnt > 0 || length > 0) { - shapeOutline = _genDashOutline(rshape, transform, length); + shapeOutline = _genDashOutline(rshape, transform, length, mpool, tid); if (!shapeOutline) return false; - freeOutline = true; + dashStroking = true; //Normal style } else { if (!shape->outline) { @@ -587,26 +586,20 @@ bool shapeGenStrokeRle(SwShape* shape, const RenderShape* rshape, const Matrix* if (!strokeParseOutline(shape->stroke, *shapeOutline)) { ret = false; - goto fail; + goto clear; } strokeOutline = strokeExportOutline(shape->stroke, mpool, tid); if (!mathUpdateOutlineBBox(strokeOutline, clipRegion, renderRegion, false)) { ret = false; - goto fail; + goto clear; } shape->strokeRle = rleRender(shape->strokeRle, strokeOutline, renderRegion, true); -fail: - if (freeOutline) { - free(shapeOutline->cntrs.data); - free(shapeOutline->pts.data); - free(shapeOutline->types.data); - free(shapeOutline->closed.data); - free(shapeOutline); - } +clear: + if (dashStroking) mpoolRetDashOutline(mpool, tid); mpoolRetStrokeOutline(mpool, tid); return ret; diff --git a/thirdparty/thorvg/src/lib/sw_engine/tvgSwStroke.cpp b/thirdparty/thorvg/src/renderer/sw_engine/tvgSwStroke.cpp similarity index 99% rename from thirdparty/thorvg/src/lib/sw_engine/tvgSwStroke.cpp rename to thirdparty/thorvg/src/renderer/sw_engine/tvgSwStroke.cpp index f46a4a5a1d4f0f..b1bdccbbbacdd4 100644 --- a/thirdparty/thorvg/src/lib/sw_engine/tvgSwStroke.cpp +++ b/thirdparty/thorvg/src/renderer/sw_engine/tvgSwStroke.cpp @@ -373,6 +373,10 @@ void _firstSubPath(SwStroke& stroke, SwFixed startAngle, SwFixed lineLength) static void _lineTo(SwStroke& stroke, const SwPoint& to) { auto delta = to - stroke.center; + + //a zero-length lineto is a no-op; avoid creating a spurious corner + if (delta.zero()) return; + //compute length of line auto angle = mathAtan(delta); diff --git a/thirdparty/thorvg/src/lib/tvgAccessor.cpp b/thirdparty/thorvg/src/renderer/tvgAccessor.cpp similarity index 100% rename from thirdparty/thorvg/src/lib/tvgAccessor.cpp rename to thirdparty/thorvg/src/renderer/tvgAccessor.cpp diff --git a/thirdparty/thorvg/src/lib/tvgAnimation.cpp b/thirdparty/thorvg/src/renderer/tvgAnimation.cpp similarity index 94% rename from thirdparty/thorvg/src/lib/tvgAnimation.cpp rename to thirdparty/thorvg/src/renderer/tvgAnimation.cpp index 4e8c8568d4c000..7a29ecf973c883 100644 --- a/thirdparty/thorvg/src/lib/tvgAnimation.cpp +++ b/thirdparty/thorvg/src/renderer/tvgAnimation.cpp @@ -20,11 +20,10 @@ * SOFTWARE. */ -//#include "tvgAnimationImpl.h" #include "tvgCommon.h" #include "tvgFrameModule.h" #include "tvgPaint.h" -#include "tvgPictureImpl.h" +#include "tvgPicture.h" /************************************************************************/ /* Internal Class Implementation */ @@ -37,12 +36,12 @@ struct Animation::Impl Impl() { picture = Picture::gen().release(); - static_cast(picture)->pImpl->ref(); + PP(picture)->ref(); } ~Impl() { - if (static_cast(picture)->pImpl->unref() == 0) { + if (PP(picture)->unref() == 0) { delete(picture); } } diff --git a/thirdparty/thorvg/src/lib/tvgBinaryDesc.h b/thirdparty/thorvg/src/renderer/tvgBinaryDesc.h similarity index 95% rename from thirdparty/thorvg/src/lib/tvgBinaryDesc.h rename to thirdparty/thorvg/src/renderer/tvgBinaryDesc.h index 3b9dbe891be563..b1468148d674cd 100644 --- a/thirdparty/thorvg/src/lib/tvgBinaryDesc.h +++ b/thirdparty/thorvg/src/renderer/tvgBinaryDesc.h @@ -36,7 +36,7 @@ using TvgBinFlag = TvgBinByte; #define TVG_HEADER_SIZE 33 //TVG_HEADER_SIGNATURE_LENGTH + TVG_HEADER_VERSION_LENGTH + 2*SIZE(float) + TVG_HEADER_RESERVED_LENGTH + TVG_HEADER_COMPRESS_SIZE #define TVG_HEADER_SIGNATURE "ThorVG" #define TVG_HEADER_SIGNATURE_LENGTH 6 -#define TVG_HEADER_VERSION "001000" //Major 00, Minor 10, Micro 00 +#define TVG_HEADER_VERSION "001100" //Major 00, Minor 11, Micro 00 #define TVG_HEADER_VERSION_LENGTH 6 #define TVG_HEADER_RESERVED_LENGTH 1 //Storing flags for extensions #define TVG_HEADER_COMPRESS_SIZE 12 //TVG_HEADER_UNCOMPRESSED_SIZE + TVG_HEADER_COMPRESSED_SIZE + TVG_HEADER_COMPRESSED_SIZE_BITS @@ -82,6 +82,7 @@ using TvgBinFlag = TvgBinByte; #define TVG_TAG_SHAPE_STROKE_DASHPTRN (TvgBinTag)0x55 #define TVG_TAG_SHAPE_STROKE_MITERLIMIT (TvgBinTag)0x56 #define TVG_TAG_SHAPE_STROKE_ORDER (TvgBinTag)0x57 +#define TVG_TAG_SHAPE_STROKE_DASH_OFFSET (TvgBinTag)0x58 //Fill @@ -90,7 +91,7 @@ using TvgBinFlag = TvgBinByte; #define TVG_TAG_FILL_COLORSTOPS (TvgBinTag)0x62 #define TVG_TAG_FILL_FILLSPREAD (TvgBinTag)0x63 #define TVG_TAG_FILL_TRANSFORM (TvgBinTag)0x64 - +#define TVG_TAG_FILL_RADIAL_GRADIENT_FOCAL (TvgBinTag)0x65 //Picture #define TVG_TAG_PICTURE_RAW_IMAGE (TvgBinTag)0x70 diff --git a/thirdparty/thorvg/src/lib/tvgCanvas.cpp b/thirdparty/thorvg/src/renderer/tvgCanvas.cpp similarity index 98% rename from thirdparty/thorvg/src/lib/tvgCanvas.cpp rename to thirdparty/thorvg/src/renderer/tvgCanvas.cpp index 1dee37032688bc..2d4cbd048fae4a 100644 --- a/thirdparty/thorvg/src/lib/tvgCanvas.cpp +++ b/thirdparty/thorvg/src/renderer/tvgCanvas.cpp @@ -20,7 +20,7 @@ * SOFTWARE. */ -#include "tvgCanvasImpl.h" +#include "tvgCanvas.h" /************************************************************************/ /* External Class Implementation */ diff --git a/thirdparty/thorvg/src/lib/tvgCanvasImpl.h b/thirdparty/thorvg/src/renderer/tvgCanvas.h similarity index 93% rename from thirdparty/thorvg/src/lib/tvgCanvasImpl.h rename to thirdparty/thorvg/src/renderer/tvgCanvas.h index fe934ec3521b4c..f893f9f7c0599d 100644 --- a/thirdparty/thorvg/src/lib/tvgCanvasImpl.h +++ b/thirdparty/thorvg/src/renderer/tvgCanvas.h @@ -53,6 +53,7 @@ struct Canvas::Impl auto p = paint.release(); if (!p) return Result::MemoryCorruption; + PP(p)->ref(); paints.push_back(p); return update(p, true); @@ -64,14 +65,15 @@ struct Canvas::Impl if (!renderer || !renderer->clear()) return Result::InsufficientCondition; //Free paints - for (auto paint : paints) { - if (paint->pImpl->dispose(*renderer)) { - if (free && paint->pImpl->unref() == 0) delete(paint); - } + if (free) { + for (auto paint : paints) { + P(paint)->unref(); + if (paint->pImpl->dispose(*renderer) && P(paint)->refCnt == 0) { + delete(paint); + } + } + paints.clear(); } - - paints.clear(); - drawing = false; return Result::Success; diff --git a/thirdparty/thorvg/src/lib/tvgCommon.h b/thirdparty/thorvg/src/renderer/tvgCommon.h similarity index 100% rename from thirdparty/thorvg/src/lib/tvgCommon.h rename to thirdparty/thorvg/src/renderer/tvgCommon.h diff --git a/thirdparty/thorvg/src/lib/tvgFill.cpp b/thirdparty/thorvg/src/renderer/tvgFill.cpp similarity index 100% rename from thirdparty/thorvg/src/lib/tvgFill.cpp rename to thirdparty/thorvg/src/renderer/tvgFill.cpp diff --git a/thirdparty/thorvg/src/lib/tvgFill.h b/thirdparty/thorvg/src/renderer/tvgFill.h similarity index 100% rename from thirdparty/thorvg/src/lib/tvgFill.h rename to thirdparty/thorvg/src/renderer/tvgFill.h diff --git a/thirdparty/thorvg/src/lib/tvgFrameModule.h b/thirdparty/thorvg/src/renderer/tvgFrameModule.h similarity index 100% rename from thirdparty/thorvg/src/lib/tvgFrameModule.h rename to thirdparty/thorvg/src/renderer/tvgFrameModule.h diff --git a/thirdparty/thorvg/src/lib/tvgGlCanvas.cpp b/thirdparty/thorvg/src/renderer/tvgGlCanvas.cpp similarity index 99% rename from thirdparty/thorvg/src/lib/tvgGlCanvas.cpp rename to thirdparty/thorvg/src/renderer/tvgGlCanvas.cpp index dbbab516b2145b..aa7f8dbe2ab410 100644 --- a/thirdparty/thorvg/src/lib/tvgGlCanvas.cpp +++ b/thirdparty/thorvg/src/renderer/tvgGlCanvas.cpp @@ -20,7 +20,7 @@ * SOFTWARE. */ -#include "tvgCanvasImpl.h" +#include "tvgCanvas.h" #ifdef THORVG_GL_RASTER_SUPPORT #include "tvgGlRenderer.h" diff --git a/thirdparty/thorvg/src/lib/tvgInitializer.cpp b/thirdparty/thorvg/src/renderer/tvgInitializer.cpp similarity index 100% rename from thirdparty/thorvg/src/lib/tvgInitializer.cpp rename to thirdparty/thorvg/src/renderer/tvgInitializer.cpp diff --git a/thirdparty/thorvg/src/lib/tvgIteratorAccessor.h b/thirdparty/thorvg/src/renderer/tvgIteratorAccessor.h similarity index 100% rename from thirdparty/thorvg/src/lib/tvgIteratorAccessor.h rename to thirdparty/thorvg/src/renderer/tvgIteratorAccessor.h diff --git a/thirdparty/thorvg/src/lib/tvgLoadModule.h b/thirdparty/thorvg/src/renderer/tvgLoadModule.h similarity index 100% rename from thirdparty/thorvg/src/lib/tvgLoadModule.h rename to thirdparty/thorvg/src/renderer/tvgLoadModule.h diff --git a/thirdparty/thorvg/src/lib/tvgLoader.cpp b/thirdparty/thorvg/src/renderer/tvgLoader.cpp similarity index 98% rename from thirdparty/thorvg/src/lib/tvgLoader.cpp rename to thirdparty/thorvg/src/renderer/tvgLoader.cpp index 8ed0d5752e4d5f..52bdb91d6a8d97 100644 --- a/thirdparty/thorvg/src/lib/tvgLoader.cpp +++ b/thirdparty/thorvg/src/renderer/tvgLoader.cpp @@ -220,7 +220,7 @@ shared_ptr LoaderMgr::loader(const char* data, uint32_t size, const if (loader->open(data, size, copy)) { return shared_ptr(loader); } else { - TVGLOG("LOADER", "Given mimetype \"%s\" seems incorrect or not supported. Will try again with other types.", mimeType.c_str()); + TVGLOG("LOADER", "Given mimetype \"%s\" seems incorrect or not supported.", mimeType.c_str()); delete(loader); } } diff --git a/thirdparty/thorvg/src/lib/tvgLoader.h b/thirdparty/thorvg/src/renderer/tvgLoader.h similarity index 100% rename from thirdparty/thorvg/src/lib/tvgLoader.h rename to thirdparty/thorvg/src/renderer/tvgLoader.h diff --git a/thirdparty/thorvg/src/lib/tvgPaint.cpp b/thirdparty/thorvg/src/renderer/tvgPaint.cpp similarity index 99% rename from thirdparty/thorvg/src/lib/tvgPaint.cpp rename to thirdparty/thorvg/src/renderer/tvgPaint.cpp index bac5e434a50182..37df906dac525a 100644 --- a/thirdparty/thorvg/src/lib/tvgPaint.cpp +++ b/thirdparty/thorvg/src/renderer/tvgPaint.cpp @@ -132,7 +132,7 @@ bool Paint::Impl::scale(float factor) if (rTransform) { if (mathEqual(factor, rTransform->scale)) return true; } else { - if (mathZero(factor)) return true; + if (mathEqual(factor, 1.0f)) return true; rTransform = new RenderTransform(); } rTransform->scale = factor; diff --git a/thirdparty/thorvg/src/lib/tvgPaint.h b/thirdparty/thorvg/src/renderer/tvgPaint.h similarity index 98% rename from thirdparty/thorvg/src/lib/tvgPaint.h rename to thirdparty/thorvg/src/renderer/tvgPaint.h index c020a7dffda255..0ee07fedff9713 100644 --- a/thirdparty/thorvg/src/lib/tvgPaint.h +++ b/thirdparty/thorvg/src/renderer/tvgPaint.h @@ -24,7 +24,7 @@ #define _TVG_PAINT_H_ #include "tvgRender.h" - +#include "tvgMath.h" namespace tvg { @@ -68,7 +68,7 @@ namespace tvg uint8_t ctxFlag = ContextFlag::Invalid; uint8_t id; uint8_t opacity = 255; - uint8_t refCnt = 1; + uint8_t refCnt = 0; ~Impl() { @@ -100,6 +100,7 @@ namespace tvg bool transform(const Matrix& m) { if (!rTransform) { + if (mathIdentity(&m)) return true; rTransform = new RenderTransform(); if (!rTransform) return false; } diff --git a/thirdparty/thorvg/src/lib/tvgPicture.cpp b/thirdparty/thorvg/src/renderer/tvgPicture.cpp similarity index 75% rename from thirdparty/thorvg/src/lib/tvgPicture.cpp rename to thirdparty/thorvg/src/renderer/tvgPicture.cpp index fd324a947ca3c0..07877b92de1d69 100644 --- a/thirdparty/thorvg/src/lib/tvgPicture.cpp +++ b/thirdparty/thorvg/src/renderer/tvgPicture.cpp @@ -20,7 +20,40 @@ * SOFTWARE. */ -#include "tvgPictureImpl.h" +#include "tvgPicture.h" + +/************************************************************************/ +/* Internal Class Implementation */ +/************************************************************************/ + +RenderUpdateFlag Picture::Impl::load() +{ + if (loader) { + if (!paint) { + if (auto p = loader->paint()) { + paint = p.release(); + loader->close(); + if (w != loader->w || h != loader->h) { + if (!resizing) { + w = loader->w; + h = loader->h; + } + loader->resize(paint, w, h); + resizing = false; + } + if (paint) return RenderUpdateFlag::None; + } + } else loader->sync(); + + if (!surface) { + if ((surface = loader->bitmap().release())) { + loader->close(); + return RenderUpdateFlag::Image; + } + } + } + return RenderUpdateFlag::None; +} /************************************************************************/ /* External Class Implementation */ @@ -97,23 +130,6 @@ Result Picture::size(float* w, float* h) const noexcept } -const uint32_t* Picture::data(uint32_t* w, uint32_t* h) const noexcept -{ - //Try it, If not loaded yet. - pImpl->load(); - - if (pImpl->loader) { - if (w) *w = static_cast(pImpl->loader->w); - if (h) *h = static_cast(pImpl->loader->h); - } else { - if (w) *w = 0; - if (h) *h = 0; - } - if (pImpl->surface) return pImpl->surface->buf32; - else return nullptr; -} - - Result Picture::mesh(const Polygon* triangles, uint32_t triangleCnt) noexcept { if (!triangles && triangleCnt > 0) return Result::InvalidArguments; diff --git a/thirdparty/thorvg/src/lib/tvgPictureImpl.h b/thirdparty/thorvg/src/renderer/tvgPicture.h similarity index 91% rename from thirdparty/thorvg/src/lib/tvgPictureImpl.h rename to thirdparty/thorvg/src/renderer/tvgPicture.h index f29b8a1ec3addc..447f56ecb79915 100644 --- a/thirdparty/thorvg/src/lib/tvgPictureImpl.h +++ b/thirdparty/thorvg/src/renderer/tvgPicture.h @@ -89,35 +89,6 @@ struct Picture::Impl return true; } - RenderUpdateFlag load() - { - if (loader) { - if (!paint) { - if (auto p = loader->paint()) { - paint = p.release(); - loader->close(); - if (w != loader->w || h != loader->h) { - if (!resizing) { - w = loader->w; - h = loader->h; - } - loader->resize(paint, w, h); - resizing = false; - } - if (paint) return RenderUpdateFlag::None; - } - } else loader->sync(); - - if (!surface) { - if ((surface = loader->bitmap().release())) { - loader->close(); - return RenderUpdateFlag::Image; - } - } - } - return RenderUpdateFlag::None; - } - RenderTransform resizeTransform(const RenderTransform* pTransform) { //Overriding Transformation by the desired image size @@ -317,6 +288,24 @@ struct Picture::Impl load(); return new PictureIterator(paint); } + + uint32_t* data(uint32_t* w, uint32_t* h) + { + //Try it, If not loaded yet. + load(); + + if (loader) { + if (w) *w = static_cast(loader->w); + if (h) *h = static_cast(loader->h); + } else { + if (w) *w = 0; + if (h) *h = 0; + } + if (surface) return surface->buf32; + else return nullptr; + } + + RenderUpdateFlag load(); }; #endif //_TVG_PICTURE_IMPL_H_ diff --git a/thirdparty/thorvg/src/lib/tvgRender.cpp b/thirdparty/thorvg/src/renderer/tvgRender.cpp similarity index 90% rename from thirdparty/thorvg/src/lib/tvgRender.cpp rename to thirdparty/thorvg/src/renderer/tvgRender.cpp index ec4db13f6ea30b..9768b5ede092fd 100644 --- a/thirdparty/thorvg/src/lib/tvgRender.cpp +++ b/thirdparty/thorvg/src/renderer/tvgRender.cpp @@ -35,12 +35,7 @@ void RenderTransform::override(const Matrix& m) { this->m = m; - - if (m.e11 == 0.0f && m.e12 == 0.0f && m.e13 == 0.0f && - m.e21 == 0.0f && m.e22 == 0.0f && m.e23 == 0.0f && - m.e31 == 0.0f && m.e32 == 0.0f && m.e33 == 0.0f) { - overriding = false; - } else overriding = true; + overriding = true; } diff --git a/thirdparty/thorvg/src/lib/tvgRender.h b/thirdparty/thorvg/src/renderer/tvgRender.h similarity index 100% rename from thirdparty/thorvg/src/lib/tvgRender.h rename to thirdparty/thorvg/src/renderer/tvgRender.h diff --git a/thirdparty/thorvg/src/lib/tvgSaveModule.h b/thirdparty/thorvg/src/renderer/tvgSaveModule.h similarity index 100% rename from thirdparty/thorvg/src/lib/tvgSaveModule.h rename to thirdparty/thorvg/src/renderer/tvgSaveModule.h diff --git a/thirdparty/thorvg/src/lib/tvgSaver.cpp b/thirdparty/thorvg/src/renderer/tvgSaver.cpp similarity index 100% rename from thirdparty/thorvg/src/lib/tvgSaver.cpp rename to thirdparty/thorvg/src/renderer/tvgSaver.cpp diff --git a/thirdparty/thorvg/src/lib/tvgScene.cpp b/thirdparty/thorvg/src/renderer/tvgScene.cpp similarity index 98% rename from thirdparty/thorvg/src/lib/tvgScene.cpp rename to thirdparty/thorvg/src/renderer/tvgScene.cpp index d2b7503e28d3c6..52e7ea2bf6918e 100644 --- a/thirdparty/thorvg/src/lib/tvgScene.cpp +++ b/thirdparty/thorvg/src/renderer/tvgScene.cpp @@ -20,7 +20,7 @@ * SOFTWARE. */ -#include "tvgSceneImpl.h" +#include "tvgScene.h" /************************************************************************/ /* External Class Implementation */ @@ -55,6 +55,7 @@ Result Scene::push(unique_ptr paint) noexcept { auto p = paint.release(); if (!p) return Result::MemoryCorruption; + PP(p)->ref(); pImpl->paints.push_back(p); return Result::Success; diff --git a/thirdparty/thorvg/src/lib/tvgSceneImpl.h b/thirdparty/thorvg/src/renderer/tvgScene.h similarity index 96% rename from thirdparty/thorvg/src/lib/tvgSceneImpl.h rename to thirdparty/thorvg/src/renderer/tvgScene.h index 90b1775610d3ec..10daa49a99b7d8 100644 --- a/thirdparty/thorvg/src/lib/tvgSceneImpl.h +++ b/thirdparty/thorvg/src/renderer/tvgScene.h @@ -220,7 +220,9 @@ struct Scene::Impl auto dup = ret.get()->pImpl; for (auto paint : paints) { - dup->paints.push_back(paint->duplicate()); + auto cdup = paint->duplicate(); + P(cdup)->ref(); + dup->paints.push_back(cdup); } return ret.release(); @@ -231,8 +233,8 @@ struct Scene::Impl auto dispose = renderer ? true : false; for (auto paint : paints) { - if (dispose) free &= paint->pImpl->dispose(*renderer); - if (free) delete(paint); + if (dispose) free &= P(paint)->dispose(*renderer); + if (P(paint)->unref() == 0 && free) delete(paint); } paints.clear(); renderer = nullptr; diff --git a/thirdparty/thorvg/src/lib/tvgShape.cpp b/thirdparty/thorvg/src/renderer/tvgShape.cpp similarity index 99% rename from thirdparty/thorvg/src/lib/tvgShape.cpp rename to thirdparty/thorvg/src/renderer/tvgShape.cpp index 336ac71d813be6..efb7666b296a04 100644 --- a/thirdparty/thorvg/src/lib/tvgShape.cpp +++ b/thirdparty/thorvg/src/renderer/tvgShape.cpp @@ -21,7 +21,7 @@ */ #include "tvgMath.h" -#include "tvgShapeImpl.h" +#include "tvgShape.h" /************************************************************************/ /* Internal Class Implementation */ diff --git a/thirdparty/thorvg/src/lib/tvgShapeImpl.h b/thirdparty/thorvg/src/renderer/tvgShape.h similarity index 100% rename from thirdparty/thorvg/src/lib/tvgShapeImpl.h rename to thirdparty/thorvg/src/renderer/tvgShape.h diff --git a/thirdparty/thorvg/src/lib/tvgSwCanvas.cpp b/thirdparty/thorvg/src/renderer/tvgSwCanvas.cpp similarity index 99% rename from thirdparty/thorvg/src/lib/tvgSwCanvas.cpp rename to thirdparty/thorvg/src/renderer/tvgSwCanvas.cpp index 7e6bc40c5b3b8e..95df6b486da9a1 100644 --- a/thirdparty/thorvg/src/lib/tvgSwCanvas.cpp +++ b/thirdparty/thorvg/src/renderer/tvgSwCanvas.cpp @@ -20,7 +20,7 @@ * SOFTWARE. */ -#include "tvgCanvasImpl.h" +#include "tvgCanvas.h" #ifdef THORVG_SW_RASTER_SUPPORT #include "tvgSwRenderer.h" diff --git a/thirdparty/thorvg/src/lib/tvgTaskScheduler.cpp b/thirdparty/thorvg/src/renderer/tvgTaskScheduler.cpp similarity index 100% rename from thirdparty/thorvg/src/lib/tvgTaskScheduler.cpp rename to thirdparty/thorvg/src/renderer/tvgTaskScheduler.cpp diff --git a/thirdparty/thorvg/src/lib/tvgTaskScheduler.h b/thirdparty/thorvg/src/renderer/tvgTaskScheduler.h similarity index 100% rename from thirdparty/thorvg/src/lib/tvgTaskScheduler.h rename to thirdparty/thorvg/src/renderer/tvgTaskScheduler.h diff --git a/thirdparty/thorvg/update-thorvg.sh b/thirdparty/thorvg/update-thorvg.sh index 804d3b76db1a81..6fbf5e213c3f77 100755 --- a/thirdparty/thorvg/update-thorvg.sh +++ b/thirdparty/thorvg/update-thorvg.sh @@ -1,14 +1,26 @@ #!/bin/bash -e -VERSION=0.10.7 +VERSION=0.11.0 +cd thirdparty/thorvg/ || true rm -rf AUTHORS LICENSE inc/ src/ *.zip *.tar.gz tmp/ mkdir tmp/ && pushd tmp/ -curl -L -O https://github.com/thorvg/thorvg/archive/v$VERSION.tar.gz -tar --strip-components=1 -xvf *.tar.gz -rm *.tar.gz +# Release +#curl -L -O https://github.com/thorvg/thorvg/archive/v$VERSION.tar.gz + +# Current Github main branch tip +#curl -L -O https://github.com/thorvg/thorvg/archive/refs/heads/main.tar.gz + +#tar --strip-components=1 -xvf *.tar.gz +#rm *.tar.gz + +# Install from local git checkout "thorvg-git" in the same directory +# as godot git checkout. +d="../../../../thorvg-git" +cp -r ${d}/AUTHORS ${d}/inc ${d}/LICENSE ${d}/src . + find . -type f -name 'meson.build' -delete # Fix newline at end of file. @@ -24,24 +36,26 @@ cat << EOF > ../inc/config.h #define THORVG_CONFIG_H #define THORVG_SW_RASTER_SUPPORT - #define THORVG_SVG_LOADER_SUPPORT +// For internal debugging: +//#define THORVG_LOG_ENABLED + #define THORVG_VERSION_STRING "$VERSION" #endif EOF mkdir ../src -cp -rv src/lib src/utils ../src/ +cp -rv src/common ../src +cp -rv src/renderer ../src/ + # Only sw_engine is enabled. -rm -rfv ../src/lib/gl_engine +rm -rfv ../src/renderer/gl_engine -# Only svg loader is enabled. +# Only svg (+raw) loader is enabled. mkdir ../src/loaders cp -rv src/loaders/svg src/loaders/raw ../src/loaders/ -# Future versions -# cp -rv src/utils ../src - popd -rm -rf tmp/ +rm -rf tmp +