Changeset cd1cb0f in opengl-game for graphics-pipeline_vulkan.hpp

Timestamp:

Dec 24, 2019, 12:48:49 AM (5 years ago)

Author:

Dmitry Portnoy <dmitry.portnoy@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

0fe8433

Parents:

a79be34

git-author:

Dmitry Portnoy <dmitry.portnoy@…> (12/22/19 03:45:12)

git-committer:

Dmitry Portnoy <dmitry.portnoy@…> (12/24/19 00:48:49)

Message:

In VulkanGame, make the ship move when the player holds down the right or left arrow keys

File:

• graphics-pipeline_vulkan.hpp (modified) (6 diffs)

graphics-pipeline_vulkan.hpp

@@ -10 +10 @@
 #include <vulkan/vulkan.h>
 
+#define GLM_FORCE_RADIANS
+#define GLM_FORCE_DEPTH_ZERO_TO_ONE // Since, in Vulkan, the depth range is 0 to 1 instead of -1 to 1
+#define GLM_FORCE_RIGHT_HANDED
+
+#include <glm/glm.hpp>
+#include <glm/gtc/matrix_transform.hpp>
+
 #include "vulkan-utils.hpp"
+
+using namespace glm;
 
 // TODO: Maybe change the name of this struct so I can call the list something other than descriptorInfoList
@@ -28 +37 @@
    vector<VertexType> vertices;
    vector<uint16_t> indices;
+
+   mat4 model_base;
+   mat4 model_transform;
 };
 
@@ -54 +66 @@
       void createRenderCommands(VkCommandBuffer& commandBuffer, uint32_t currentImage);
 
-      const vector<SceneObject<VertexType>>& getObjects();
+      vector<SceneObject<VertexType>>& getObjects();
       void addObject(const vector<VertexType>& vertices, vector<uint16_t> indices, VkCommandPool commandPool,
          VkQueue graphicsQueue);
@@ -88 +100 @@
       VkDeviceMemory indexBufferMemory;
 
-      // TODO: THe objects vector isn't used at all in this class, except in the method that returns
+      // TODO: The objects vector isn't used at all in this class, except in the method that returns
       // the number of objects. Move this vector and the SceneObject declaration into VulkanGame, esp.
-      // since I'll be adding other // object-specific fields sich as transforms to SceneObject later
+      // since I'll be adding other object-specific fields such as transforms to SceneObject later
       vector<SceneObject<VertexType>> objects;
 
@@ -410 +422 @@
 
 template<class VertexType>
-const vector<SceneObject<VertexType>>& GraphicsPipeline_Vulkan<VertexType>::getObjects() {
+vector<SceneObject<VertexType>>& GraphicsPipeline_Vulkan<VertexType>::getObjects() {
    return objects;
 }
@@ -428 +440 @@
       idx += numVertices;
    }
-   objects.push_back({ vertices, indices });
+   objects.push_back({ vertices, indices, mat4(1.0f), mat4(1.0f) });
 
    VulkanUtils::copyDataToBuffer(device, physicalDevice, commandPool, vertices, vertexBuffer, numVertices,