Added fade out around map change

Also moved script system first in the loop so that the camera can catch up before rendering. Also added a map change from map 2 back to map 1.

3 files changed, 29 insertions, 7 deletions

@@ -38,3 +38,28 @@ end
 function StopSound(soundId)
   mixer():stopChannel(soundId)
 end
+
+function FadeToBlack(length)
+  local progress = 0.0
+  while progress < length do
+    progress = progress + coroutine.yield()
+    setFadeoutProgress(progress / length)
+  end
+  setFadeoutProgress(1.0)
+end
+
+function RemoveFadeout(length)
+  local progress = length
+  while progress > 0 do
+    progress = progress - coroutine.yield()
+    setFadeoutProgress(progress / length)
+  end
+  setFadeoutProgress(0.0)
+end
+
+function ChangeMap(map, warp)
+  FadeToBlack(150)
+  loadMap("../res/maps/" .. map .. ".tmx", warp)
+  coroutine.yield()
+  RemoveFadeout(150)
+end
@@ -1,9 +1,3 @@
 function map1_off_right()
-  -- Because this script gets triggered within the CharacterSystem's tick method,
-  -- if we immediately cleared out the entities from the old map, we might end up
-  -- returning there and processing stale data. This yield here ensures that we
-  -- are no longer in the CharacterSystem, because processing gets picked back up
-  -- in the ScriptSystem.
-  coroutine.yield()
-  loadMap("../res/maps/map2.tmx", "fromLeft")
+  ChangeMap("map2", "fromLeft")
 end
@@ -0,0 +1,3 @@
+function map2_off_left()
+  ChangeMap("map1", "fromRight")
+end