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

Merge a797516c70 into 15aafbfe62

Browse source
This commit is contained in:
Mira Grudzinska 2025-07-17 00:40:41 +09:00 • committed by GitHub
commit 7f9bacd517
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 32 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/loaders/lottie/tvgLottieModifier.cpp
View file

@ -201,7 +201,13 @@ bool LottieRoundnessModifier::modifyPath(PathCommand* inCmds, uint32_t inCmdsCnt
_roundCorner(path.cmds, path.pts, prev, curr, inPts[iPts + 5], r); _roundCorner(path.cmds, path.pts, prev, curr, inPts[iPts + 5], r);
iPts += 3; iPts += 3;
break; break;
} else if (inCmds[iCmds + 1] == PathCommand::Close) { }
if (inCmds[iCmds + 1] == PathCommand::LineTo) {
_roundCorner(path.cmds, path.pts, prev, curr, inPts[iPts + 3], r);
iPts += 3;
break;
}
if (inCmds[iCmds + 1] == PathCommand::Close) {
_roundCorner(path.cmds, path.pts, prev, curr, inPts[2], r); _roundCorner(path.cmds, path.pts, prev, curr, inPts[2], r);
path.pts[startIndex] = path.pts.last(); path.pts[startIndex] = path.pts.last();
iPts += 3; iPts += 3;
@ -214,6 +220,31 @@ bool LottieRoundnessModifier::modifyPath(PathCommand* inCmds, uint32_t inCmdsCnt
path.pts.push(inPts[iPts++]); path.pts.push(inPts[iPts++]);
break; break;
} }
case PathCommand::LineTo: {
if (iCmds < inCmdsCnt - 1) {
auto& prev = inPts[iPts - 1];
auto& curr = inPts[iPts];
if (inCmds[iCmds + 1] == PathCommand::CubicTo && _colinear(inPts + iPts)) {
_roundCorner(path.cmds, path.pts, prev, curr, inPts[iPts + 3], r);
++iPts;
break;
}
if (inCmds[iCmds + 1] == PathCommand::LineTo) {
_roundCorner(path.cmds, path.pts, prev, curr, inPts[iPts + 1], r);
++iPts;
break;
}
if (inCmds[iCmds + 1] == PathCommand::Close) {
_roundCorner(path.cmds, path.pts, prev, curr, inPts[1], r);
path.pts[startIndex] = path.pts.last();
++iPts;
break;
}
}
path.cmds.push(PathCommand::LineTo);
path.pts.push(inPts[iPts++]);
break;
}
case PathCommand::Close: { case PathCommand::Close: {
path.cmds.push(PathCommand::Close); path.cmds.push(PathCommand::Close);
break; break;