Changeset 15104a8 in opengl-game for vulkan-game.hpp

Timestamp:

Nov 19, 2019, 5:33:49 PM (5 years ago)

Author:

Dmitry Portnoy <dmitry.portnoy@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

1908591

Parents:

5ab1b20

Message:

In vulkangame, nitialize the view and projection metrices to what they were in the original OpenGL game

File:

• vulkan-game.hpp (modified) (5 diffs)

vulkan-game.hpp

@@ -3 +3 @@
 
 #include <glm/glm.hpp>
+#include <glm/gtc/matrix_transform.hpp>
 
 #include "game-gui-sdl.hpp"
@@ -8 +9 @@
 
 #include "vulkan-utils.hpp"
+
+using namespace glm;
 
 #ifdef NDEBUG
@@ -16 +19 @@
 
 struct ModelVertex {
-   glm::vec3 pos;
-   glm::vec3 color;
-   glm::vec2 texCoord;
+   vec3 pos;
+   vec3 color;
+   vec2 texCoord;
 };
 
 struct OverlayVertex {
-   glm::vec3 pos;
-   glm::vec2 texCoord;
+   vec3 pos;
+   vec2 texCoord;
+};
+
+struct UniformBufferObject {
+   alignas(16) mat4 model;
+   alignas(16) mat4 view;
+   alignas(16) mat4 proj;
 };
 
@@ -39 +48 @@
       const float FAR_CLIP = 100.0f;
       const float FOV_ANGLE = 67.0f;
+
+      vec3 cam_pos;
+
+      UniformBufferObject ubo;
 
       GameGui* gui;
@@ -106 +119 @@
       bool initWindow(int width, int height, unsigned char guiFlags);
       void initVulkan();
+      void initMatrices();
       void mainLoop();
       void renderUI();