feat: startCutscene() now accepts an extra onFinished param, closes #1156

AlmasB · AlmasB · commit a074dfabcbbe · 2022-02-27T08:50:50.000Z
diff --git a/fxgl-gameplay/src/main/kotlin/com/almasb/fxgl/cutscene/CutsceneScene.kt b/fxgl-gameplay/src/main/kotlin/com/almasb/fxgl/cutscene/CutsceneScene.kt
@@ -44,6 +44,7 @@ class CutsceneScene(private val sceneService: SceneService) : SubScene() {
 
     internal lateinit var assetLoader: AssetLoaderService
     private lateinit var cutscene: Cutscene
+    private lateinit var onFinished: Runnable
 
     init {
         val topLine = Rectangle(sceneService.prefWidth, 150.0)
@@ -117,13 +118,15 @@ class CutsceneScene(private val sceneService: SceneService) : SubScene() {
         animation2.onFinished = Runnable {
             sceneService.popSubScene()
             onClose()
+            onFinished.run()
         }
         animation.startReverse()
         animation2.startReverse()
     }
 
-    fun start(cutscene: Cutscene) {
+    fun start(cutscene: Cutscene, onFinished: Runnable) {
         this.cutscene = cutscene
+        this.onFinished = onFinished
 
         nextLine()
 
diff --git a/fxgl-gameplay/src/main/kotlin/com/almasb/fxgl/cutscene/CutsceneService.kt b/fxgl-gameplay/src/main/kotlin/com/almasb/fxgl/cutscene/CutsceneService.kt
@@ -33,9 +33,9 @@ class CutsceneService : EngineService() {
     private val scene by lazy { CutsceneScene(sceneService) }
     val dialogueScene by lazy { DialogueScene(sceneService) }
 
-    fun startCutscene(cutscene: Cutscene) {
+    @JvmOverloads fun startCutscene(cutscene: Cutscene, onFinished: Runnable = EmptyRunnable) {
         scene.assetLoader = assetLoader
-        scene.start(cutscene)
+        scene.start(cutscene, onFinished)
     }
 
     @JvmOverloads fun startDialogueScene(
