From da63f5c2ff5407737e4df5f69846437e207135b6 Mon Sep 17 00:00:00 2001
From: Nat Quayle Nelson <natquaylenelson@gmail.com>
Date: Wed, 29 Mar 2023 06:33:32 -0600
Subject: [PATCH] Add Jsonable LightSource type param to Hollywoo

---
 projects/hollywoo-flixel/src/hollywoo_flixel/FlxDirector.hx  | 2 +-
 .../hollywoo-flixel/src/hollywoo_flixel/FlxDirector.kiss     | 2 +-
 projects/hollywoo-flixel/src/hollywoo_flixel/FlxMovie.hx     | 2 +-
 projects/hollywoo/src/hollywoo/Director.hx                   | 5 +++--
 projects/hollywoo/src/hollywoo/Movie.hx                      | 4 +++-
 projects/hollywoo/src/hollywoo/Movie.kiss                    | 2 +-
 6 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/projects/hollywoo-flixel/src/hollywoo_flixel/FlxDirector.hx b/projects/hollywoo-flixel/src/hollywoo_flixel/FlxDirector.hx
index 3e4d5958..f244c455 100644
--- a/projects/hollywoo-flixel/src/hollywoo_flixel/FlxDirector.hx
+++ b/projects/hollywoo-flixel/src/hollywoo_flixel/FlxDirector.hx
@@ -23,4 +23,4 @@ import kiss_flixel.SpriteTools;
 import haxe.ds.Option;
 
 @:build(kiss.Kiss.build())
-class FlxDirector implements Director<FlxSprite, FlxScreenPosition, ActorFlxSprite, FlxSound, String, FlxSprite, FlxSound, FlxCamera> {}
+class FlxDirector implements Director<FlxSprite, FlxScreenPosition, ActorFlxSprite, FlxSound, String, FlxSprite, FlxSound, FlxCamera, FlxLightSource> {}
diff --git a/projects/hollywoo-flixel/src/hollywoo_flixel/FlxDirector.kiss b/projects/hollywoo-flixel/src/hollywoo_flixel/FlxDirector.kiss
index e478859c..195b3df7 100644
--- a/projects/hollywoo-flixel/src/hollywoo_flixel/FlxDirector.kiss
+++ b/projects/hollywoo-flixel/src/hollywoo_flixel/FlxDirector.kiss
@@ -1,6 +1,6 @@
 (prop :FlxActionDigital continueAction) 
 (prop actionManager (new FlxActionManager))
-(prop &mut :Movie<FlxSprite,FlxScreenPosition,ActorFlxSprite,FlxSound,String,FlxSprite,FlxSound,FlxCamera> movie)
+(prop &mut :Movie<FlxSprite,FlxScreenPosition,ActorFlxSprite,FlxSound,String,FlxSprite,FlxSound,FlxCamera,FlxLightSource> movie)
 (defAlias &ident flxMovie (cast movie FlxMovie))
 (loadFrom "hollywoo-flixel" "src/hollywoo_flixel/Aliases.kiss")
 
diff --git a/projects/hollywoo-flixel/src/hollywoo_flixel/FlxMovie.hx b/projects/hollywoo-flixel/src/hollywoo_flixel/FlxMovie.hx
index f8881fd2..091960ac 100644
--- a/projects/hollywoo-flixel/src/hollywoo_flixel/FlxMovie.hx
+++ b/projects/hollywoo-flixel/src/hollywoo_flixel/FlxMovie.hx
@@ -40,7 +40,7 @@ enum FlxScreenPosition {
 /**
  * Model/controller of a Hollywoo-Flixel film, and main execution script
  */
-class FlxMovie extends Movie<FlxSprite, FlxScreenPosition, ActorFlxSprite, FlxSound, String, FlxSprite, FlxSound, FlxCamera> {
+class FlxMovie extends Movie<FlxSprite, FlxScreenPosition, ActorFlxSprite, FlxSound, String, FlxSprite, FlxSound, FlxCamera, FlxLightSource> {
     // Think of HollywooFlixelDSL.kiss as the corresponding Kiss file for this class!
 
     public function new(director:FlxDirector, ?voiceLinesAssetPath:String) {
diff --git a/projects/hollywoo/src/hollywoo/Director.hx b/projects/hollywoo/src/hollywoo/Director.hx
index 50370132..b3266d1a 100644
--- a/projects/hollywoo/src/hollywoo/Director.hx
+++ b/projects/hollywoo/src/hollywoo/Director.hx
@@ -3,6 +3,7 @@ package hollywoo;
 import hollywoo.Scene;
 import hollywoo.Movie;
 import haxe.ds.Option;
+import kiss_tools.JsonMap;
 
 enum Appearance {
     FirstAppearance;
@@ -29,8 +30,8 @@ typedef AutoZConfig = {
     frontLayer:Int
 };
 
-interface Director<Set:Cloneable<Set>, ScreenPosition, Actor, Sound, Song, Prop, VoiceTrack, Camera> {
-    var movie(default, default):Movie<Set, ScreenPosition, Actor, Sound, Song, Prop, VoiceTrack, Camera>;
+interface Director<Set:Cloneable<Set>, ScreenPosition, Actor, Sound, Song, Prop, VoiceTrack, Camera, LightSource:Jsonable<LightSource>> {
+    var movie(default, default):Movie<Set, ScreenPosition, Actor, Sound, Song, Prop, VoiceTrack, Camera, LightSource>;
     function autoZConfig():Option<AutoZConfig>;
     function showSet(set:Set, time:SceneTime, perspective:ScenePerspective, appearance:Appearance, camera:Camera, cc:Continuation):Void;
     function hideSet(set:Set, camera: Camera, cc:Continuation):Void;
diff --git a/projects/hollywoo/src/hollywoo/Movie.hx b/projects/hollywoo/src/hollywoo/Movie.hx
index ab397cc1..89a3fe15 100644
--- a/projects/hollywoo/src/hollywoo/Movie.hx
+++ b/projects/hollywoo/src/hollywoo/Movie.hx
@@ -11,6 +11,8 @@ import hollywoo.Director;
 import haxe.Json;
 import uuid.Uuid;
 import haxe.ds.Option;
+import kiss_tools.JsonMap;
+import kiss_tools.JsonableArray;
 
 using kiss.FuzzyMapTools;
 
@@ -42,4 +44,4 @@ enum CreditsLine {
  * Model/controller of a Hollywoo film, and main execution script
  */
 @:build(kiss.Kiss.build())
-class Movie<Set:Cloneable<Set>, ScreenPosition, Actor, Sound, Song, Prop, VoiceTrack, Camera> extends AsyncEmbeddedScript {}
+class Movie<Set:Cloneable<Set>, ScreenPosition, Actor, Sound, Song, Prop, VoiceTrack, Camera, LightSource:Jsonable<LightSource>> extends AsyncEmbeddedScript {}
diff --git a/projects/hollywoo/src/hollywoo/Movie.kiss b/projects/hollywoo/src/hollywoo/Movie.kiss
index e367f087..3d3ac0e2 100644
--- a/projects/hollywoo/src/hollywoo/Movie.kiss
+++ b/projects/hollywoo/src/hollywoo/Movie.kiss
@@ -141,7 +141,7 @@
     (defNew
         [
             // "View" in the Model-View-Controller architecture:
-            &prop :Director<Set,ScreenPosition,Actor,Sound,Song,Prop,VoiceTrack,Camera> director
+            &prop :Director<Set,ScreenPosition,Actor,Sound,Song,Prop,VoiceTrack,Camera,LightSource> director
             &opt :String voiceLinesJson
             &opt :String positionsJson
         ]