feat: Dialogue Editor can now exit the dialogue from any node, related to #1322

AlmasB · AlmasB · commit f1133879141b · 2023-12-28T12:14:49.000Z
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
@@ -32,7 +32,7 @@ class CutsceneService : EngineService() {
     private var gameVars: PropertyMap? = null
 
     private val scene by lazy { CutsceneScene(sceneService) }
-    private val dialogueScene by lazy { DialogueScene(sceneService) }
+    val dialogueScene by lazy { DialogueScene(sceneService) }
     private val videoScene by lazy { VideoScene(sceneService) }
 
     @JvmOverloads fun startCutscene(cutscene: Cutscene, onFinished: Runnable = EmptyRunnable) {
diff --git a/fxgl-gameplay/src/main/kotlin/com/almasb/fxgl/cutscene/dialogue/DialogueScene.kt b/fxgl-gameplay/src/main/kotlin/com/almasb/fxgl/cutscene/dialogue/DialogueScene.kt
@@ -187,16 +187,6 @@ class DialogueScene(private val sceneService: SceneService) : SubScene() {
         }
     }
 
-    private fun endCutscene() {
-        boxPlayerLines.opacity = 0.0
-        animation2.onFinished = Runnable {
-            sceneService.popSubScene()
-            onClose()
-        }
-        animation1.startReverse()
-        animation2.startReverse()
-    }
-
     fun start(dialogueGraph: DialogueGraph, context: DialogueContext, functionHandler: FunctionCallHandler, onFinished: Runnable) {
         graph = dialogueGraph.copy()
         this.functionHandler = functionHandler
@@ -230,6 +220,20 @@ class DialogueScene(private val sceneService: SceneService) : SubScene() {
         sceneService.pushSubScene(this)
     }
 
+    /**
+     * Terminates currently active dialogue and closes the dialogue scene.
+     */
+    fun endDialogue() {
+        topText.text = ""
+        boxPlayerLines.opacity = 0.0
+        animation2.onFinished = Runnable {
+            sceneService.popSubScene()
+            onClose()
+        }
+        animation1.startReverse()
+        animation2.startReverse()
+    }
+
     private fun loadSubDialogue(subDialogueNode: SubDialogueNode): DialogueGraph {
         return assetLoader.load(AssetType.DIALOGUE, subDialogueNode.text)
     }
@@ -253,8 +257,7 @@ class DialogueScene(private val sceneService: SceneService) : SubScene() {
 
         // no next node available, the dialogue is complete
         if (nextNode == null) {
-            topText.text = ""
-            endCutscene()
+            endDialogue()
             return
         }
 
diff --git a/fxgl-tools/src/main/kotlin/com/almasb/fxgl/tools/dialogues/MainUI.kt b/fxgl-tools/src/main/kotlin/com/almasb/fxgl/tools/dialogues/MainUI.kt
@@ -138,8 +138,12 @@ class MainUI : BorderPane() {
         tabPane.prefWidthProperty().bind(FXGL.getSettings().actualWidthProperty())
         tabPane.prefHeightProperty().bind(FXGL.getSettings().actualHeightProperty())
 
-        //nodeInspectorPane.prefWidth = 200.0
-        //nodeInspectorPane.prefHeightProperty().bind(FXGL.getSettings().actualHeightProperty())
+        val exitButton = Button("Exit")
+        exitButton.translateXProperty().bind(FXGL.getSettings().actualWidthProperty().subtract(45))
+        exitButton.translateY = 15.0
+        exitButton.setOnAction { FXGL.getCutsceneService().dialogueScene.endDialogue() }
+
+        FXGL.getCutsceneService().dialogueScene.contentRoot.children += exitButton
 
         center = pane
 
