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

mask yMin yMax better

Browse source
This commit is contained in:
Ryan Oldenburg 2021-12-13 02:25:58 -06:00
parent 1214861870
commit 85780637fc
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/pixie/images.nim
View file

@ -768,17 +768,12 @@ proc drawUber(
) )
# Determine where we should start and stop drawing in the y dimension # Determine where we should start and stop drawing in the y dimension
var yMin, yMax: int var
if blendMode == bmMask:
yMin = 0
yMax = a.height
else:
yMin = a.height yMin = a.height
yMax = 0 yMax = 0
for segment in perimeter: for segment in perimeter:
yMin = min(yMin, segment.at.y.floor.int) yMin = min(yMin, segment.at.y.floor.int)
yMax = max(yMax, segment.at.y.ceil.int) yMax = max(yMax, segment.at.y.ceil.int)
yMin = yMin.clamp(0, a.height) yMin = yMin.clamp(0, a.height)
yMax = yMax.clamp(0, a.height) yMax = yMax.clamp(0, a.height)
@ -787,6 +782,10 @@ proc drawUber(
else: # a is a Mask else: # a is a Mask
let masker = blendMode.masker() let masker = blendMode.masker()
if blendMode == bmMask:
if yMin > 0:
zeroMem(a.data[0].addr, 4 * yMin * a.width)
for y in yMin ..< yMax: for y in yMin ..< yMax:
# Determine where we should start and stop drawing in the x dimension # Determine where we should start and stop drawing in the x dimension
var var
@ -1007,6 +1006,10 @@ proc drawUber(
if a.width - xMax > 0: if a.width - xMax > 0:
zeroMem(a.data[a.dataIndex(xMax, y)].addr, 4 * (a.width - xMax)) zeroMem(a.data[a.dataIndex(xMax, y)].addr, 4 * (a.width - xMax))
if blendMode == bmMask:
if a.height - yMax > 0:
zeroMem(a.data[a.dataIndex(0, yMax)].addr, 4 * a.width * (a.height - yMax))
proc draw*( proc draw*(
a, b: Image, transform = mat3(), blendMode = bmNormal a, b: Image, transform = mat3(), blendMode = bmNormal
) {.inline, raises: [PixieError].} = ) {.inline, raises: [PixieError].} =