Changeset 0e6ecf3 in opengl-game

Timestamp:

Jul 19, 2019, 8:50:06 PM (5 years ago)

Author:

Dmitry Portnoy <dmitry.portnoy@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

8667f76

Parents:

75108ef

Message:

Create a game gui implementation using glfw3 and move window create/destruction and Vulkan surface creation to the game gui

Files:

• game-gui-glfw.cpp (added)
• game-gui-glfw.hpp (added)
• game-gui-sdl.cpp (modified) (2 diffs)
• game-gui-sdl.hpp (modified) (2 diffs)
• game-gui.hpp (modified) (2 diffs)
• makefile (modified) (2 diffs)
• vulkan-game.cpp (modified) (6 diffs)

game-gui-sdl.cpp

@@ -1 +1 @@
 #include "game-gui-sdl.hpp"
-
-#include <SDL2/SDL.h>
-
-#include <iostream>
-
-using namespace std;
 
 bool GameGui_SDL::Init() {
@@ -22 +16 @@
    SDL_Quit();
 }
+
+void* GameGui_SDL::CreateWindow(const string& title, unsigned int width, unsigned int height) {
+   // On Apple's OS X you must set the NSHighResolutionCapable Info.plist property to YES,
+   // otherwise you will not receive a High DPI OpenGL canvas.
+   window = SDL_CreateWindow(title.c_str(),
+               SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED,
+               width, height,
+               SDL_WINDOW_VULKAN | SDL_WINDOW_SHOWN | SDL_WINDOW_RESIZABLE);
+
+   return window;
+}
+
+void GameGui_SDL::DestroyWindow() {
+   // TODO: This function can throw some errors. They should be handled
+   SDL_DestroyWindow(window);
+}
+
+bool GameGui_SDL::CreateVulkanSurface(VkInstance instance, VkSurfaceKHR* surface) {
+   return SDL_Vulkan_CreateSurface(window, instance, surface) ?
+      RTWO_SUCCESS : RTWO_ERROR;
+}

game-gui-sdl.hpp

@@ +1 @@
+#ifndef _GAME_GUI_SDL_H
+#define _GAME_GUI_SDL_H
+
 #include "game-gui.hpp"
+
+#include <SDL2/SDL.h>
+#include <SDL2/SDL_vulkan.h>
 
 class GameGui_SDL : public GameGui {
@@ -5 +11 @@
       bool Init();
       void Shutdown();
+
+      void* CreateWindow(const string& title, unsigned int width, unsigned int height);
+      void DestroyWindow();
+
+      bool CreateVulkanSurface(VkInstance instance, VkSurfaceKHR* surface);
+
+   private:
+      SDL_Window* window;
 };
+
+#endif // _GAME_GUI_SDL_H

game-gui.hpp

@@ +1 @@
+#ifndef _GAME_GUI_H
+#define _GAME_GUI_H
+
+#include <vulkan/vulkan.h>
+
+#include <string>
+
+using namespace std;
+
 #define RTWO_SUCCESS true
 #define RTWO_ERROR false
@@ -8 +17 @@
       virtual bool Init() = 0;
       virtual void Shutdown() = 0;
+
+      virtual void* CreateWindow(const string& title, unsigned int width, unsigned int height) = 0;
+      virtual void DestroyWindow() = 0;
+
+      virtual bool CreateVulkanSurface(VkInstance instance, VkSurfaceKHR* surface) = 0; 
 };
+
+#endif // _GAME_GUI_H

makefile

@@ -42 +42 @@
 endif
 
-LIBS = `pkg-config --static --libs sdl2`
+LIBS = `pkg-config --static --libs sdl2 glfw3`
 ifeq ($(OS),Darwin)
         LIBS := $(VULKAN_SDK_PATH)/lib/libvulkan.dylib $(LIBS)
@@ -52 +52 @@
 LIB_FLAGS = $(LIB_PATHS) $(LIBS)
 
-vulkangame: vulkan-game.cpp game-gui-sdl.cpp
+vulkangame: vulkan-game.cpp game-gui-sdl.cpp game-gui-glfw.cpp
         $(CC) $(CXX_FLAGS) -o $@ $^ $(LIB_FLAGS)
 

vulkan-game.cpp

@@ -1 @@
-#include <vulkan/vulkan.h>
-
-#include <SDL2/SDL.h>
-#include <SDL2/SDL_vulkan.h>
+#include "game-gui-glfw.hpp"
+
+#include "game-gui-sdl.hpp"
 
 //#define _USE_MATH_DEFINES // Will be needed when/if I need to # include <cmath>
@@ -11 +10 @@
 #include <glm/mat4x4.hpp>
 
+#include <fstream>
 #include <iostream>
+#include <optional>
+#include <set>
 #include <vector>
-#include <set>
-#include <stdexcept>
-#include <cstdlib>
-#include <optional>
-#include <algorithm>
-#include <fstream>
-
-#include "game-gui-sdl.hpp"
 
 using namespace std;
@@ -137 +131 @@
             return RTWO_ERROR;
          } else {
-            // On Apple's OS X you must set the NSHighResolutionCapable Info.plist property to YES,
-            // otherwise you will not receive a High DPI OpenGL canvas.
-
-            // TODO: Move this into some generic method in game-gui-sdl
-            window = SDL_CreateWindow("Vulkan Game",
-               SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED,
-               SCREEN_WIDTH, SCREEN_HEIGHT,
-               SDL_WINDOW_VULKAN | SDL_WINDOW_SHOWN | SDL_WINDOW_RESIZABLE);
+            window = (SDL_Window*) gui->CreateWindow("Vulkan Game", SCREEN_WIDTH, SCREEN_HEIGHT);
 
             if (window == nullptr) {
@@ -274 +261 @@
          }
 
-         if (!SDL_Vulkan_CreateSurface(window, instance, &surface)) {
+         if (gui->CreateVulkanSurface(instance, &surface) == RTWO_ERROR) {
             throw runtime_error("failed to create window surface!");
          }
-
-         /*
-         if (glfwCreateWindowSurface(instance, window, nullptr, &surface) != VK_SUCCESS) {
-            throw runtime_error("failed to create window surface!");
-         }
-         */
       }
 
@@ -1014 +995 @@
          vkDestroyInstance(instance, nullptr);
 
-         // TODO: Move this into some generic method in game-gui-sdl
-         SDL_DestroyWindow(window);
-
+         gui->DestroyWindow();
          gui->Shutdown();
          delete gui;
@@ -1029 +1008 @@
 
          return VK_FALSE;
-}
+      }
 
       static vector<char> readFile(const string& filename) {