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

fix trapezoid + MaskBlend aa

Browse source
This commit is contained in:
Ryan Oldenburg 2022-07-26 01:24:50 -05:00
parent 3d13292806
commit b4cc7cdefc
2 changed files with 25 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/pixie/paths.nim
View file

@ -1622,7 +1622,8 @@ proc fillHits(
hits: seq[(Fixed32, int16)], hits: seq[(Fixed32, int16)],
numHits: int, numHits: int,
windingRule: WindingRule, windingRule: WindingRule,
blendMode: BlendMode blendMode: BlendMode,
maskClears = true
) = ) =
template simdBlob(image: Image, x: var int, len: int, blendProc: untyped) = template simdBlob(image: Image, x: var int, len: int, blendProc: untyped) =
when allowSimd: when allowSimd:
@ -1660,7 +1661,7 @@ proc fillHits(
var filledTo = startX var filledTo = startX
for (start, len) in hits.walkInteger(numHits, windingRule, y, image.width): for (start, len) in hits.walkInteger(numHits, windingRule, y, image.width):
block: # Clear any gap between this fill and the previous fill if maskClears: # Clear any gap between this fill and the previous fill
let gapBetween = start - filledTo let gapBetween = start - filledTo
if gapBetween > 0: if gapBetween > 0:
fillUnsafe( fillUnsafe(
@ -1669,7 +1670,6 @@ proc fillHits(
image.dataIndex(filledTo, y), image.dataIndex(filledTo, y),
gapBetween gapBetween
) )
filledTo = start + len
block: # Handle this fill block: # Handle this fill
if rgbx.a != 255: if rgbx.a != 255:
var x = start var x = start
@ -1678,7 +1678,9 @@ proc fillHits(
for _ in x ..< start + len: for _ in x ..< start + len:
let backdrop = image.data[dataIndex] let backdrop = image.data[dataIndex]
image.data[dataIndex] = blendMask(backdrop, rgbx) image.data[dataIndex] = blendMask(backdrop, rgbx)
filledTo = start + len
if maskClears:
image.clearUnsafe(0, y, startX, y) image.clearUnsafe(0, y, startX, y)
image.clearUnsafe(filledTo, y, image.width, y) image.clearUnsafe(filledTo, y, image.width, y)
@ -1864,9 +1866,7 @@ proc fillShapes(
i += 2 i += 2
if onlySimpleFillPairs: if onlySimpleFillPairs:
numHits = 0 var i, filledTo: int
var i: int
while i < numEntryIndices: while i < numEntryIndices:
let let
left = partition.entries[entryIndices[i]] left = partition.entries[entryIndices[i]]
@ -1971,13 +1971,24 @@ proc fillShapes(
let let
fillBegin = leftCoverEnd.clamp(0, image.width) fillBegin = leftCoverEnd.clamp(0, image.width)
fillEnd = rightCoverBegin.clamp(0, image.width) fillEnd = rightCoverBegin.clamp(0, image.width)
hits[numHits] = (fixed32(fillBegin.float32), 1.int16) hits[0] = (fixed32(fillBegin.float32), 1.int16)
hits[numHits + 1] = (fixed32(fillEnd.float32), -1.int16) hits[1] = (fixed32(fillEnd.float32), -1.int16)
numHits += 2 image.fillHits(rgbx, 0, y, hits, 2, NonZero, blendMode, false)
if blendMode == MaskBlend:
let clearTo = min(trapLeft.at.x, trapLeft.to.x).int
image.clearUnsafe(
min(filledTo, image.width),
y,
min(clearTo, image.width),
y
)
filledTo = max(trapRight.at.x, trapRight.to.x).ceil.int
i += 2 i += 2
if numHits > 0: if blendMode == MaskBlend:
image.fillHits(rgbx, 0, y, hits, numHits, NonZero, blendMode) image.clearUnsafe(min(filledTo, image.width), y, image.width, y)
inc y inc y
continue continue

2
tests/bench_paths.nim
View file

@ -33,7 +33,7 @@ roundedRect.roundedRect(10.5, 10.5, 479, 279, radius, radius, radius, radius)
let image = newImage(width, height) let image = newImage(width, height)
timeIt "rectOverwriteBlend": timeIt "rect OverwriteBlend":
paint.blendMode = OverwriteBlend paint.blendMode = OverwriteBlend
image.fillPath(rect, paint) image.fillPath(rect, paint)