Fix setup

Author: cmaughan

app/main.cpp

@@ -403,16 +403,59 @@ static void FramePresent(ImGui_ImplVulkanH_Window* wd)
 // Main code
 int main(int, char**)
 {
+    Zest::Profiler::Init();
+
     // Setup SDL
     if (!SDL_Init(SDL_INIT_VIDEO | SDL_INIT_GAMEPAD) != 0)
     {
         printf("Error: SDL_Init(): %s\n", SDL_GetError());
         return -1;
     }
 
+    Zest::runtree_init(SDL_GetBasePath(), ZING_ROOT);
+    auto settings_path = Zest::file_init_settings("zing", Zest::runtree_find_path("settings/settings.toml"), fs::path("settings") / "settings.toml");
+    auto im_settings_path = Zest::file_init_settings("zing", Zest::runtree_find_path("settings/imgui.ini"), fs::path("settings") / "imgui.ini");
+    auto& settings = Zest::GlobalSettingsManager::Instance();
+    Zing::audio_add_settings_hooks();
+    settings.Load(settings_path);
+
+    auto windowSize = settings.GetVec2f(Zest::g_window, Zest::s_windowSize);
+    auto windowPosition = settings.GetVec2i(Zest::g_window, Zest::s_windowPosition);
+
+    if (windowSize.x == 0 || windowSize.y == 0)
+    {
+        windowSize.x = 1280;
+        windowSize.y = 720;
+    }
+
+    if (windowPosition.x == 0 || windowPosition.y == 0)
+    {
+        windowPosition.x = SDL_WINDOWPOS_CENTERED;
+        windowPosition.y = SDL_WINDOWPOS_CENTERED;
+    }
+
+    int count = 0;
+    auto pDisplays = SDL_GetDisplays(&count);
+
+    if (count > 0)
+    {
+        auto display = pDisplays[0];
+        SDL_Rect bounds;
+        SDL_GetDisplayBounds(display, &bounds);
+        windowSize.x = std::clamp(windowSize.x, 100.0f, float(bounds.w));
+        windowSize.y = std::clamp(windowSize.y, 100.0f, float(bounds.h));
+    }
+
+    bool max = settings.GetBool(Zest::g_window, Zest::b_windowMaximized);
+
     // Create window with Vulkan graphics context
     SDL_WindowFlags window_flags = (SDL_WindowFlags)(SDL_WINDOW_VULKAN | SDL_WINDOW_RESIZABLE | SDL_WINDOW_HIGH_PIXEL_DENSITY | SDL_WINDOW_HIDDEN);
-    SDL_Window* window = SDL_CreateWindow("Dear ImGui SDL3+Vulkan example", 1280, 720, window_flags);
+    if (max)
+    {
+        window_flags |= SDL_WINDOW_MAXIMIZED; 
+    }
+
+    SDL_Window* window = SDL_CreateWindow("Dear ImGui SDL3+Vulkan example", int(windowSize.x), int(windowSize.y), window_flags);
     if (window == nullptr)
     {
         printf("Error: SDL_CreateWindow(): %s\n", SDL_GetError());
@@ -489,6 +532,9 @@ int main(int, char**)
     bool done = false;
     while (!done)
     {
+        Zest::Profiler::NewFrame();
+        PROFILE_NAME_THREAD(UI);
+
         // Poll and handle events (inputs, window resize, etc.)
         // You can read the io.WantCaptureMouse, io.WantCaptureKeyboard flags to tell if dear imgui wants to use your inputs.
         // - When io.WantCaptureMouse is true, do not dispatch mouse input data to your main application, or clear/overwrite your copy of the mouse data.
@@ -586,15 +632,26 @@ int main(int, char**)
     // Cleanup
     err = vkDeviceWaitIdle(g_Device);
     check_vk_result(err);
+
+    demo_cleanup();
+
     ImGui_ImplVulkan_Shutdown();
     ImGui_ImplSDL3_Shutdown();
     ImGui::DestroyContext();
 
     CleanupVulkanWindow();
     CleanupVulkan();
 
+    SDL_GetWindowSize(window, &w, &h);
+    settings.Set(Zest::g_window, Zest::s_windowSize, glm::vec2(w, h));
+
+    SDL_GetWindowPosition(window, &w, &h);
+    settings.Set(Zest::g_window, Zest::s_windowPosition, glm::ivec2(w, h));
+    settings.Set(Zest::g_window, Zest::b_windowMaximized, bool(SDL_GetWindowFlags(window) & SDL_WINDOW_MAXIMIZED));
+
     SDL_DestroyWindow(window);
     SDL_Quit();
 
+    Zest::Profiler::Finish();
     return 0;
 }