From eb64428bdeb98f0bf6f30be480adb3f1d1900866 Mon Sep 17 00:00:00 2001 From: JunsuChoi Date: Thu, 10 Sep 2020 19:00:16 +0900 Subject: [PATCH] SvgLoader: Modify calculation formula of linear gradient matrix When there is a matrix of linear gradient, the applied formula is this. = T(x - cx, y - cy) x g->transform x T(cx, cy) This patch has modified this formula to work properly. --- src/loaders/svg/tvgSvgSceneBuilder.cpp | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/src/loaders/svg/tvgSvgSceneBuilder.cpp b/src/loaders/svg/tvgSvgSceneBuilder.cpp index 2e8b1749..0f1f80b3 100644 --- a/src/loaders/svg/tvgSvgSceneBuilder.cpp +++ b/src/loaders/svg/tvgSvgSceneBuilder.cpp @@ -69,24 +69,14 @@ unique_ptr _applyLinearGradientProperty(SvgStyleGradient* g, Sha float cy = ((float) rh) * 0.5 + ry; float cx = ((float) rw) * 0.5 + rx; - //Calc start point //= T(x - cx, y - cy) x g->transform x T(cx, cy) - g->linear->x1 = cx * (g->transform->e11 + g->transform->e31 * (g->linear->x1 - cx)) + - cx * (g->transform->e12 + g->transform->e32 * (g->linear->x1 - cx)) + - cx * (g->transform->e13 + g->transform->e33 * (g->linear->x1 - cx)); - - g->linear->y1 = cy * (g->transform->e21 + g->transform->e31 * (g->linear->y1 - cy)) + - cy * (g->transform->e22 + g->transform->e32 * (g->linear->y1 - cy)) + - cy * (g->transform->e23 + g->transform->e33 * (g->linear->y1 - cy)); + //Calc start point + g->linear->x1 = (g->transform->e11 * cx) + (g->transform->e12 * cy) + g->linear->x1 + g->transform->e13 - cx; + g->linear->y1 = (g->transform->e21 * cx) + (g->transform->e22 * cy) + g->linear->y1 + g->transform->e23 - cy; //Calc end point - g->linear->x2 = cx * (g->transform->e11 + g->transform->e31 * (g->linear->x2 - cx)) + - cx * (g->transform->e12 + g->transform->e32 * (g->linear->x2 - cx)) + - cx * (g->transform->e13 + g->transform->e33 * (g->linear->x2 - cx)); - - g->linear->y2 = cy * (g->transform->e21 + g->transform->e31 * (g->linear->y2 - cy)) + - cy * (g->transform->e22 + g->transform->e32 * (g->linear->y2 - cy)) + - cy * (g->transform->e23 + g->transform->e33 * (g->linear->y2 - cy)); + g->linear->x2 = (g->transform->e11 * cx) + (g->transform->e12 * cy) + g->linear->x2 + g->transform->e13 - cx; + g->linear->y2 = (g->transform->e21 * cx) + (g->transform->e22 * cy) + g->linear->y2 + g->transform->e23 - cy; } fillGrad->linear(g->linear->x1, g->linear->y1, g->linear->x2, g->linear->y2);