Changeset f985231 in opengl-game

Timestamp:

Nov 7, 2019, 2:30:59 AM (5 years ago)

Author:

Dmitry Portnoy <dmp1488@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

cc4a8b5

Parents:

d2d9286

Message:

In vulkangame, update the MVP matrix and copy it to the uniform buffer to correctly display the scene

Files:

• VulkanGame.vcxproj (modified) (1 diff)
• vulkan-game.cpp (modified) (3 diffs)
• vulkan-game.hpp (modified) (1 diff)
• vulkan-ref.cpp (modified) (3 diffs)

VulkanGame.vcxproj

@@ -158 +158 @@
     <ClInclude Include="vulkan-utils.hpp" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="shaders\overlay.frag" />
+    <None Include="shaders\overlay.vert" />
+    <None Include="shaders\scene.frag" />
+    <None Include="shaders\scene.vert" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

vulkan-game.cpp

@@ -2 +2 @@
 
 #include <array>
+#include <chrono>
 #include <iostream>
 #include <set>
@@ -297 +298 @@
    }
 
+   updateUniformBuffer(imageIndex);
+
    VkSubmitInfo submitInfo = {};
    submitInfo.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO;
@@ -887 +890 @@
 }
 
+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();
+
+   UniformBufferObject ubo = {};
+   ubo.model = rotate(glm::mat4(1.0f), time * glm::radians(90.0f), glm::vec3(0.0f, 0.0f, 1.0f));
+   ubo.view = lookAt(glm::vec3(0.0f, 2.0f, 2.0f), glm::vec3(0.0f, 0.0f, 0.0f), glm::vec3(0.0f, 1.0f, 0.0f));
+   ubo.proj = perspective(radians(45.0f), swapChainExtent.width / (float)swapChainExtent.height, 0.1f, 10.0f);
+   ubo.proj[1][1] *= -1; // flip the y-axis so that +y is up
+
+   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);

vulkan-game.hpp

@@ -125 +125 @@
 
       void recreateSwapChain();
+      void updateUniformBuffer(uint32_t currentImage);
 
       void cleanupSwapChain();

vulkan-ref.cpp

@@ -1794 +1794 @@
             throw runtime_error("failed to acquire swap chain image!");
          }
-/*** END OF REFACTORED CODE ***/
 
          updateUniformBuffer(imageIndex);
 
-/*** START OF REFACTORED CODE ***/
          VkSubmitInfo submitInfo = {};
          submitInfo.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO;
@@ -1876 +1874 @@
          populateImageFromSDLTexture(uiOverlay, sdlOverlayImage);
       }
-/*** END OF REFACTORED CODE ***/
 
       void updateUniformBuffer(uint32_t currentImage) {
@@ -1896 +1893 @@
       }
 
-/*** START OF REFACTORED CODE ***/
       void recreateSwapChain() {
          gui->refreshWindowSize();