Make stagePositions a JsonMap

projects/hollywoo-flixel/src/hollywoo_flixel/FlxMovie.hx

@@ -44,13 +44,13 @@ enum FlxScreenPosition {
 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, lightSourceJsonFile:String, ?voiceLinesAssetPath:String, ?positionsJson:String) {
+    public function new(director:FlxDirector, lightSourceJsonFile:String, positionsJson:String, ?voiceLinesAssetPath:String) {
         var voiceLinesJson = null;
         if (voiceLinesAssetPath != null) {
             voiceLinesJson = Assets.getText(voiceLinesAssetPath);
         }
 
-        super(director, lightSourceJsonFile, new FlxLightSource([], FlxColor.TRANSPARENT), voiceLinesJson, positionsJson);
+        super(director, lightSourceJsonFile, new FlxLightSource([], FlxColor.TRANSPARENT), positionsJson, voiceLinesJson);
     }
     public var uiCamera:FlxCamera;
     public var screenCamera:FlxCamera;

projects/hollywoo-flixel/src/hollywoo_flixel/HollywooFlixelDSL.kiss

@@ -85,24 +85,24 @@
     (set DIALOG_WIDTH (- FlxG.width ACTOR_WIDTH ACTOR_WIDTH))
     (set DIALOG_HEIGHT (- FlxG.height DIALOG_Y))
     #{
-        stagePositions["Left"] = {
-            x: STAGE_LEFT_X,
-            y: ACTOR_Y,
-            z: 0.0
-        };
-        stagePositions["Right"] = {
-            x: STAGE_RIGHT_X,
-            y: ACTOR_Y,
-            z: 0.0
-        };
-        stagePositions["Left2"] = {
-            x: STAGE_LEFT_X,
-            y: ACTOR_Y,
-            z: STAGE_BEHIND_DY
-        };
-        stagePositions["Right2"] = {
-            x: STAGE_RIGHT_X,
-            y: ACTOR_Y,
-            z: STAGE_BEHIND_DY
-        };
+        stagePositions.put("Left", new StagePosition(
+            STAGE_LEFT_X,
+            ACTOR_Y,
+            0.0
+        ));
+        stagePositions.put("Right", new StagePosition(
+            STAGE_RIGHT_X,
+            ACTOR_Y,
+            0.0
+        ));
+        stagePositions.put("Left2", new StagePosition(
+            STAGE_LEFT_X,
+            ACTOR_Y,
+            STAGE_BEHIND_DY
+        ));
+        stagePositions.put("Right2", new StagePosition(
+            STAGE_RIGHT_X,
+            ACTOR_Y,
+            STAGE_BEHIND_DY
+        ));
     }#)

projects/hollywoo/src/hollywoo/Director.hx

@@ -12,12 +12,6 @@ enum Appearance {
 
 typedef Continuation = Void -> Void;
 
-typedef StagePosition = {
-    x:Float,
-    y:Float,
-    z:Float,
-};
-
 enum StageFacing {
     TowardsCharacter(name:String);
     AwayFromCharacter(name:String);

projects/hollywoo/src/hollywoo/Movie.hx

@@ -8,6 +8,7 @@ import kiss.Stream;
 import kiss.FuzzyMap;
 import hollywoo.Scene;
 import hollywoo.Director;
+import hollywoo.StagePosition;
 import haxe.Json;
 import uuid.Uuid;
 import haxe.ds.Option;

projects/hollywoo/src/hollywoo/Movie.kiss

@@ -146,15 +146,14 @@
             &prop :Director<Set,ScreenPosition,Actor,Sound,Song,Prop,VoiceTrack,Camera,LightSource> director
             :String lightSourceJsonFile
             :LightSource defaultLightSource
+            :String stagePositionsJson
             &opt :String voiceLinesJson
-            &opt :String positionsJson
         ]
         [
-            :Map<String,StagePosition> stagePositions
-                (if positionsJson
-                        (haxe.Json.parse (sys.io.File.getContent positionsJson))
-                    (new Map))
-            :JsonMap<JsonableArray<LightSource>> lightSources (new JsonMap lightSourceJsonFile (new JsonableArray [] defaultLightSource))
+            :JsonMap<StagePosition> stagePositions
+                (new JsonMap stagePositionsJson (new StagePosition 0 0 0))
+            :JsonMap<JsonableArray<LightSource>> lightSources
+                (new JsonMap lightSourceJsonFile (new JsonableArray [] defaultLightSource))
         ]
 
         (set director.movie this)
@@ -306,7 +305,7 @@
 
 (hollywooMethod addCharacter false [actorName :Dynamic position :StageFacing facing :Continuation cc]
     (let [position (typeCase [position]
-                            ([:String pKey] (dictGet stagePositions pKey))
+                            ([:String pKey] (stagePositions.get pKey))
                             (otherwise position))
             character (object stagePosition position stageFacing facing actor (dictGet actors actorName))]
         (autoZProcess position
@@ -326,7 +325,7 @@
 // INSTANTLY move a character:
 (hollywooMethod moveCharacter false [actorName :Dynamic newPosition :StageFacing newFacing :Continuation cc]
     (let [newPosition (typeCase [newPosition]
-                            ([:String pKey] (dictGet stagePositions pKey))
+                            ([:String pKey] (stagePositions.get pKey))
                             (otherwise newPosition))]
         (removeCharacter actorName
             (makeCC

projects/hollywoo/src/hollywoo/StagePosition.hx

@@ -0,0 +1,7 @@
+package hollywoo;
+
+import kiss.Prelude;
+import kiss.List;
+
+@:build(kiss.Kiss.build())
+class StagePosition {}

projects/hollywoo/src/hollywoo/StagePosition.kiss

@@ -0,0 +1,6 @@
+(defNew [&prop :Float x &prop :Float y &prop :Float z])
+
+(method stringify [] "${x}|${y}|${z}")
+(method parse [:String data]
+    (let [[x y z] (for coord (data.split "|") (Std.parseFloat coord))]
+        (new StagePosition x y z)))