From d9f9c548207acadcafed93886ab01002fadbf385 Mon Sep 17 00:00:00 2001
From: Jennifer Taylor <dragonminded@dragonminded.com>
Date: Sun, 20 Nov 2022 23:26:27 +0000
Subject: [PATCH] Fix HSL shift effect as applied to sprites with sub-sprites.

---
 bemani/format/afp/render.py | 61 +++++++++++++++++++++++++++++++++++--
 1 file changed, 59 insertions(+), 2 deletions(-)

diff --git a/bemani/format/afp/render.py b/bemani/format/afp/render.py
index a05a33a..c330ced 100644
--- a/bemani/format/afp/render.py
+++ b/bemani/format/afp/render.py
@@ -1552,7 +1552,7 @@ class AFPRenderer(VerboseOutput):
             .multiply(parent_mult_color)
             .add(parent_add_color)
         )
-        hsl_shift = renderable.hsl_shift or HSL(0.0, 0.0, 0.0).add(parent_hsl_shift)
+        hsl_shift = (renderable.hsl_shift or HSL(0.0, 0.0, 0.0)).add(parent_hsl_shift)
         blend = renderable.blend or 0
         if parent_blend not in {0, 1, 2} and blend in {0, 1, 2}:
             blend = parent_blend
@@ -1564,6 +1564,24 @@ class AFPRenderer(VerboseOutput):
         else:
             mask = parent_mask
 
+        if projection == AP2PlaceObjectTag.PROJECTION_AFFINE:
+            projection_string = "affine projection"
+        elif projection == AP2PlaceObjectTag.PROJECTION_PERSPECTIVE:
+            projection_string = "perspective projection"
+        else:
+            projection_string = "no projection"
+
+        if blend == 3:
+            blend_string = "multiply"
+        elif blend == 8:
+            blend_string = "addition"
+        elif blend == 9 or blend == 70:
+            blend_string = "subtraction"
+        elif blend == 13:
+            blend_string = "overlay"
+        else:
+            blend_string = "normal"
+
         # Render individual shapes if this is a sprite.
         if isinstance(renderable, PlacedClip):
             new_only_depths: Optional[List[int]] = None
@@ -1574,6 +1592,19 @@ class AFPRenderer(VerboseOutput):
                         return img
                     new_only_depths = only_depths
 
+            self.vprint(
+                f"{prefix}    Rendered object uses {projection_string} with transform [{transform}]",
+                component="render",
+            )
+            self.vprint(
+                f"{prefix}    Rendered object uses {blend_string} with {mult_color} and {add_color} colors",
+                component="render",
+            )
+            self.vprint(
+                f"{prefix}    Rendered object applies a HSL shift of {hsl_shift}",
+                component="render",
+            )
+
             # This is a sprite placement reference. Make sure that we render lower depths
             # first, but preserved placed order as well.
             depths = set(obj.depth for obj in renderable.placed_objects)
@@ -1592,13 +1623,26 @@ class AFPRenderer(VerboseOutput):
                         hsl_shift,
                         blend,
                         only_depths=new_only_depths,
-                        prefix=prefix + " ",
+                        prefix=prefix + "  ",
                     )
         elif isinstance(renderable, PlacedShape):
             if only_depths is not None and renderable.depth not in only_depths:
                 # Not on the correct depth plane.
                 return img
 
+            self.vprint(
+                f"{prefix}    Rendered object uses {projection_string} with transform [{transform}]",
+                component="render",
+            )
+            self.vprint(
+                f"{prefix}    Rendered object uses {blend_string} with {mult_color} and {add_color} colors",
+                component="render",
+            )
+            self.vprint(
+                f"{prefix}    Rendered object applies a HSL shift of {hsl_shift}",
+                component="render",
+            )
+
             # This is a shape draw reference.
             shape = renderable.source
 
@@ -1744,6 +1788,19 @@ class AFPRenderer(VerboseOutput):
                 # Not on the correct depth plane.
                 return img
 
+            self.vprint(
+                f"{prefix}    Rendered object uses {projection_string} with transform [{transform}]",
+                component="render",
+            )
+            self.vprint(
+                f"{prefix}    Rendered object uses {blend_string} with {mult_color} and {add_color} colors",
+                component="render",
+            )
+            self.vprint(
+                f"{prefix}    Rendered object applies a HSL shift of {hsl_shift}",
+                component="render",
+            )
+
             # This is a shape draw reference.
             texture = self.textures[renderable.source.reference]
             if projection == AP2PlaceObjectTag.PROJECTION_AFFINE: