overlay_scale feature

Author: FoamyGuy

adafruit_pycamera/__init__.py

@@ -240,6 +240,7 @@ def __init__(self) -> None:  # pylint: disable=too-many-statements
         self.combined_bmp = None
         self.preview_scale = None
         self.overlay_position = [None, None]
+        self.overlay_scale = 1.0
         self.splash = displayio.Group()
 
         # Reset display and I/O expander
@@ -929,13 +930,15 @@ def blit_overlay_into_last_capture(self):
 
         self.decoder.decode(photo_bitmap, scale=0, x=0, y=0)
 
-        bitmaptools.blit(
+        bitmaptools.rotozoom(
             photo_bitmap,
             self.overlay_bmp,
-            self.overlay_position[0] if self.overlay_position[0] is not None else 0,
-            self.overlay_position[1] if self.overlay_position[1] is not None else 0,
-            skip_source_index=self.overlay_transparency_color,
-            skip_dest_index=None,
+            ox=self.overlay_position[0] if self.overlay_position[0] is not None else 0,
+            oy=self.overlay_position[1] if self.overlay_position[1] is not None else 0,
+            px=0 if self.overlay_position[0] is not None else None,
+            py=0 if self.overlay_position[1] is not None else None,
+            skip_index=self.overlay_transparency_color,
+            scale=self.overlay_scale,
         )
 
         cc565_swapped = ColorConverter(input_colorspace=Colorspace.RGB565_SWAPPED)
@@ -1007,7 +1010,7 @@ def blit(self, bitmap, x_offset=0, y_offset=32):
             bitmaptools.rotozoom(
                 self.combined_bmp,
                 self.overlay_bmp,
-                scale=self.preview_scale,
+                scale=self.preview_scale * self.overlay_scale,
                 skip_index=self.overlay_transparency_color,
                 ox=int(self.overlay_position[0] * self.preview_scale)
                 if self.overlay_position[0] is not None

examples/overlay/code_select.py

@@ -2,9 +2,16 @@
 # SPDX-FileCopyrightText: Copyright (c) 2024 Tim Cocks for Adafruit Industries
 #
 # SPDX-License-Identifier: MIT
-""" simple point-and-shoot camera example, with overly selecting using select button.
+""" simple point-and-shoot camera example, with overly capabilities.
 
 Place all overlay files inside /sd/overlays/ directory.
+
+Usage:
+
+Select Button - Change to the next overlay file
+OK Button - Change between position and scale modes
+D-Pad - Change the overlay's position or scale depending on which mode
+  we're currently in.
 """
 import os
 import time