Changeset cabdd5c in opengl-game

Timestamp:

Sep 14, 2019, 12:13:54 AM (5 years ago)

Author:

Dmitry Portnoy <dmitry.portnoy@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

2e77b3f

Parents:

cb01aff

Message:

Mark which parts of the old code were moved over to the new openglgame and vulkangame code and remove some TODOs that were moved over

Files:

• new-game.cpp (modified) (3 diffs)
• vulkan-ref.cpp (modified) (15 diffs)

new-game.cpp

@@ -287 +287 @@
 */
 
+/*** START OF REFACTORED CODE ***/
 // Helps to test logging during crashes
 void badFunc() {
@@ -368 +369 @@
       cout << "OpenGL debug message callback is not supported" << endl;
    }
+/*** END OF REFACTORED CODE ***/
 
    srand(time(0));
@@ -955 +957 @@
       bindUniformData(modelGroups[TYPE_EXPLOSION].attribs["cur_time"]);
 
+/*** START OF REFACTORED CODE ***/
       // Render scene
 
       glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-
-      // Anton's book suggests placing this here, after glClear(). Check it's impact on framerate
-      //glViewport(0, 0, windowWidth, windowHeight);
+/*** END OF REFACTORED CODE ***/
 
       switch (curState) {

vulkan-ref.cpp

@@ -108 +108 @@
 };
 
+/*** START OF REFACTORED CODE ***/
 VkResult CreateDebugUtilsMessengerEXT(VkInstance instance,
       const VkDebugUtilsMessengerCreateInfoEXT* pCreateInfo,
@@ -144 +145 @@
    private:
       GameGui* gui = new GameGui_SDL();
+
       SDL_version sdlVersion;
       SDL_Window* window = nullptr;
-
-      // TODO: Come up with more descriptive names for these
       SDL_Renderer* gRenderer = nullptr;
+/*** END OF REFACTORED CODE ***/
       SDL_Texture* uiOverlay = nullptr;
 
@@ -155 +156 @@
       SDL_Texture* uiImage = nullptr;
 
+/*** START OF REFACTORED CODE ***/
       VkInstance instance;
       VkDebugUtilsMessengerEXT debugMessenger;
+/*** END OF REFACTORED CODE ***/
       VkSurfaceKHR surface;
 
@@ -222 +225 @@
       bool framebufferResized = false;
 
-      // TODO: Make make some more initi functions, or call this initUI if the
-      // amount of things initialized here keeps growing
+/*** START OF REFACTORED CODE ***/
       bool initWindow() {
-         // TODO: Put all fonts, textures, and images in the assets folder
-
          if (gui->init() == RTWO_ERROR) {
             cout << "UI library could not be initialized!" << endl;
@@ -245 +245 @@
             return RTWO_ERROR;
          }
+/*** END OF REFACTORED CODE ***/
 
          SDL_VERSION(&sdlVersion);
@@ -307 +308 @@
       }
 
+/*** START OF REFACTORED CODE ***/
       void initVulkan() {
          createInstance();
          setupDebugMessenger();
+/*** END OF REFACTORED CODE ***/
          createSurface();
          pickPhysicalDevice();
@@ -459 +462 @@
       }
 
+/*** START OF REFACTORED CODE ***/
       vector<const char*> getRequiredExtensions() {
          vector<const char*> extensions = gui->getRequiredExtensions();
@@ -487 +491 @@
          createInfo.pfnUserCallback = debugCallback;
       }
+      /*** END OF REFACTORED CODE ***/
 
       void createSurface() {
@@ -708 +713 @@
          if (capabilities.currentExtent.width != numeric_limits<uint32_t>::max()) {
             return capabilities.currentExtent;
-         }
-         else {
-            int width, height;
-            gui->getWindowSize(&width, &height);
-
+         } else {
             VkExtent2D actualExtent = {
-               static_cast<uint32_t>(width),
-               static_cast<uint32_t>(height)
+               static_cast<uint32_t>(gui->getWindowWidth()),
+               static_cast<uint32_t>(gui->getWindowHeight())
             };
 
@@ -1811 +1812 @@
 
       void recreateSwapChain() {
-         int width = 0, height = 0;
-
-         gui->getWindowSize(&width, &height);
-
-         while (width == 0 || height == 0 ||
+         gui->refreshWindowSize();
+
+         while (gui->getWindowWidth() == 0 || gui->getWindowHeight() == 0 ||
             (SDL_GetWindowFlags(window) & SDL_WINDOW_MINIMIZED) != 0) {
             SDL_WaitEvent(nullptr);
-            gui->getWindowSize(&width, &height);
+            gui->refreshWindowSize();
          }
 
@@ -1875 +1874 @@
 
          vkDestroyCommandPool(device, commandPool, nullptr);
-
          vkDestroyDevice(device, nullptr);
-
+         vkDestroySurfaceKHR(instance, surface, nullptr);
+
+/*** START OF REFACTORED CODE ***/
          if (enableValidationLayers) {
             DestroyDebugUtilsMessengerEXT(instance, debugMessenger, nullptr);
          }
 
-         vkDestroySurfaceKHR(instance, surface, nullptr);
          vkDestroyInstance(instance, nullptr);
+/*** END OF REFACTORED CODE ***/
 
          // TODO: Check if any of these functions accept null parameters
@@ -1906 +1906 @@
          }
 
+/*** START OF REFACTORED CODE ***/
          SDL_DestroyRenderer(gRenderer);
          gRenderer = nullptr;
@@ -1912 +1913 @@
          gui->shutdown();
          delete gui;
+/*** END OF REFACTORED CODE ***/
       }
 
@@ -1986 +1988 @@
 };
 
+/*** START OF REFACTORED CODE ***/
 int main(int argc, char* argv[]) {
 
@@ -2009 +2012 @@
    return EXIT_SUCCESS;
 }
+/*** END OF REFACTORED CODE ***/