MainLoopController covers autosave on exit

chrxh · Oct 22, 2024 · ddd636b · ddd636b
1 parent 32671b1
commit ddd636b
Show file tree

Hide file tree

Showing 9 changed files with 85 additions and 34 deletions.
diff --git a/imgui.ini b/imgui.ini
@@ -190,7 +190,7 @@ Collapsed=0
 
 [Window][Exit]
 Pos=810,490
-Size=328,102
+Size=328,107
 Collapsed=0
 
 [Window][Do you really want to terminate the program?]

diff --git a/source/Gui/AutosaveController.cpp b/source/Gui/AutosaveController.cpp
@@ -31,7 +31,7 @@ void AutosaveController::shutdown()
     if (!_on) {
         return;
     }
-    onSave();
+    //onSave();
 }
 
 bool AutosaveController::isOn() const

diff --git a/source/Gui/ExitDialog.cpp b/source/Gui/ExitDialog.cpp
@@ -2,11 +2,7 @@
 
 #include "ExitDialog.h"
 #include "AlienImGui.h"
-
-void ExitDialog::initIntern(bool& onExit)
-{
-    _onExit = &onExit;
-}
+#include "MainLoopController.h"
 
 ExitDialog::ExitDialog()
     : AlienDialog("Exit")
@@ -16,14 +12,11 @@ void ExitDialog::processIntern()
 {
     ImGui::Text("Do you really want to terminate the program?");
 
-    ImGui::Spacing();
-    ImGui::Spacing();
-    ImGui::Separator();
-    ImGui::Spacing();
-    ImGui::Spacing();
+    ImGui::Dummy({0, ImGui::GetContentRegionAvail().y - scale(50.0f)});
+    AlienImGui::Separator();
 
     if (AlienImGui::Button("OK")) {
-        *_onExit = true;
+        MainLoopController::get().scheduleShutdown();
         close();
     }
     ImGui::SameLine();

diff --git a/source/Gui/ExitDialog.h b/source/Gui/ExitDialog.h
@@ -5,15 +5,12 @@
 #include "AlienDialog.h"
 #include "Definitions.h"
 
-class ExitDialog : public AlienDialog<bool&>
+class ExitDialog : public AlienDialog<>
 {
     MAKE_SINGLETON_NO_DEFAULT_CONSTRUCTION(ExitDialog);
 
 private:
     ExitDialog();
 
-    void initIntern(bool& onExit) override;
     void processIntern() override;
-
-    bool* _onExit = nullptr;
 };
diff --git a/source/Gui/MainLoopController.cpp b/source/Gui/MainLoopController.cpp
@@ -98,20 +98,34 @@ void MainLoopController::process()
         processFadeInUI();
     } else if (_programState == ProgramState::OperatingMode) {
         processOperatingMode();
+    } else if (_programState == ProgramState::ScheduleExit) {
+        processScheduleExit();
+    } else if (_programState == ProgramState::Exiting) {
+        processExiting();
     }
 
     ImGui::Render();
     ImGui_ImplOpenGL3_RenderDrawData(ImGui::GetDrawData());
     glfwSwapBuffers(WindowController::get().getWindowData().window);
 }
 
+void MainLoopController::scheduleShutdown()
+{
+    _programState = ProgramState::ScheduleExit;
+}
+
+bool MainLoopController::shouldClose() const
+{
+    return _programState == ProgramState::Finished;
+}
+
 void MainLoopController::processFirstTick()
 {
     drawLoadingScreen();
 
     auto senderInfo = SenderInfo{.senderId = SenderId{StartupSenderId}, .wishResultData = true, .wishErrorInfo = true};
     auto readData = ReadSimulationRequestData{Const::AutosaveFile};
-    _startupSimRequestId = _persisterFacade->scheduleReadSimulationFromFile(senderInfo, readData);
+    _loadSimRequestId = _persisterFacade->scheduleReadSimulationFromFile(senderInfo, readData);
     _programState = ProgramState::LoadingScreen;
 
     OverlayController::get().process();
@@ -123,9 +137,9 @@ void MainLoopController::processLoadingScreen()
 {
     drawLoadingScreen();
 
-    auto requestedSimState = _persisterFacade->getRequestState(_startupSimRequestId);
+    auto requestedSimState = _persisterFacade->getRequestState(_loadSimRequestId);
     if (requestedSimState == PersisterRequestState::Finished) {
-        auto const& data = _persisterFacade->fetchReadSimulationData(_startupSimRequestId);
+        auto const& data = _persisterFacade->fetchReadSimulationData(_loadSimRequestId);
         auto const& deserializedSim = data.deserializedSimulation;
         _simulationFacade->newSimulation(
             data.simulationName,
@@ -217,6 +231,46 @@ void MainLoopController::processOperatingMode()
     popGlobalStyle();
 
     FpsController::get().processForceFps(WindowController::get().getFps());
+
+    if (glfwWindowShouldClose(WindowController::get().getWindowData().window)) {
+        scheduleShutdown();
+    }
+}
+
+void MainLoopController::processScheduleExit()
+{
+    if (AutosaveController::get().isOn()) {
+        printOverlayMessage("Saving ...");
+
+        auto senderInfo = SenderInfo{.senderId = SenderId{StartupSenderId}, .wishResultData = true, .wishErrorInfo = false};
+        auto saveData = SaveSimulationRequestData{Const::AutosaveFile, Viewport::get().getZoomFactor(), Viewport::get().getCenterInWorldPos()};
+        _saveSimRequestId = _persisterFacade->scheduleSaveSimulationToFile(senderInfo, saveData);
+        _programState = ProgramState::Exiting;
+    } else {
+        _programState = ProgramState::Finished;
+    }
+}
+
+void MainLoopController::processExiting()
+{
+    SimulationView::get().draw();
+
+    pushGlobalStyle();
+    processMenubar();
+    MainLoopEntityController::get().process();
+    OverlayController::get().process();
+    SimulationView::get().processSimulationScrollbars();
+    popGlobalStyle();
+
+    FpsController::get().processForceFps(WindowController::get().getFps());
+
+    auto requestedSimState = _persisterFacade->getRequestState(_saveSimRequestId);
+    if (requestedSimState == PersisterRequestState::Finished) {
+        _persisterFacade->fetchSaveSimulationData(_saveSimRequestId);
+        _programState = ProgramState::Finished;
+    } else if (requestedSimState == PersisterRequestState::Error) {
+        _programState = ProgramState::Finished;
+    }
 }
 
 void MainLoopController::drawLoadingScreen()

diff --git a/source/Gui/MainLoopController.h b/source/Gui/MainLoopController.h
@@ -16,13 +16,18 @@ class MainLoopController
 public:
     void setup(SimulationFacade const& simulationFacade, PersisterFacade const& persisterFacade);
     void process();
+    void scheduleShutdown();
+
+    bool shouldClose() const;
 
 private:
     void processFirstTick();
     void processLoadingScreen();
     void processFadeOutLoadingScreen();
     void processFadeInUI();
     void processOperatingMode();
+    void processScheduleExit();
+    void processExiting();
 
     void drawLoadingScreen();
     void decreaseAlphaForFadeOutLoadingScreen();
@@ -41,11 +46,15 @@ class MainLoopController
         LoadingScreen,
         FadeOutLoadingScreen,
         FadeInUI,
-        OperatingMode
+        OperatingMode,
+        ScheduleExit,
+        Exiting,
+        Finished
     };
     ProgramState _programState = ProgramState::FirstTick;
 
-    PersisterRequestId _startupSimRequestId;
+    PersisterRequestId _loadSimRequestId;
+    PersisterRequestId _saveSimRequestId;
 
     TextureData _logo;
     std::optional<std::chrono::steady_clock::time_point> _simulationLoadedTimepoint;

diff --git a/source/Gui/MainWindow.cpp b/source/Gui/MainWindow.cpp
@@ -128,7 +128,7 @@ _MainWindow::_MainWindow(SimulationFacade const& simulationFacade, PersisterFaca
     SimulationParametersWindow::get().setup(_simulationFacade);
     GpuSettingsDialog::get().setup(_simulationFacade);
     MainLoopController::get().setup(_simulationFacade, _persisterFacade);
-    ExitDialog::get().setup(_onExit);
+    ExitDialog::get().setup();
     MassOperationsDialog::get().setup(_simulationFacade);
     LogWindow::get().setup(_logger);
     GettingStartedWindow::get().setup();
@@ -167,8 +167,7 @@ _MainWindow::_MainWindow(SimulationFacade const& simulationFacade, PersisterFaca
 
 void _MainWindow::mainLoop()
 {
-    auto window = WindowController::get().getWindowData().window;
-    while (!glfwWindowShouldClose(window) && !_onExit)
+    while (!MainLoopController::get().shouldClose())
     {
         MainLoopController::get().process();
     }

diff --git a/source/Gui/MainWindow.h b/source/Gui/MainWindow.h
@@ -22,6 +22,4 @@ class _MainWindow
 
     PersisterFacade _persisterFacade;
     SimulationFacade _simulationFacade;
-
-    bool _onExit = false;
 };
diff --git a/source/Gui/OverlayController.cpp b/source/Gui/OverlayController.cpp
@@ -65,19 +65,20 @@ void OverlayController::processLoadingBar()
 
         auto viewSize = toRealVector2D(Viewport::get().getViewSize());
         auto width = viewSize.x / 6 + 1.0f;
-        auto height = scale(20.0f);
+        auto height = scale(15.0f);
         auto center = ImVec2{viewSize.x / 2, viewSize.y - scale(60.0f)};
 
-        auto constexpr N = 20;
+        auto constexpr N = 12;
         for (int i = 0; i < N; ++i) {
-            auto amplitude1 = sinf(toFloat(i) * 10.0f / toFloat(N) - duration / 240.0f);
-            auto amplitude2 = sinf(toFloat(i) * 14.0f / toFloat(N) - duration / 135.0f);
+            auto amplitude1 = sinf(toFloat(i) * 10.0f / toFloat(N) - powf(duration / 340.0f, 1.3f) /** (1.0f + 0.3f * sin(duration / 2000))*/);
+            auto amplitude2 = sinf(toFloat(i) * 14.0f / toFloat(N) - powf(duration / 235.0f, 1.3f) /** (1.0f + 0.3f * sin(duration / 2000))*/);
             //auto hue = toFloat((i * 1000 / N + toInt(duration)) % 3000) / 4500.0f;
             //hue = hue < 0.33f ? 0.66f + hue : 0.66f + 0.66f - hue; 
-
+            auto y1 = center.y + height / 2 - amplitude1 * height;
+            auto y2 = center.y + height / 2 - amplitude2 * height;
             drawList->AddRectFilled(
-                ImVec2{center.x - width / 2 + toFloat(i) / N * width, center.y + height / 2 - amplitude1 * height},
-                ImVec2{center.x - width / 2 + toFloat(i + 1) / N * width - scale(3), center.y + height / 2 - amplitude2 * height / 2},
+                ImVec2{center.x - width / 2 + toFloat(i) / N * width, std::min(y1, y2)},
+                ImVec2{center.x - width / 2 + toFloat(i + 1) / N * width - scale(3), std::max(y1, y2)},
                 ImColor::HSV(0, 0.1f, 0.35f, 0.6f));
         }
         drawList->AddText(