From 33479e5612573149c96a38269e42d132928827d6 Mon Sep 17 00:00:00 2001
From: Ryan Oldenburg <guzba8@gmail.com>
Date: Mon, 8 Feb 2021 19:57:36 -0600
Subject: [PATCH] draw image into mask

---
 src/pixie/images.nim                   |  18 +++++++++---------
 tests/images/masks/imageMaskedMask.png | Bin 0 -> 885 bytes
 tests/test_masks.nim                   |  13 +++++++++++++
 3 files changed, 22 insertions(+), 9 deletions(-)
 create mode 100644 tests/images/masks/imageMaskedMask.png

diff --git a/src/pixie/images.nim b/src/pixie/images.nim
index f7b8bd5..fef0bba 100644
--- a/src/pixie/images.nim
+++ b/src/pixie/images.nim
@@ -309,12 +309,7 @@ proc drawCorrect(
     else: # b is a Mask
       validateMaskBlendMode()
   else: # a is a Mask
-    when type(b) is Image:
-      raise newException(
-        PixieError,
-        "Drawing an image onto a mask is not supported yet"
-        )
-    else: # b is a Mask
+    when type(b) is Mask:
       validateMaskBlendMode()
 
   var
@@ -355,9 +350,11 @@ proc drawCorrect(
           )
         a.setRgbaUnsafe(x, y, blended)
       else: # a is a Mask, b must be a mask
-        let
-          value = a.getValueUnsafe(x, y)
-          sample = b.getValueSmooth(xFloat, yFloat).uint32
+        let value = a.getValueUnsafe(x, y)
+        when type(b) is Image:
+          let sample = b.getRgbaSmooth(xFloat, yFloat).a.uint32
+        else: # a is a Mask
+          let sample = b.getValueSmooth(xFloat, yFloat).uint32
         a.setValueUnsafe(x, y, ((value * sample) div 255).uint8)
 
 proc draw*(image: Image, mask: Mask, mat: Mat3, blendMode = bmMask) =
@@ -371,6 +368,9 @@ proc draw*(
 proc draw*(a, b: Mask, mat = mat3(), blendMode = bmMask) =
   a.drawCorrect(b, mat, blendMode)
 
+proc draw*(mask: Mask, image: Image, mat = mat3(), blendMode = bmMask) =
+  mask.drawCorrect(image, mat, blendMode)
+
 when defined(release):
   {.pop.}
 
diff --git a/tests/images/masks/imageMaskedMask.png b/tests/images/masks/imageMaskedMask.png
new file mode 100644
index 0000000000000000000000000000000000000000..eb13fae891b2101bbdada95316a620525090c47f
GIT binary patch
literal 885
zcmV-*1B(2KP)<h;3K|Lk000e1NJLTq003kF003kN00000Rf)=o0009#Nkl<ZcmeH~
zO-NKx7>2)5ht$#uYSWmaFl{YVlE@Z@Ry10W`4dI8kj555On<h?EP{wMDvJDVj2X8E
z{wyM+&1`bCKs3+_A&eH;W<a~(XqbQJUeEWPbFR=L&a;|(&pqdv^PY3QnHvxP04-5M
z$EAdhO9>s95;`s=bX-d4xRlUwDWMXVtF-pmP2cnS(&{{K(v%_Zk(Rj6-fphU%T04T
z9PYH-yo#&)woXMQJ(7~Nrl8jo$Br52IqKgzET@r@xNZgW9jsvqM@~&jL?$&EiT7Qx
zb7@#B&Vmc06V{vSk&s;LNM7G>g``un;g!!QLP=u4&q-<xNAa%yxwT6!BFUx!FSj2<
zc3~*STyhXe0wtVI7BVusEq5#kB-j0x=ecD6rq_j*l(doSvC6^WaUdWiuD6?st_+St
zE!24-CH04yfk=`U28eb_;tnBakV9^Os4$eIDW5YMg45N5v;a^N_e)bn6tKGup9(RP
z)1`uOO~ieUn66m}$sG^-ppb+R`UoybeU^as;*tIs-Nm@%colCboP>{~SR*buQ-JkB
z_<|l4Tyj1e84P0*Et9yUHVYdKVY(A(AS89$u|5dKQ>1~A+)c##AUN+K4TPjlRbtqX
zoKuZ!(nefmstZ42W8sTbw{Y0T7T&9R82fD;#%<-;W<hvjqpW=Ms})GYXQMzG`_)SQ
zn+{}#)H#6^iT`yBjkbQYzF$)L`Hj`s`uUBf=P+MXL`N6?1YU&!hAztgC7L;bPlS|2
zw;aH~orMRlEH_xFnLwnPc>OW)vl89E^zH&MK2^#6;hwJ=SsV<5oC%B@MOa4@H(r=7
zt<Vw(dt}OF@UnGSGXe?p7iO3{a0s8=;OkthD^oO=U^%tui-=|dbKSE=)aozPT@k(f
ziX{Ny$dRPQ@5AL+MSy$Xgm5MRFwqP-{IfsPSWfQUWn?5^40NXMS)bW_ds(+=IsPIg
z0f_dreT~mzt8(o1LthtBuUI4{0MWtFqoL^!^FMaL@KoRX`@Z%;NrlwHuVRe#^|rP&
zG_<t#_Kiv9w2bsjHiDKYq2p3Q$EAdhO9>s95;`s=bX-dOKXLs5-Hoq){E<Kl00000
LNkvXXu0mjfyAPs~

literal 0
HcmV?d00001

diff --git a/tests/test_masks.nim b/tests/test_masks.nim
index 161d606..e487a5b 100644
--- a/tests/test_masks.nim
+++ b/tests/test_masks.nim
@@ -48,3 +48,16 @@ block:
 
   a.draw(b)
   writeFile("tests/images/masks/maskedMask.png", a.encodePng())
+
+block:
+  let a = newMask(100, 100)
+  a.fill(255)
+
+  var path: Path
+  path.ellipse(a.width / 2, a.height / 2, 25, 25)
+
+  let b = newImage(a.width, a.height)
+  b.fillPath(path, rgba(0, 0, 0, 255))
+
+  a.draw(b)
+  writeFile("tests/images/masks/imageMaskedMask.png", a.encodePng())