Confirm before changing scene

Author: Kyjor

src/editor/JulGameEditor/Editor.jl

@@ -34,6 +34,7 @@ module Editor
         # Project variables
         currentSceneMain = nothing
         currentSceneName = ""
+        currentScenePath = ""
         currentSelectedProjectPath = ""
         gameInfo = []
         ##############################
@@ -66,7 +67,7 @@ module Editor
         startTime = Ref(UInt64(0))
         lastPhysicsTime = Ref(UInt64(SDL2.SDL_GetTicks()))
 
-        currentDialogue::Base.RefValue{Tuple{String, String}} = Ref(("", ""))
+        currentDialog::Base.RefValue{String} = Ref("")
 
         try
             while !quit                    
@@ -104,14 +105,14 @@ module Editor
                         for scene in scenesLoadedFromFolder[]
                             if CImGui.Button("$(scene)")
                                 currentSceneName = SceneLoaderModule.get_scene_file_name_from_full_scene_path(scene)
+                                currentScenePath = scene
                                 if currentSceneMain === nothing
                                     JulGame.IS_EDITOR = true
                                     JulGame.PIXELS_PER_UNIT = 16
-                                    currentDialogue[] = (String(currentSceneName), scene)
-                                    #currentSceneMain.cameraBackgroundColor = (50, 50, 50)
+                                    currentDialog[] = "Open scene: $(currentSceneName)"
                                     currentSelectedProjectPath = SceneLoaderModule.get_project_path_from_full_scene_path(scene) 
                                 else
-                                    JulGame.change_scene(String(currentSceneName))
+                                    currentDialog[] = "Open scene: $(currentSceneName)"
                                 end
                             end
                             CImGui.NewLine()
@@ -120,14 +121,19 @@ module Editor
                         CImGui.End()
                     end
 
-                    if currentDialogue[] !== ("", "")
-                        println("Opening scene: $(currentDialogue[][2])")
-                        confirmation_dialog(currentDialogue, "Open scene: $(currentDialogue[][1])", () -> load_scene(currentDialogue[][2], renderer))
+                    if currentDialog[] != "" #TODO: make more dynamic
+                        #println("Opening scene: $(currentDialog[][2])")
+                        if confirmation_dialog(currentDialog) == "ok" && currentSceneName != ""
+                            if currentSceneMain === nothing
+                                currentSceneMain = load_scene(currentScenePath, renderer)
+                                currentSceneMain.cameraBackgroundColor = (50, 50, 50)
+                            else
+                                JulGame.change_scene(String(currentSceneName))
+                            end
+                        end
                     end
 
-
                     uiSelected = false
-                    
 
                     if sceneWindowSize.x != sceneTextureSize.x || sceneWindowSize.y != sceneTextureSize.y
                         SDL2.SDL_DestroyTexture(sceneTexture)

src/editor/JulGameEditor/Utils/EditorUtils.jl

@@ -326,12 +326,13 @@ function reset_camera_event(main)
     return event
 end
 
-function confirmation_dialog(dialogue, title, event::Function)
-    CImGui.OpenPopup(title)
+function confirmation_dialog(dialog)
+    CImGui.OpenPopup(dialog[])
 
-    if CImGui.BeginPopupModal(title, C_NULL, CImGui.ImGuiWindowFlags_AlwaysAutoResize)
+    if CImGui.BeginPopupModal(dialog[], C_NULL, CImGui.ImGuiWindowFlags_AlwaysAutoResize)
         CImGui.Text("Are you sure you would like to open this scene?\nIf you currently have a scene open, any unsaved changes will be lost.\n\n")
-        CImGui.Separator()
+        #CImGui.Separator()
+        CImGui.NewLine()
 
         # @cstatic dont_ask_me_next_time=false begin
         #     CImGui.PushStyleVar(CImGui.ImGuiStyleVar_FramePadding, (0, 0))
@@ -341,15 +342,20 @@ function confirmation_dialog(dialogue, title, event::Function)
 
         if CImGui.Button("OK", (120, 0))
             CImGui.CloseCurrentPopup()
-            dialogue[] = ("", "")
-            event()
+            dialog[] = ""
+
+            return "ok"
         end
         CImGui.SetItemDefaultFocus()
         CImGui.SameLine()
         if CImGui.Button("Cancel",(120, 0))
             CImGui.CloseCurrentPopup()
-            dialogue[] = ("", "")
+            dialog[] = ""
+
+            return "cancel"
         end
         CImGui.EndPopup()
+
+        return "continue"
     end
 end

src/editor/JulGameEditor/Utils/SceneUtils.jl

@@ -79,6 +79,7 @@ Load a scene from the specified `scenePath` using the given `renderer`.
 The loaded main struct.
 """
 function load_scene(scenePath::String, renderer)
+    println("Loading scene from $scenePath")
     game = C_NULL
     try
         game = SceneLoaderModule.load_scene_from_editor(scenePath, renderer);

src/editor/JulGameEditor/src/imgui.ini

@@ -158,6 +158,16 @@ Size=1053,718
 Collapsed=0
 DockId=0x00000002,1
 
+[Window][Open scene: scene.json]
+Pos=390,311
+Size=500,114
+Collapsed=0
+
+[Window][Open scene: title_scene.json]
+Pos=390,303
+Size=500,114
+Collapsed=0
+
 [Table][0x45A0E60D,7]
 RefScale=13
 Column 0  Width=49