Gallery updates (#250)

arlunio/image.py

@@ -54,6 +54,10 @@ def _repr_png_(self):
         # Give nice previews in jupyter notebooks
         return self.img._repr_png_()
 
+    @property
+    def size(self):
+        return self.img.size
+
     def alpha_composite(self, im, *args, **kwargs):
         """Composites an image onto this image.
 
@@ -85,6 +89,14 @@ def save(self, *args, **kwargs):
         """
         self.img.save(*args, **kwargs)
 
+    def thumbnail(self, *args, **kwargs):
+        """Convert this image into a thumbail.
+
+        See :meth:`pillow:PIL.Image.Image.thumbnail`
+        """
+
+        self.img.thumbnail(*args, **kwargs)
+
 
 def new(*args, **kwargs):
     """Creates a new image with the given mode and size

arlunio/mask.py

@@ -209,7 +209,11 @@ def any_(*args: Union[bool, np.ndarray, Mask]) -> Mask:
 
     The arguments can be any mixture of booleans, arrays and masks.
 
-    >>> mask.any_(False, mask.Mask([True, False]), np.array([[False, True], [True, False]]))  # noqa: E501
+    >>> mask.any_(
+    ...     False,
+    ...     mask.Mask([True, False]),
+    ...     np.array([[False, True], [True, False]])
+    ... )
     Mask([[ True,  True],
           [ True, False]])
 
@@ -265,7 +269,11 @@ def all_(*args: Union[bool, np.ndarray, Mask]) -> Mask:
 
     Arugments can be any mixture of booleans, masks and numpy arrays.
 
-    >>> mask.all_(True, mask.Mask([True, False]), np.array([[False, True], [True, False]]))  # noqa: E501
+    >>> mask.all_(
+    ...     True,
+    ...     mask.Mask([True, False]),
+    ...     np.array([[False, True], [True, False]])
+    ... )
     Mask([[False, False],
           [ True, False]])
 
@@ -467,8 +475,9 @@ def Map(width: int, height: int, *, layout=None, legend=None, fill=None) -> Mask
           ])
 
           map_ = mask.Map(legend=legend, layout=layout)
-          img = image.fill(map_(width=1080, height=1080), foreground="blue")
-
+          img = image.fill(
+              map_(width=1080, height=1080), foreground="blue", background="white"
+          )
     """
     fill = fill if fill is not None else Empty()
 
@@ -556,7 +565,7 @@ def Pixelize(width: int, height: int, *, mask=None, defn=None, scale=16) -> Mask
           ])
 
           defn = mask.Pixelize(mask=face)
-          img = image.fill(defn(width=512, height=512))
+          img = image.fill(defn(width=512, height=512), background="white")
 
     We can also generate the mask directly from another definition.
 
@@ -589,7 +598,9 @@ def Ghost(x: math.X, y: math.Y) -> mask.Mask:
               return (head(x=x, y=y) - eyes(x=np.abs(x), y=y)) + body
 
           ghost = mask.Pixelize(defn=Ghost(y0=-0.3), scale=32)
-          img = image.fill(ghost(width=1080, height=1080), foreground="#f00")
+          img = image.fill(
+              ghost(width=1080, height=1080), foreground="#f00", background="white"
+          )
 
     """
     logger = logging.getLogger(__name__)

arlunio/raytrace/material.py

@@ -45,7 +45,7 @@ def NormalMap(scatter: ScatterPoint):
 def LambertianDiffuse(scatter: ScatterPoint, *, color="lightgrey"):
     """Lambertian diffuse material."""
 
-    color = getcolorf(color)
+    color = getcolorf(color, "RGB")
     n = scatter.p.shape[0]
 
     origin = scatter.p

arlunio/raytrace/render.py

@@ -1,19 +1,21 @@
 import logging
 
 import numpy as np
-import PIL.Image as Image
 
 import arlunio as ar
+import arlunio.image as image
+import arlunio.math as math
 from .camera import SimpleCamera
 from .data import Rays
 from .data import ScatterPoint
 from .material import Gradient
 from .material import LambertianDiffuse
-from arlunio.math import clamp
 
 
 @ar.definition
-def ZDepthRenderer(width: int, height: int, *, camera=None, objects=None):
+def ZDepthRenderer(
+    width: int, height: int, *, camera=None, objects=None
+) -> image.Image:
     """A renderer that returns a z-depth pass."""
 
     camera = SimpleCamera() if camera is None else camera
@@ -32,7 +34,7 @@ def ZDepthRenderer(width: int, height: int, *, camera=None, objects=None):
     vs = np.array((depth / np.max(depth)) * 255, dtype=np.uint8)
     vs = vs.reshape(height, width)
 
-    return Image.fromarray(vs, "L")
+    return image.fromarray(vs, "L")
 
 
 @ar.definition
@@ -45,7 +47,7 @@ def ClayRenderer(
     camera=None,
     objects=None,
     bounces=8,
-):
+) -> image.Image:
     """A simple clay renderer."""
 
     background = Gradient() if background is None else background
@@ -171,7 +173,7 @@ def MaterialRenderer(
 
 
 @ar.definition
-def SampledRenderer(width: int, height: int, *, kernel=None, samples=10):
+def SampledRenderer(width: int, height: int, *, kernel=None, samples=10) -> image.Image:
     """A renderer is responsible for orchestrating the entire process."""
 
     if kernel is None:
@@ -188,11 +190,11 @@ def SampledRenderer(width: int, height: int, *, kernel=None, samples=10):
     # Gamma correction...
     cols = np.sqrt(cols)
 
-    r = clamp(cols[:, 0], 0, 0.99999) * 256
-    g = clamp(cols[:, 1], 0, 0.99999) * 256
-    b = clamp(cols[:, 2], 0, 0.99999) * 256
+    r = math.clamp(cols[:, 0], 0, 0.99999) * 256
+    g = math.clamp(cols[:, 1], 0, 0.99999) * 256
+    b = math.clamp(cols[:, 2], 0, 0.99999) * 256
 
     color = np.array(np.dstack([r, g, b])[0], dtype=np.uint8)
     color = color.reshape(height, width, 3)
 
-    return Image.fromarray(color, "RGB")
+    return image.fromarray(color, "RGB")