Changeset cc4a8b5 in opengl-game

Timestamp:

Nov 7, 2019, 3:32:34 AM (5 years ago)

Author:

Dmitry Portnoy <dmp1488@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

1f25a71

Parents:

f985231

Message:

Make vulkangame compile under Linux

File:

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

vulkan-game.cpp

@@ -1 +1 @@
 #include "vulkan-game.hpp"
+
+#define GLM_FORCE_RADIANS
+#define GLM_FORCE_DEPTH_ZERO_TO_ONE
+
+#include <glm/gtc/matrix_transform.hpp>
 
 #include <array>
@@ -12 +17 @@
 
 using namespace std;
+using namespace glm;
 
 struct UniformBufferObject {
@@ -897 +903 @@
 
    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.model = rotate(mat4(1.0f), time * radians(90.0f), vec3(0.0f, 0.0f, 1.0f));
+   ubo.view = lookAt(vec3(0.0f, 2.0f, 2.0f), vec3(0.0f, 0.0f, 0.0f), 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