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

wg_engine: fix stroke trimming

Browse source 
Fix cases when begin < 0 - this require handling the stroke
in two parts: begin - 0 and 0 - end.
Improve trimming for simultaneous=true.
This commit is contained in:
Mira Grudzinska 2024-09-25 23:02:07 +02:00 • committed by Hermet Park
parent fa17fcde81
commit 2fc0aad2d1
2 changed files with 25 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/renderer/wg_engine/tvgWgGeometry.h
View file

@ -125,15 +125,8 @@ struct WgVertexBuffer {
// append source vertex buffer in index range from start to end (end not included) // append source vertex buffer in index range from start to end (end not included)
void appendRange(const WgVertexBuffer& buff, size_t start_index, size_t end_index) { void appendRange(const WgVertexBuffer& buff, size_t start_index, size_t end_index) {
if (start_index <= end_index)
for (size_t i = start_index; i < end_index; i++) for (size_t i = start_index; i < end_index; i++)
append(buff.vbuff[i]); append(buff.vbuff[i]);
if (start_index > end_index) {
for (size_t i = start_index; i < buff.vcount; i++)
append(buff.vbuff[i]);
for (size_t i = 0; i < end_index; i++)
append(buff.vbuff[i]);
}
} }
// append circle (list of triangles) // append circle (list of triangles)

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

@ -365,6 +365,7 @@ void WgRenderDataShape::updateMeshes(WgContext &context, const RenderShape &rsha
} else { } else {
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; }
bool loop = tbeg > tend;
if (tbeg == tend) { if (tbeg == tend) {
pbuff.decodePath(rshape, false, [&](const WgVertexBuffer& path_buff) { pbuff.decodePath(rshape, false, [&](const WgVertexBuffer& path_buff) {
appendShape(context, path_buff); appendShape(context, path_buff);
@ -372,7 +373,12 @@ void WgRenderDataShape::updateMeshes(WgContext &context, const RenderShape &rsha
} else if (rshape.stroke->trim.simultaneous) { } else if (rshape.stroke->trim.simultaneous) {
pbuff.decodePath(rshape, true, [&](const WgVertexBuffer& path_buff) { pbuff.decodePath(rshape, true, [&](const WgVertexBuffer& path_buff) {
appendShape(context, path_buff); appendShape(context, path_buff);
if (loop) {
proceedStrokes(context, rshape.stroke, tbeg, 1.0f, path_buff);
proceedStrokes(context, rshape.stroke, 0.0f, tend, path_buff);
} else {
proceedStrokes(context, rshape.stroke, tbeg, tend, path_buff); proceedStrokes(context, rshape.stroke, tbeg, tend, path_buff);
}
}); });
} else { } else {
float totalLen = 0.0f; float totalLen = 0.0f;
@ -386,10 +392,22 @@ void WgRenderDataShape::updateMeshes(WgContext &context, const RenderShape &rsha
// append strokes // append strokes
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 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; if (loop) {
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) {
if ((len_acc + len_path >= len_beg) && (len_acc <= len_end)) auto tbeg = len_acc <= len_beg ? (len_beg - len_acc) / len_path : 0.0f;
proceedStrokes(context, rshape.stroke, tbeg, 1.0f, path_buff);
}
if (len_acc < len_end) {
auto tend = len_acc + len_path >= len_end ? (len_end - len_acc) / len_path : 1.0f;
proceedStrokes(context, rshape.stroke, 0.0f, tend, path_buff);
}
} else {
if (len_acc + len_path >= len_beg && len_acc <= len_end) {
auto tbeg = len_acc <= len_beg ? (len_beg - len_acc) / len_path : 0.0f;
auto tend = len_acc + len_path >= len_end ? (len_end - len_acc) / len_path : 1.0f;
proceedStrokes(context, rshape.stroke, tbeg, tend, path_buff); proceedStrokes(context, rshape.stroke, tbeg, tend, path_buff);
}
}
len_acc += len_path; len_acc += len_path;
}); });
} }