From 46937c9c5dcb36222f6c3b461383d10d78b8f485 Mon Sep 17 00:00:00 2001 From: Justin Brooks Date: Mon, 16 Sep 2024 12:45:07 -0400 Subject: [PATCH] Reenable convert curves to arc for svg --- .../vgo/svg/SvgOptimizationRegistry.kt | 3 +- .../resources/baseline/android_optimized.svg | 2 +- .../baseline/dribbble_ball_mark_optimized.svg | 2 +- .../eleven_below_single_optimized.svg | 52 +++++++++---------- .../baseline/guacamole_optimized.svg | 2 +- .../resources/baseline/nasa_optimized.svg | 6 +-- .../resources/baseline/tiger_optimized.svg | 10 ++-- 7 files changed, 39 insertions(+), 38 deletions(-) diff --git a/vgo/src/main/kotlin/com/jzbrooks/vgo/svg/SvgOptimizationRegistry.kt b/vgo/src/main/kotlin/com/jzbrooks/vgo/svg/SvgOptimizationRegistry.kt index 2d0ed591..46a78335 100644 --- a/vgo/src/main/kotlin/com/jzbrooks/vgo/svg/SvgOptimizationRegistry.kt +++ b/vgo/src/main/kotlin/com/jzbrooks/vgo/svg/SvgOptimizationRegistry.kt @@ -4,6 +4,7 @@ import com.jzbrooks.vgo.core.optimization.BakeTransformations import com.jzbrooks.vgo.core.optimization.BreakoutImplicitCommands import com.jzbrooks.vgo.core.optimization.CollapseGroups import com.jzbrooks.vgo.core.optimization.CommandVariant +import com.jzbrooks.vgo.core.optimization.ConvertCurvesToArcs import com.jzbrooks.vgo.core.optimization.MergePaths import com.jzbrooks.vgo.core.optimization.OptimizationRegistry import com.jzbrooks.vgo.core.optimization.Polycommands @@ -29,7 +30,7 @@ class SvgOptimizationRegistry : OptimizationRegistry(BOTTOM_UP, TOP_DOWN) { BreakoutImplicitCommands(), CommandVariant(CommandVariant.Mode.Relative), SimplifyLineCommands(1e-3f), -// ConvertCurvesToArcs(ScalableVectorGraphicCommandPrinter(3)), + ConvertCurvesToArcs(ScalableVectorGraphicCommandPrinter(3)), SimplifyBezierCurveCommands(1e-3f), RemoveRedundantCommands(), CommandVariant(CommandVariant.Mode.Compact(ScalableVectorGraphicCommandPrinter(3))), diff --git a/vgo/src/test/resources/baseline/android_optimized.svg b/vgo/src/test/resources/baseline/android_optimized.svg index c34a33e9..c4d109e2 100644 --- a/vgo/src/test/resources/baseline/android_optimized.svg +++ b/vgo/src/test/resources/baseline/android_optimized.svg @@ -1,3 +1,3 @@ - + diff --git a/vgo/src/test/resources/baseline/dribbble_ball_mark_optimized.svg b/vgo/src/test/resources/baseline/dribbble_ball_mark_optimized.svg index 8e54a4ea..506dc010 100644 --- a/vgo/src/test/resources/baseline/dribbble_ball_mark_optimized.svg +++ b/vgo/src/test/resources/baseline/dribbble_ball_mark_optimized.svg @@ -1,3 +1,3 @@ - + diff --git a/vgo/src/test/resources/baseline/eleven_below_single_optimized.svg b/vgo/src/test/resources/baseline/eleven_below_single_optimized.svg index fcfd4b95..fe99038c 100644 --- a/vgo/src/test/resources/baseline/eleven_below_single_optimized.svg +++ b/vgo/src/test/resources/baseline/eleven_below_single_optimized.svg @@ -40,11 +40,11 @@ - - - - - + + + + + @@ -56,7 +56,7 @@ - + @@ -76,25 +76,25 @@ - - - + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + @@ -169,7 +169,7 @@ - + @@ -213,7 +213,7 @@ - + diff --git a/vgo/src/test/resources/baseline/guacamole_optimized.svg b/vgo/src/test/resources/baseline/guacamole_optimized.svg index bedcbf82..cbd7f2b3 100644 --- a/vgo/src/test/resources/baseline/guacamole_optimized.svg +++ b/vgo/src/test/resources/baseline/guacamole_optimized.svg @@ -1 +1 @@ - + diff --git a/vgo/src/test/resources/baseline/nasa_optimized.svg b/vgo/src/test/resources/baseline/nasa_optimized.svg index 4a750193..17915121 100644 --- a/vgo/src/test/resources/baseline/nasa_optimized.svg +++ b/vgo/src/test/resources/baseline/nasa_optimized.svg @@ -36,8 +36,8 @@ - - - + + + diff --git a/vgo/src/test/resources/baseline/tiger_optimized.svg b/vgo/src/test/resources/baseline/tiger_optimized.svg index a6b04053..a3787428 100644 --- a/vgo/src/test/resources/baseline/tiger_optimized.svg +++ b/vgo/src/test/resources/baseline/tiger_optimized.svg @@ -232,7 +232,7 @@ - + @@ -316,7 +316,7 @@ - + @@ -379,10 +379,10 @@ - + - + @@ -481,7 +481,7 @@ - +