Changeset ea2b4dc in opengl-game

Timestamp:

Feb 14, 2021, 4:24:08 AM (4 years ago)

Author:

Dmitry Portnoy <dportnoy@…>

Branches:

feature/imgui-sdl

Children:

880cfc2

Parents:

1cb64e6

git-author:

Dmitry Portnoy <dportnoy@…> (02/14/21 04:23:03)

git-committer:

Dmitry Portnoy <dportnoy@…> (02/14/21 04:24:08)

Message:

In VulkanGame, generate the IMGUI draw data outside of renderFrame() and
pass it in, instead ofgenerating it inside the function.

Files:

• vulkan-game.cpp (modified) (5 diffs)
• vulkan-game.hpp (modified) (2 diffs)

vulkan-game.cpp

@@ -8 +8 @@
 
 #include "IMGUI/imgui_impl_sdl.h"
-#include "IMGUI/imgui_impl_vulkan.h"
 
 #include "logger.hpp"
@@ -945 +944 @@
          sdlOverlayImage, graphicsQueue);
 
-      renderFrame();
+      updateScene();
+
+      ImGui_ImplVulkan_NewFrame();
+      ImGui_ImplSDL2_NewFrame(this->window);
+      ImGui::NewFrame();
+
+      {
+         ImGui::SetNextWindowSize(ImVec2(250, 35), ImGuiCond_Once);
+         ImGui::SetNextWindowPos(ImVec2(380, 10), ImGuiCond_Once);
+         ImGui::Begin("WndMenubar", NULL,
+            ImGuiWindowFlags_NoTitleBar |
+            ImGuiWindowFlags_NoResize |
+            ImGuiWindowFlags_NoMove);
+         ImGui::InvisibleButton("", ImVec2(155, 18));
+         ImGui::SameLine();
+         if (ImGui::Button("Main Menu")) {
+            cout << "Clicked on the main button" << endl;
+            //events.push(Event::GO_TO_MAIN_MENU);
+         }
+         ImGui::End();
+      }
+
+      ImGui::Render();
+
+      renderFrame(ImGui::GetDrawData());
       presentFrame();
    }
@@ -1687 +1710 @@
 }
 
-void VulkanGame::renderFrame() {
+void VulkanGame::renderFrame(ImDrawData* draw_data) {
    VkResult result = vkAcquireNextImageKHR(device, swapChain, numeric_limits<uint64_t>::max(),
       imageAcquiredSemaphores[currentFrame], VK_NULL_HANDLE, &imageIndex);
@@ -1704 +1727 @@
       throw runtime_error("failed to reset fence!");
    }
-
-   updateScene();
 
    VKUTIL_CHECK_RESULT(vkResetCommandPool(device, commandPools[imageIndex], 0),
@@ -1737 +1758 @@
    currentScreen->createRenderCommands(commandBuffers[imageIndex], imageIndex);
 
-   /**********************************************************/
-
-   ImGui_ImplVulkan_NewFrame();
-   ImGui_ImplSDL2_NewFrame(this->window);
-   ImGui::NewFrame();
-
-   {
-      ImGui::SetNextWindowSize(ImVec2(250, 35), ImGuiCond_Once);
-      ImGui::SetNextWindowPos(ImVec2(380, 10), ImGuiCond_Once);
-      ImGui::Begin("WndMenubar", NULL,
-         ImGuiWindowFlags_NoTitleBar |
-         ImGuiWindowFlags_NoResize |
-         ImGuiWindowFlags_NoMove);
-      ImGui::InvisibleButton("", ImVec2(155, 18));
-      ImGui::SameLine();
-      if (ImGui::Button("Main Menu")) {
-         cout << "Clicked on the main button" << endl;
-         //events.push(Event::GO_TO_MAIN_MENU);
-      }
-      ImGui::End();
-   }
-
-   ImGui::Render();
-   ImGui_ImplVulkan_RenderDrawData(ImGui::GetDrawData(), commandBuffers[imageIndex]);
-
-   /**********************************************************/
+   ImGui_ImplVulkan_RenderDrawData(draw_data, commandBuffers[imageIndex]);
 
    vkCmdEndRenderPass(commandBuffers[imageIndex]);

vulkan-game.hpp

@@ -17 +17 @@
 #include <SDL2/SDL.h>
 #include <SDL2/SDL_ttf.h>
+
+#include "IMGUI/imgui_impl_vulkan.h"
 
 #include "consts.hpp"
@@ -451 +453 @@
             vector<VkDescriptorBufferInfo>& bufferInfoList);
 
-      void renderFrame();
+      void renderFrame(ImDrawData* draw_data);
       void presentFrame();