Changeset 8e02b6b in opengl-game for vulkan-game.cpp

Timestamp:

Nov 22, 2019, 6:27:13 PM (5 years ago)

Author:

Dmitry Portnoy <dmitry.portnoy@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

f97c5e7

Parents:

683dd55

git-author:

Dmitry Portnoy <dmitry.portnoy@…> (11/22/19 18:26:59)

git-committer:

Dmitry Portnoy <dmitry.portnoy@…> (11/22/19 18:27:13)

Message:

To move to a more generic way of updating the scene, rename updateUniformBuffers() to updateScene() in VulkanGame and move the code to copy the data into a new copyDataToMemory() function in VulkanUtils.

File:

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

vulkan-game.cpp

@@ -26 +26 @@
    framebufferResized = false;
 
-   ubo = {};
+   modelMvpMats = {};
 }
 
@@ -266 +266 @@
    mat4 T = translate(mat4(1.0f), vec3(-cam_pos.x, -cam_pos.y, -cam_pos.z));
 
-   ubo.view = R * T;
-
-   ubo.proj = perspective(radians(FOV_ANGLE), (float)swapChainExtent.width / (float)swapChainExtent.height, NEAR_CLIP, FAR_CLIP);
-   ubo.proj[1][1] *= -1; // flip the y-axis so that +y is up
+   modelMvpMats.view = R * T;
+
+   modelMvpMats.proj = perspective(radians(FOV_ANGLE), (float)swapChainExtent.width / (float)swapChainExtent.height, NEAR_CLIP, FAR_CLIP);
+   modelMvpMats.proj[1][1] *= -1; // flip the y-axis so that +y is up
 }
 
@@ -342 +342 @@
 }
 
+void VulkanGame::updateScene(uint32_t currentImage) {
+   static auto startTime = chrono::high_resolution_clock::now();
+
+   auto currentTime = chrono::high_resolution_clock::now();
+   float time = chrono::duration<float, chrono::seconds::period>(currentTime - startTime).count();
+
+   modelMvpMats.model =
+      translate(mat4(1.0f), vec3(0.0f, -2.0f, -0.0f)) *
+      rotate(mat4(1.0f), time * radians(90.0f), vec3(0.0f, 0.0f, 1.0f));
+
+   VulkanUtils::copyDataToMemory(device, uniformBuffersMemory[currentImage], modelMvpMats);
+}
+
 void VulkanGame::renderUI() {
    SDL_SetRenderDrawColor(renderer, 0x00, 0x00, 0x00, 0x00);
@@ -380 +393 @@
    }
 
-   updateUniformBuffer(imageIndex);
+   // TODO: Figure out a more elegant way to only do updates and render the UI once per scene render
+   // Probably move some of the renderScene() code into a higher function that updates the UI, and renders
+   // the UI and scene
+   updateScene(imageIndex);
 
    VkSubmitInfo submitInfo = {};
@@ -880 +896 @@
 
 void VulkanGame::createUniformBuffers() {
-   VkDeviceSize bufferSize = sizeof(UniformBufferObject);
+   VkDeviceSize bufferSize = sizeof(UBO_MvpMat);
 
    uniformBuffers.resize(swapChainImages.size());
@@ -893 +909 @@
       uniformBufferInfoList[i].buffer = uniformBuffers[i];
       uniformBufferInfoList[i].offset = 0;
-      uniformBufferInfoList[i].range = sizeof(UniformBufferObject);
+      uniformBufferInfoList[i].range = sizeof(UBO_MvpMat);
    }
 }
@@ -1005 +1021 @@
 }
 
-void VulkanGame::updateUniformBuffer(uint32_t currentImage) {
-   static auto startTime = chrono::high_resolution_clock::now();
-
-   auto currentTime = chrono::high_resolution_clock::now();
-   float time = chrono::duration<float, chrono::seconds::period>(currentTime - startTime).count();
-
-   ubo.model =
-      translate(mat4(1.0f), vec3(0.0f, -2.0f, -0.0f)) * 
-      rotate(mat4(1.0f), time * radians(90.0f), vec3(0.0f, 0.0f, 1.0f));
-
-   void* data;
-   vkMapMemory(device, uniformBuffersMemory[currentImage], 0, sizeof(ubo), 0, &data);
-   memcpy(data, &ubo, sizeof(ubo));
-   vkUnmapMemory(device, uniformBuffersMemory[currentImage]);
-}
-
 void VulkanGame::cleanupSwapChain() {
    VulkanUtils::destroyVulkanImage(device, depthImage);