Changeset 0e6ecf3 in opengl-game for vulkan-game.cpp

Timestamp:

Jul 19, 2019, 8:50:06 PM (6 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

File:

• vulkan-game.cpp (modified) (6 diffs)

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) {