git_clone/thorvg
1
0
Fork 0
mirror of https://github.com/thorvg/thorvg.git synced 2025-06-10 06:34:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

sw_engine fill: fix wrong gradient transformation

Browse source 
There transformation logic was not identical between shape & gradient

gradient transform was applied into center of gradient world,
while shape wasn't. So... we correct gradient transform metric to shape like.

@Issues: 255
This commit is contained in:
Hermet Park 2021-03-03 10:53:32 +09:00 • committed by GitHub
parent 7147ebf21a
commit d522c9d45e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/lib/sw_engine/tvgSwFill.cpp
View file

@ -106,18 +106,12 @@ bool _prepareLinear(SwFill* fill, const LinearGradient* linear, const Matrix* tr
if (linear->linear(&x1, &y1, &x2, &y2) != Result::Success) return false; if (linear->linear(&x1, &y1, &x2, &y2) != Result::Success) return false;
if (transform) { if (transform) {
auto sx = sqrt(pow(transform->e11, 2) + pow(transform->e21, 2)); auto t1 = x1;
auto sy = sqrt(pow(transform->e12, 2) + pow(transform->e22, 2)); x1 = t1 * transform->e11 + y1 * transform->e12 + transform->e13;
auto cx = (x2 - x1) * 0.5f + x1; y1 = t1 * transform->e21 + y1 * transform->e22 + transform->e23;
auto cy = (y2 - y1) * 0.5f + y1; auto t2 = x2;
auto dx = x1 - cx; x2 = t2 * transform->e11 + y2 * transform->e12 + transform->e13;
auto dy = y1 - cy; y2 = t2 * transform->e21 + y2 * transform->e22 + transform->e23;
x1 = dx * transform->e11 + dy * transform->e12 + transform->e13 + (cx * sx);
y1 = dx * transform->e21 + dy * transform->e22 + transform->e23 + (cy * sy);
dx = x2 - cx;
dy = y2 - cy;
x2 = dx * transform->e11 + dy * transform->e12 + transform->e13 + (cx * sx);
y2 = dx * transform->e21 + dy * transform->e22 + transform->e23 + (cy * sy);
} }
fill->linear.dx = x2 - x1; fill->linear.dx = x2 - x1;