git_clone/thorvg
1
0
Fork 0
mirror of https://github.com/thorvg/thorvg.git synced 2025-07-24 23:28:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

sw_engine: proper radial gradient transformation

Browse source
This commit is contained in:
Mira Grudzinska 2021-09-20 02:39:24 +02:00 • committed by Hermet Park
parent 362d2dfd0f
commit ae3d1e1b80
2 changed files with 31 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/lib/sw_engine/tvgSwCommon.h
View file

@ -142,9 +142,10 @@ struct SwFill
}; };
struct SwRadial { struct SwRadial {
float cx, cy; float a11, a12, shiftX;
float a21, a22, shiftY;
float ddDet;
float a; float a;
float inva;
}; };
union { union {
@ -154,7 +155,6 @@ struct SwFill
uint32_t* ctable; uint32_t* ctable;
FillSpread spread; FillSpread spread;
float sx, sy;
bool translucent; bool translucent;
}; };

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

@ -146,33 +146,35 @@ bool _prepareLinear(SwFill* fill, const LinearGradient* linear, const Matrix* tr
bool _prepareRadial(SwFill* fill, const RadialGradient* radial, const Matrix* transform) bool _prepareRadial(SwFill* fill, const RadialGradient* radial, const Matrix* transform)
{ {
float radius; float radius, cx, cy;
if (radial->radial(&fill->radial.cx, &fill->radial.cy, &radius) != Result::Success) return false; if (radial->radial(&cx, &cy, &radius) != Result::Success) return false;
if (radius < FLT_EPSILON) return true; if (radius < FLT_EPSILON) return true;
fill->sx = 1.0f; float invR = 1.0f / radius;
fill->sy = 1.0f; fill->radial.shiftX = -cx;
fill->radial.shiftY = -cy;
fill->radial.a = radius;
if (transform) { if (transform) {
auto tx = fill->radial.cx * transform->e11 + fill->radial.cy * transform->e12 + transform->e13; Matrix invTransform;
auto ty = fill->radial.cx * transform->e21 + fill->radial.cy * transform->e22 + transform->e23; if (!mathInverse(transform, &invTransform)) return false;
fill->radial.cx = tx;
fill->radial.cy = ty;
auto sx = sqrtf(powf(transform->e11, 2.0f) + powf(transform->e21, 2.0f)); fill->radial.a11 = invTransform.e11 * invR;
auto sy = sqrtf(powf(transform->e12, 2.0f) + powf(transform->e22, 2.0f)); fill->radial.a12 = invTransform.e12 * invR;
fill->radial.shiftX += invTransform.e13;
fill->radial.a21 = invTransform.e21 * invR;
fill->radial.a22 = invTransform.e22 * invR;
fill->radial.shiftY += invTransform.e23;
fill->radial.ddDet = 2.0f * fill->radial.a11 * fill->radial.a11 + 2 * fill->radial.a21 * fill->radial.a21;
//FIXME; Scale + Rotation is not working properly fill->radial.a *= sqrt(pow(transform->e11, 2) + pow(transform->e21, 2));
radius *= sx; } else {
fill->radial.a11 = fill->radial.a22 = invR;
if (fabsf(sx - sy) > FLT_EPSILON) { fill->radial.a12 = fill->radial.a21 = 0.0f;
fill->sx = sx; fill->radial.ddDet = 2.0f * invR * invR;
fill->sy = sy;
}
} }
fill->radial.shiftX *= invR;
fill->radial.a = radius * radius; fill->radial.shiftY *= invR;
fill->radial.inva = 1.0 / fill->radial.a;
return true; return true;
} }
@ -223,15 +225,12 @@ static inline uint32_t _pixel(const SwFill* fill, float pos)
void fillFetchRadial(const SwFill* fill, uint32_t* dst, uint32_t y, uint32_t x, uint32_t len) void fillFetchRadial(const SwFill* fill, uint32_t* dst, uint32_t y, uint32_t x, uint32_t len)
{ {
//Rotation auto rx = (x + 0.5f) * fill->radial.a11 + (y + 0.5f) * fill->radial.a12 + fill->radial.shiftX;
auto rx = (x + 0.5f - fill->radial.cx) * fill->sy; auto ry = (x + 0.5f) * fill->radial.a21 + (y + 0.5f) * fill->radial.a22 + fill->radial.shiftY;
auto ry = (y + 0.5f - fill->radial.cy) * fill->sx;
auto rxy = rx * rx + ry * ry; auto detDelta2 = fill->radial.ddDet;
auto rxryPlus = 2 * rx; auto detDelta = 2.0f * (fill->radial.a11 * rx + fill->radial.a21 * ry) + 0.5f * detDelta2;
auto inva = fill->radial.inva; auto det = rx * rx + ry * ry;
auto det = rxy * inva;
auto detDelta = (rxryPlus + 1.0f) * inva;
auto detDelta2 = 2.0f * inva;
for (uint32_t i = 0 ; i < len ; ++i) { for (uint32_t i = 0 ; i < len ; ++i) {
*dst = _pixel(fill, sqrtf(det)); *dst = _pixel(fill, sqrtf(det));