MyouProject/pixie
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

scanLineHits a bunch faster

Browse source
This commit is contained in:
Ryan Oldenburg 2020-12-04 14:09:08 -06:00
parent 4536baeefd
commit cddfe43315
2 changed files with 28 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/pixie/paths.nim
View file

@ -599,32 +599,38 @@ proc fillPolygons*(
proc scanLineHits( proc scanLineHits(
polys: seq[seq[Vec2]], polys: seq[seq[Vec2]],
hits: var seq[(float32, bool)], hits: var seq[(float32, bool)],
size: Vec2,
y: int, y: int,
shiftY: float32 shiftY: float32
) = ) {.inline.} =
hits.setLen(0) hits.setLen(0)
var yLine = (float32(y) + ep) + shiftY
var scan = Segment(at: vec2(-10000, yLine), to: vec2(100000, yLine)) let
yLine = (float32(y) + ep) + shiftY
scan = Segment(at: vec2(-10000, yLine), to: vec2(100000, yLine))
for poly in polys: for poly in polys:
for (at, to) in poly.zipwise: for e in poly.zipwise:
let line = Segment(at: at, to: to) let line = cast[Segment](e)
var at: Vec2 var at: Vec2
if line.intersects(scan, at): if line.intersects(scan, at):
let winding = line.at.y > line.to.y let
let x = at.x.clamp(0, size.x) winding = line.at.y > line.to.y
x = at.x.clamp(0, size.x)
hits.add((x, winding)) hits.add((x, winding))
hits.sort(proc(a, b: (float32, bool)): int = cmp(a[0], b[0])) hits.sort(proc(a, b: (float32, bool)): int = cmp(a[0], b[0]))
var hits: seq[(float32, bool)] var
hits = newSeq[(float32, bool)]()
var alphas = newSeq[float32](result.width) alphas = newSeq[float32](result.width)
for y in 0 ..< result.height: for y in 0 ..< result.height:
for x in 0 ..< result.width: # Reset alphas for this row.
alphas[x] = 0 zeroMem(alphas[0].addr, alphas.len * 4)
# Do scanlines for this row.
for m in 0 ..< quality: for m in 0 ..< quality:
polys.scanLineHits(hits, y, float32(m)/float32(quality)) polys.scanLineHits(hits, size, y, float32(m) / float32(quality))
if hits.len == 0: if hits.len == 0:
continue continue
var var
@ -633,12 +639,11 @@ proc fillPolygons*(
for x in 0 ..< result.width: for x in 0 ..< result.width:
var penEdge = penFill var penEdge = penFill
while true: while true:
if curHit >= hits.len: if curHit >= hits.len or x != hits[curHit][0].int:
break break
if x != hits[curHit][0].int: let
break cover = hits[curHit][0] - x.float32
let cover = hits[curHit][0] - x.float32 winding = hits[curHit][1]
let winding = hits[curHit][1]
if winding == false: if winding == false:
penFill += 1.0 penFill += 1.0
penEdge += 1.0 - cover penEdge += 1.0 - cover
@ -647,6 +652,7 @@ proc fillPolygons*(
penEdge -= 1.0 - cover penEdge -= 1.0 - cover
inc curHit inc curHit
alphas[x] += penEdge alphas[x] += penEdge
for x in 0 ..< result.width: for x in 0 ..< result.width:
let a = clamp(abs(alphas[x]) / float32(quality), 0.0, 1.0) let a = clamp(abs(alphas[x]) / float32(quality), 0.0, 1.0)
var colorWithAlpha = color var colorWithAlpha = color

5
tests/test_svg.nim
View file

@ -3,4 +3,7 @@ import pixie/fileformats/svg, pixie
let let
original = readFile("tests/images/svg/Ghostscript_Tiger.svg") original = readFile("tests/images/svg/Ghostscript_Tiger.svg")
image = decodeSvg(original) image = decodeSvg(original)
image.writeFile("tests/images/svg/Ghostscript_Tiger.png") gold = readImage("tests/images/svg/Ghostscript_Tiger.png")
doAssert image.data == gold.data
# image.writeFile("tests/images/svg/Ghostscript_Tiger.png")