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

wg_engine: fix dash offset behavior

Browse source 
For an odd number of dash/gap segments, the offset was
handled incorrectly because the non-doubled count of
dashes and gaps was used.
Additionally, in ddcbbf7, an error was introduced by
overlooking the fact that the offset can shift the dash
pattern in such a way that the first segment of the dashed
line becomes a gap.
This commit is contained in:
Mira Grudzinska 2025-02-13 18:24:49 +01:00 • committed by Sergii Liebodkin
parent 6c0556d275
commit f4c2d116d9
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -295,21 +295,22 @@ struct WgVertexBufferInd
float len_total = dashPattern[index_dash]; float len_total = dashPattern[index_dash];
// get dashes length // get dashes length
float dashes_lenth{}; float dashes_lenth{};
for (uint32_t i = 0; i < dashCnt; i++) for (uint32_t i = 0; i < dashCnt * (dashCnt % 2 + 1); i++)
dashes_lenth += dashPattern[i]; dashes_lenth += dashPattern[i % dashCnt];
if (dashes_lenth == 0) return; if (dashes_lenth == 0) return;
// normalize dash offset // normalize dash offset
float dashOffset = rstroke->dashOffset; float dashOffset = rstroke->dashOffset;
while(dashOffset < 0) dashOffset += dashes_lenth; while(dashOffset < 0) dashOffset += dashes_lenth;
while(dashOffset > dashes_lenth) dashOffset -= dashes_lenth; while(dashOffset > dashes_lenth) dashOffset -= dashes_lenth;
auto gap = false;
// scip dashes by offset // scip dashes by offset
while(len_total < dashOffset) { while(len_total < dashOffset) {
index_dash = (index_dash + 1) % dashCnt; index_dash = (index_dash + 1) % dashCnt;
len_total += dashPattern[index_dash]; len_total += dashPattern[index_dash];
gap = !gap;
} }
len_total -= dashOffset; len_total -= dashOffset;
// iterate by polyline points // iterate by polyline points
auto gap = false;
for (uint32_t i = 0; i < buff.vcount - 1; i++) { for (uint32_t i = 0; i < buff.vcount - 1; i++) {
// append current polyline point // append current polyline point
if (!gap) dashed.append(buff.vbuff[i]); if (!gap) dashed.append(buff.vbuff[i]);