添加文档并修复问题

konabot/plugins/memepack/drawing/display.py

@@ -57,8 +57,14 @@ async def draw_cao_display(image: PIL.Image.Image):
     return await asyncio.to_thread(_draw_cao_display, image)
 
 
-def _draw_snaur_display(image: PIL.Image.Image):
-    src = np.array(image.convert("RGB"))
+def _draw_snaur_display(
+    image      : PIL.Image.Image,
+    whiteness  : float = 0.0    ,
+    black_level: float = 0.2    ,
+    opacity    : float = 0.8    ,
+    saturation : float = 0.85   ,
+):
+    src = np.array(image.convert("RGBA"))
     _h, _w = src.shape[:2]
 
     if _w / _h < SNAUR_RATIO:
@@ -98,25 +104,38 @@ def _draw_snaur_display(image: PIL.Image.Image):
         borderValue=(0, 0, 0)
     )
 
-    result = PIL.Image.fromarray(warped, 'RGB').convert('RGBA')
-    result = PIL.ImageChops.multiply(result, snaur_image_base)
+    result = PIL.Image.fromarray(warped, 'RGBA')
 
     r, g, b, a = result.split()
-    a = a.point(lambda p: int(p * 0.8))
-    f2 = lambda p: int(p * 0.8 + 0.2)
+    a = a.point(lambda p: int(p * opacity))
+    f2 = lambda p: int(
+        ((p / 255) ** (2 ** whiteness)) * 255 * (1 - black_level)
+            + 255 * black_level
+    )
     r = r.point(f2)
     g = g.point(f2)
     b = b.point(f2)
     result = PIL.Image.merge('RGBA', (r, g, b, a))
-    result = PIL.Image.alpha_composite(snaur_image_base, result)
 
     enhancer = PIL.ImageEnhance.Color(result)
-    result = enhancer.enhance(0.85)
+    result = enhancer.enhance(saturation)
 
+    result = PIL.ImageChops.multiply(result, snaur_image_base)
+
+    result = PIL.Image.alpha_composite(snaur_image_base, result)
     result = PIL.Image.alpha_composite(result, snaur_image_top)
     return result
 
 
-async def draw_snaur_display(image: PIL.Image.Image) -> PIL.Image.Image:
-    return await asyncio.to_thread(_draw_snaur_display, image)
+async def draw_snaur_display(
+    image      : PIL.Image.Image,
+    whiteness  : float = 0.0    ,
+    black_level: float = 0.2    ,
+    opacity    : float = 0.8    ,
+    saturation : float = 0.85   ,
+) -> PIL.Image.Image:
+    return await asyncio.to_thread(
+        _draw_snaur_display, image, whiteness, black_level,
+        opacity, saturation,
+    )