Fix build issues

3dgs/GUIManager.cpp

@@ -21,7 +21,7 @@ void GUIManager::buildGui() {
 
     static ImPlotAxisFlags flags = ImPlotAxisFlags_AutoFit;
     if (ImPlot::BeginPlot("##Scrolling", ImVec2(-1, -1))) {
-        ImPlot::SetupAxes("ms", "time", flags, flags);
+        ImPlot::SetupAxes("s", "time (ms)", flags, flags);
         const auto t = ImGui::GetTime();
         ImPlot::SetupAxisLimits(ImAxis_X1, t - history, t, ImGuiCond_Always);
         ImPlot::SetupAxisLimits(ImAxis_Y1, 0, 1);
@@ -42,18 +42,17 @@ void GUIManager::buildGui() {
     ImGui::Text("WASD: Move");
     ImGui::Text("Mouse: Look");
     ImGui::End();
-
 }
 
 void GUIManager::pushMetric(const std::string& name, float value) {
     int maxSize = 600;
     if (!metricsMap->contains(name)) {
         metricsMap->insert({name, ScrollingBuffer(maxSize)});
     }
-    metricsMap->at(name).addPoint(ImGui::GetTime(), value / 1000000.0);
+    metricsMap->at(name).addPoint(ImGui::GetTime(), value);
 }
 
-void GUIManager::pushMetric(const std::unordered_map<std::string, unsigned long long>& name) {
+void GUIManager::pushMetric(const std::unordered_map<std::string, float>& name) {
     for (auto& [n, v]: name) {
         pushMetric(n, v);
     }

3dgs/GUIManager.h

@@ -112,7 +112,7 @@ class GUIManager {
 
     static void pushMetric(const std::string& name, float value);
 
-    static void pushMetric(const std::unordered_map<std::string, unsigned long long>& name);
+    static void pushMetric(const std::unordered_map<std::string, float>& name);
 
 };
 

3dgs/Renderer.cpp

@@ -70,7 +70,10 @@ void Renderer::retrieveTimestamps() {
         throw std::runtime_error("Failed to retrieve timestamps");
     }
 
-    guiManager.pushMetric(queryManager->parseResults(timestamps));
+    auto metrics = queryManager->parseResults(timestamps);
+    for (auto& metric: metrics) {
+        guiManager.pushMetric(metric.first, metric.second / 1000000.0);
+    }
 }
 
 void Renderer::initializeVulkan() {
@@ -392,6 +395,8 @@ void Renderer::run() {
         //     assert(data2[i] <= data2[i+1]);
         // }
     }
+
+    context->device->waitIdle();
 }
 
 void Renderer::createCommandPool() {

vulkan/ImguiManager.cpp

@@ -169,3 +169,11 @@ void ImguiManager::draw(vk::CommandBuffer commandBuffer, uint32_t currentImageIn
     ImGui_ImplVulkan_RenderDrawData(ImGui::GetDrawData(), commandBuffer);
     commandBuffer.endRenderingKHR();
 }
+
+ImguiManager::~ImguiManager() {
+    // Cleanup
+    context->device->waitIdle();
+    ImGui_ImplVulkan_Shutdown();
+    ImGui_ImplGlfw_Shutdown();
+    ImGui::DestroyContext();
+}

vulkan/ImguiManager.h

@@ -22,6 +22,8 @@ class ImguiManager {
 
     void draw(vk::CommandBuffer commandBuffer, uint32_t currentImageIndex, std::function<void(void)> imguiFunction);
 
+    ~ImguiManager();
+
 private:
     std::shared_ptr<VulkanContext> context;
     std::shared_ptr<Swapchain> swapchain;