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

wg_engine: fix stroke trimming

Browse source 
Prevent crash for begin == end;
This commit is contained in:
Mira Grudzinska 2024-09-25 15:51:04 +02:00 • committed by Hermet Park
parent ee6a7214d4
commit fa17fcde81
1 changed files with 27 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
src/renderer/wg_engine/tvgWgRenderData.cpp
View file

@ -362,38 +362,37 @@ void WgRenderDataShape::updateMeshes(WgContext &context, const RenderShape &rsha
appendShape(context, path_buff); appendShape(context, path_buff);
}); });
// append shape with strokes // append shape with strokes
} else if (rshape.stroke->trim.simultaneous) {
float tbeg{}, tend{};
if (!rshape.stroke->strokeTrim(tbeg, tend)) { tbeg = 0.0f; tend = 1.0f; }
if (tbeg == tend) return;
pbuff.decodePath(rshape, true, [&](const WgVertexBuffer& path_buff) {
appendShape(context, path_buff);
proceedStrokes(context, rshape.stroke, tbeg, tend, path_buff);
});
// append shape with strokes with simultaneous flag
} else { } else {
float totalLen = 0.0f;
// append shapes
pbuff.decodePath(rshape, true, [&](const WgVertexBuffer& path_buff) {
appendShape(context, path_buff);
totalLen += path_buff.total();
});
// append strokes
float tbeg{}, tend{}; float tbeg{}, tend{};
if (!rshape.stroke->strokeTrim(tbeg, tend)) { tbeg = 0.0f; tend = 1.0f; } if (!rshape.stroke->strokeTrim(tbeg, tend)) { tbeg = 0.0f; tend = 1.0f; }
if (tbeg == tend) return; if (tbeg == tend) {
float len_beg = totalLen * tbeg; // trim length begin pbuff.decodePath(rshape, false, [&](const WgVertexBuffer& path_buff) {
float len_end = totalLen * tend; // trim length end appendShape(context, path_buff);
float len_acc = 0.0; // accumulated length });
// append strokes } else if (rshape.stroke->trim.simultaneous) {
pbuff.decodePath(rshape, true, [&](const WgVertexBuffer& path_buff) { pbuff.decodePath(rshape, true, [&](const WgVertexBuffer& path_buff) {
float len_path = path_buff.total(); // current path length appendShape(context, path_buff);
float tbeg = ((len_acc <= len_beg) && (len_acc + len_path > len_beg)) ? (len_beg - len_acc) / len_path : 0.0f;
float tend = ((len_acc <= len_end) && (len_acc + len_path > len_end)) ? (len_end - len_acc) / len_path : 1.0f;
if ((len_acc + len_path >= len_beg) && (len_acc <= len_end))
proceedStrokes(context, rshape.stroke, tbeg, tend, path_buff); proceedStrokes(context, rshape.stroke, tbeg, tend, path_buff);
len_acc += len_path; });
}); } else {
float totalLen = 0.0f;
pbuff.decodePath(rshape, true, [&](const WgVertexBuffer& path_buff) {
appendShape(context, path_buff);
totalLen += path_buff.total();
});
float len_beg = totalLen * tbeg; // trim length begin
float len_end = totalLen * tend; // trim length end
float len_acc = 0.0; // accumulated length
// append strokes
pbuff.decodePath(rshape, true, [&](const WgVertexBuffer& path_buff) {
float len_path = path_buff.total(); // current path length
float tbeg = ((len_acc <= len_beg) && (len_acc + len_path > len_beg)) ? (len_beg - len_acc) / len_path : 0.0f;
float tend = ((len_acc <= len_end) && (len_acc + len_path > len_end)) ? (len_end - len_acc) / len_path : 1.0f;
if ((len_acc + len_path >= len_beg) && (len_acc <= len_end))
proceedStrokes(context, rshape.stroke, tbeg, tend, path_buff);
len_acc += len_path;
});
}
} }
// update shapes bbox // update shapes bbox
updateAABB(tr); updateAABB(tr);