From 6efbe23c648c2d7df18849eace21313c564acfcd Mon Sep 17 00:00:00 2001
From: Nat Quayle Nelson <natquaylenelson@gmail.com>
Date: Thu, 6 Jan 2022 20:30:14 -0700
Subject: [PATCH] prop layers for full screen position control

---
 src/hollywoo_flixel/FlxDirector.kiss   | 23 +++++++++++++++++++----
 src/hollywoo_flixel/FlxMovie.hx        |  4 ++++
 src/hollywoo_flixel/SceneFlxState.hx   |  1 +
 src/hollywoo_flixel/SceneFlxState.kiss | 11 ++++++++++-
 4 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/src/hollywoo_flixel/FlxDirector.kiss b/src/hollywoo_flixel/FlxDirector.kiss
index 66f62ff..41f8817 100644
--- a/src/hollywoo_flixel/FlxDirector.kiss
+++ b/src/hollywoo_flixel/FlxDirector.kiss
@@ -253,9 +253,8 @@
 (var PROP_MIN_WIDTH 200)
 (var PROP_MAX_WIDTH 500)
 
-(method :Void showPropOnScreen [:FlxSprite prop :FlxScreenPosition position :Continuation cc]
+(method :Void quickShowPropOnScreen [:FlxSprite prop :FlxScreenPosition position :Continuation cc]
     // TODO assign the other possible positions
-    // TODO allow absolute position and relative position by screen percentages
     (let [[x y]
                 (case position
                     (Center [(/ 1280 2) (/ 720 2)])
@@ -277,11 +276,27 @@
                     (-= prop.y (- propBottom DIALOG_Y))))
 
             (currentState.add prop)))
-        // TODO give the prop reveal some time to land
     (cc))
 
-(method :Void hideProp [prop cc]
+(method :Void smartShowPropOnScreen [:FlxSprite prop :Int layer :RelativePosition rpos :Continuation cc]
+    (assert (<= 0 layer SceneFlxState.LAYER_MAX) "Layer $layer is out of range 0-$SceneFlxState.LAYER_MAX")
+    (let [canvas (new FlxSprite 0 0)]
+        (canvas.makeGraphic 1280 720 FlxColor.BLACK)
+        (let [[x y] (SpriteTools.positionOn prop canvas rpos)]
+            (SpriteTools.scaleStampOn prop canvas rpos)
+            (.add (nth currentState.spriteLayers layer) prop)))
+    (cc))
+
+(method :Void showPropOnScreen [:FlxSprite prop :FlxScreenPosition position :Continuation cc]
+    // TODO give the prop reveal some time to land (add a delay to the cc)
+    (ifLet [(FullControl layer rpos) position]
+            (smartShowPropOnScreen prop layer rpos cc)
+        (quickShowPropOnScreen prop position cc)))
+
+(method :Void hideProp [:FlxSprite prop cc]
     (currentState.remove prop)
+    (doFor layer currentState.spriteLayers
+        (layer.remove prop))
     (cc))
 
 (prop :Array<FlxText> creditsText [])
diff --git a/src/hollywoo_flixel/FlxMovie.hx b/src/hollywoo_flixel/FlxMovie.hx
index e4bed39..e34420c 100644
--- a/src/hollywoo_flixel/FlxMovie.hx
+++ b/src/hollywoo_flixel/FlxMovie.hx
@@ -22,6 +22,7 @@ enum FlxStageFacing {
 }
 
 enum FlxScreenPosition {
+    // Shortcuts
     UpperLeft;
     UpperRight;
     LowerLeft;
@@ -29,6 +30,9 @@ enum FlxScreenPosition {
     LowerCenter;
     UpperCenter;
     Center;
+
+    // Specify the layer and position relative to screen size, or in absolute coordinates, etc.
+    FullControl(layer:Int, pos:RelativePosition);
 }
 
 /**
diff --git a/src/hollywoo_flixel/SceneFlxState.hx b/src/hollywoo_flixel/SceneFlxState.hx
index c18eb03..d25f99a 100644
--- a/src/hollywoo_flixel/SceneFlxState.hx
+++ b/src/hollywoo_flixel/SceneFlxState.hx
@@ -6,6 +6,7 @@ import kiss.FuzzyMap;
 import flixel.FlxSubState;
 import flixel.FlxState;
 import flixel.FlxSprite;
+import flixel.group.FlxGroup;
 import flixel.FlxG;
 import hollywoo.Scene;
 import hollywoo_flixel.FlxMovie;
diff --git a/src/hollywoo_flixel/SceneFlxState.kiss b/src/hollywoo_flixel/SceneFlxState.kiss
index c89bfc2..a061b63 100644
--- a/src/hollywoo_flixel/SceneFlxState.kiss
+++ b/src/hollywoo_flixel/SceneFlxState.kiss
@@ -4,6 +4,10 @@
 (prop &mut :ActorFlxSprite actorOnRight null)
 (prop &mut :Character<FlxStagePosition,FlxStageFacing,ActorFlxSprite> characterOnRight null)
 
+// Track props in an arbitrary number of layers
+(prop :Array<FlxTypedGroup<FlxSprite>> spriteLayers [])
+(var LAYER_MAX 5)
+
 (defNew [&prop :FlxSprite setSprite &prop :SceneTime time &prop :ScenePerspective perspective]
     [
         &mut :FlxState parent null
@@ -11,7 +15,12 @@
         :Map<FlxSprite,FlxScreenPosition> propsOnScreen (new Map)
     ]
     (super)
-    (add setSprite))
+    (add setSprite)
+    // TODO characters will be in front of every prop layer -- characters need their own group layer
+    (doFor i (range LAYER_MAX)
+        (let [g (new FlxTypedGroup<FlxSprite>)]
+            (spriteLayers.push g)
+            (add g))))
 
 (method &override :Void create []
     (super.create)