Changeset 301c90a in opengl-game

Timestamp:

Mar 13, 2021, 10:37:06 PM (4 years ago)

Author:

Dmitry Portnoy <dportnoy@…>

Branches:

feature/imgui-sdl

Children:

d255d52

Parents:

187b0f5

Message:

Implement the start of a generic UI system built on top of IMGUI, which can reposition elements when the screen is resized, and use it in VulkanGame

Files:

• IMGUI/imconfig.h (modified) (1 diff)
• VulkanGame.vcxproj (modified) (2 diffs)
• VulkanGame.vcxproj.filters (modified) (3 diffs)
• compiler.hpp (modified) (2 diffs)
• consts.hpp (modified) (2 diffs)
• crash-logger.hpp (modified) (2 diffs)
• game-gui-sdl.cpp (modified) (1 diff)
• gui/imgui/button-imgui.cpp (added)
• gui/imgui/button-imgui.hpp (added)
• gui/imgui/ui-wdget.cpp (added)
• gui/imgui/ui-widget.hpp (added)
• main-vulkan.cpp (modified) (1 diff)
• vulkan-game.cpp (modified) (10 diffs)
• vulkan-game.hpp (modified) (3 diffs)

IMGUI/imconfig.h

@@ -108 +108 @@
 }
 */
+
+#include <glm/glm.hpp>
+
+#define IM_VEC2_CLASS_EXTRA                                                 \
+        ImVec2(const glm::vec2& f) { x = f.x; y = f.y; }                       \
+        operator glm::vec2() const { return glm::vec2(x,y); }

VulkanGame.vcxproj

@@ -142 +142 @@
     <ClCompile Include="FileStackWalker.cpp" />
     <ClCompile Include="game-gui-sdl.cpp" />
+    <ClCompile Include="gui\imgui\button-imgui.cpp" />
+    <ClCompile Include="gui\imgui\ui-wdget.cpp" />
     <ClCompile Include="IMGUI\imgui.cpp" />
     <ClCompile Include="IMGUI\imgui_demo.cpp" />
@@ -165 +167 @@
     <ClInclude Include="graphics-pipeline.hpp" />
     <ClInclude Include="graphics-pipeline_vulkan.hpp" />
+    <ClInclude Include="gui\imgui\button-imgui.hpp" />
+    <ClInclude Include="gui\imgui\ui-widget.hpp" />
     <ClInclude Include="IMGUI\imconfig.h" />
     <ClInclude Include="IMGUI\imgui.h" />

VulkanGame.vcxproj.filters

@@ -31 +31 @@
     <ClCompile Include="sdl-game.cpp">
       <Filter>IMGUI SDL Reference</Filter>
+    </ClCompile>
+    <ClCompile Include="gui\imgui\ui-wdget.cpp">
+      <Filter>gui\imgui</Filter>
+    </ClCompile>
+    <ClCompile Include="gui\imgui\button-imgui.cpp">
+      <Filter>gui\imgui</Filter>
     </ClCompile>
   </ItemGroup>
@@ -74 +80 @@
       <Filter>IMGUI SDL Reference</Filter>
     </ClInclude>
+    <ClInclude Include="gui\imgui\ui-widget.hpp">
+      <Filter>gui\imgui</Filter>
+    </ClInclude>
+    <ClInclude Include="gui\imgui\button-imgui.hpp">
+      <Filter>gui\imgui</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
@@ -102 +114 @@
       <UniqueIdentifier>{e540b46d-7c98-427d-a28d-4fc20d495826}</UniqueIdentifier>
     </Filter>
+    <Filter Include="gui">
+      <UniqueIdentifier>{79c30e01-25f8-48e6-894f-da73dea26f89}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="gui\imgui">
+      <UniqueIdentifier>{2954212f-ed3d-45c5-b46a-bbb81a16ca78}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
 </Project>

compiler.hpp

@@ -1 @@
-#ifndef COMPILER_H
-#define COMPILER_H
+#ifndef _COMPILER_H
+#define _COMPILER_H
 
 #if defined _WIN64
@@ -16 +16 @@
 #endif
 
-#endif
+#endif // _COMPILER_H

consts.hpp

@@ -1 @@
-#ifndef _RTWO_CONSTS_H
-#define _RTWO_CONSTS_H
+#ifndef _CONSTS_H
+#define _CONSTS_H
+
+// TODO: Move ScreenType somewhere else that's more UI-related
 
 #define GAME_VERSION "0.01.000"
@@ -18 +20 @@
 };
 
-#endif // _RTWO_CONSTS_H
+#endif // _CONSTS_H

crash-logger.hpp

@@ -1 @@
-#ifndef CRASH_LOGGER_H
-#define CRASH_LOGGER_H
+#ifndef _CRASH_LOGGER_H
+#define _CRASH_LOGGER_H
 
 class CrashLogger {
@@ -8 +8 @@
 };
 
-#endif
+#endif // _CRASH_LOGGER_H

game-gui-sdl.cpp

@@ -154 +154 @@
 }
 
+// TODO: Check that this is only used where the drawable size is needed
+// Maybe create a separate refreshWindowSize funcion as well.
 void GameGui_SDL::refreshWindowSize() {
-   // TODO: Make sure this works on a mac (the analogous glfw function had issues on Mac retina displays)
-   SDL_GetWindowSize(window, &windowWidth, &windowHeight);
+   // TODO: Make sure this works on a Mac (the analogous glfw function had issues on Mac retina displays)
+
+#ifdef GAMEGUI_INCLUDE_VULKAN
+   SDL_Vulkan_GetDrawableSize(window, &windowWidth, &windowHeight);
+#else
+   SDL_GL_GetDrawableSize(window, &windowWidth, &windowHeight);
+#endif
 
    if (SDL_GetWindowFlags(window) & SDL_WINDOW_MINIMIZED) {

main-vulkan.cpp

@@ -24 +24 @@
 
    try {
-      game.run(800, 600, 0);
-      //game.run(800, 600, GUI_FLAGS_WINDOW_FULLSCREEN);
+      game.run(800, 600, GUI_FLAGS_WINDOW_FULLSCREEN);
    } catch (const exception& e) {
       cerr << e.what() << endl;

vulkan-game.cpp

@@ -8 +8 @@
 
 #include "IMGUI/imgui_impl_sdl.h"
+#include "IMGUI/imgui_internal.h" // For CalcItemSize
 
 #include "logger.hpp"
 
 #include "utils.hpp"
+
+#include "gui/imgui/button-imgui.hpp"
 
 using namespace std;
@@ -854 +857 @@
          }
 
+         // This was left ovedr from the previous SDL UI implementation.
+         // Might need something like this again when I start processing screen-specific UI events not related
+         // to the IMGUI ui, such as arrow keys for movement and other buttons for shotting or something
          // currentScreen->handleEvent(e);
       }
@@ -911 +917 @@
       ImGui::NewFrame();
 
-      (this->*currentRenderScreenFn)();
+      (this->*currentRenderScreenFn)(gui->getWindowWidth(), gui->getWindowHeight());
 
       ImGui::Render();
@@ -2187 +2193 @@
 }
 
-void VulkanGame::renderMainScreen() {
-   unsigned int windowWidth = 640;
-   unsigned int windowHeight = 480;
-
+void VulkanGame::renderMainScreen(int width, int height) {
    {
       int padding = 4;
-      ImGui::SetNextWindowPos(ImVec2(-padding, -padding), ImGuiCond_Once);
-      ImGui::SetNextWindowSize(ImVec2(windowWidth + 2 * padding, windowHeight + 2 * padding), ImGuiCond_Always);
+      ImGui::SetNextWindowPos(vec2(-padding, -padding), ImGuiCond_Once);
+      ImGui::SetNextWindowSize(vec2(width + 2 * padding, height + 2 * padding), ImGuiCond_Always);
       ImGui::Begin("WndMain", nullptr,
          ImGuiWindowFlags_NoTitleBar |
@@ -2200 +2203 @@
          ImGuiWindowFlags_NoMove);
 
-      ImGui::InvisibleButton("", ImVec2(10, 80));
-      ImGui::InvisibleButton("", ImVec2(285, 18));
-      ImGui::SameLine();
-      if (ImGui::Button("New Game")) {
+      ButtonImGui btn("New Game");
+
+      ImGui::InvisibleButton("", vec2(10, height / 6));
+      if (btn.draw((width - btn.getWidth()) / 2)) {
          goToScreen(&VulkanGame::renderGameScreen);
       }
 
-      ImGui::InvisibleButton("", ImVec2(10, 15));
-      ImGui::InvisibleButton("", ImVec2(300, 18));
-      ImGui::SameLine();
-      if (ImGui::Button("Quit")) {
+      ButtonImGui btn2("Quit");
+
+      ImGui::InvisibleButton("", vec2(10, 15));
+      if (btn2.draw((width - btn2.getWidth()) / 2)) {
          quitGame();
       }
@@ -2218 +2221 @@
 }
 
-void VulkanGame::renderGameScreen() {
+void VulkanGame::renderGameScreen(int width, int height) {
    {
-      ImGui::SetNextWindowSize(ImVec2(130, 65), ImGuiCond_Once);
-      ImGui::SetNextWindowPos(ImVec2(10, 50), ImGuiCond_Once);
+      ImGui::SetNextWindowSize(vec2(130, 65), ImGuiCond_Once);
+      ImGui::SetNextWindowPos(vec2(10, 50), ImGuiCond_Once);
       ImGui::Begin("WndStats", nullptr,
          ImGuiWindowFlags_NoTitleBar |
@@ -2234 +2237 @@
 
    {
-      ImGui::SetNextWindowSize(ImVec2(250, 35), ImGuiCond_Once);
-      ImGui::SetNextWindowPos(ImVec2(380, 10), ImGuiCond_Once);
+      ImGui::SetNextWindowSize(vec2(250, 35), ImGuiCond_Once);
+      ImGui::SetNextWindowPos(vec2(width - 260, 10), ImGuiCond_Always);
       ImGui::Begin("WndMenubar", nullptr,
          ImGuiWindowFlags_NoTitleBar |
          ImGuiWindowFlags_NoResize |
          ImGuiWindowFlags_NoMove);
-      ImGui::InvisibleButton("", ImVec2(155, 18));
+      ImGui::InvisibleButton("", vec2(155, 18));
       ImGui::SameLine();
       if (ImGui::Button("Main Menu")) {
@@ -2249 +2252 @@
 
    {
-      ImGui::SetNextWindowSize(ImVec2(200, 200), ImGuiCond_Once);
-      ImGui::SetNextWindowPos(ImVec2(430, 60), ImGuiCond_Once);
+      ImGui::SetNextWindowSize(vec2(200, 200), ImGuiCond_Once);
+      ImGui::SetNextWindowPos(vec2(width - 210, 60), ImGuiCond_Always);
       ImGui::Begin("WndDebug", nullptr,
          ImGuiWindowFlags_NoTitleBar |
@@ -2267 +2270 @@
 }
 
+// TODO: Probably turn this into a UI widget class
 void VulkanGame::renderGuiValueList(vector<UIValue>& values) {
    float maxWidth = 0.0f;
@@ -2304 +2308 @@
 }
 
-void VulkanGame::goToScreen(void (VulkanGame::* renderScreenFn)()) {
+void VulkanGame::goToScreen(void (VulkanGame::* renderScreenFn)(int width, int height)) {
    currentRenderScreenFn = renderScreenFn;
 

vulkan-game.hpp

@@ -243 +243 @@
       SDL_Window* window = nullptr;
 
+      int drawableWidth, drawableHeight;
+
       VkInstance instance;
       VkDebugUtilsMessengerEXT debugMessenger;
@@ -360 +362 @@
       /*** High-level vars ***/
 
-      void (VulkanGame::* currentRenderScreenFn)();
+      // TODO: Just typedef the type of this function to RenderScreenFn or something since it's used in a few places
+      void (VulkanGame::* currentRenderScreenFn)(int width, int height);
 
       map<string, vector<UIValue>> valueLists;
@@ -456 +459 @@
       /*** High-level functions ***/
 
-      void renderMainScreen();
-      void renderGameScreen();
+      void renderMainScreen(int width, int height);
+      void renderGameScreen(int width, int height);
 
       void initGuiValueLists(map<string, vector<UIValue>>& valueLists);
       void renderGuiValueList(vector<UIValue>& values);
 
-      void goToScreen(void (VulkanGame::* renderScreenFn)());
+      void goToScreen(void (VulkanGame::* renderScreenFn)(int width, int height));
       void quitGame();
 };