From fe7d1d799d06e19f29e969d9e3fc9ce627244373 Mon Sep 17 00:00:00 2001 From: saschawillems Date: Sun, 6 Mar 2016 17:33:50 +0100 Subject: [PATCH] glm's radians instead of deg_to_rad(#37), define for Vulkan clip space (#17) --- triangle/triangle.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/triangle/triangle.cpp b/triangle/triangle.cpp index 3f027a65..b067c1d9 100644 --- a/triangle/triangle.cpp +++ b/triangle/triangle.cpp @@ -18,6 +18,7 @@ #include #define GLM_FORCE_RADIANS +#define GLM_DEPTH_ZERO_TO_ONE #include #include @@ -690,14 +691,14 @@ public: void updateUniformBuffers() { // Update matrices - uboVS.projectionMatrix = glm::perspective(deg_to_rad(60.0f), (float)width / (float)height, 0.1f, 256.0f); + uboVS.projectionMatrix = glm::perspective(glm::radians(60.0f), (float)width / (float)height, 0.1f, 256.0f); uboVS.viewMatrix = glm::translate(glm::mat4(), glm::vec3(0.0f, 0.0f, zoom)); uboVS.modelMatrix = glm::mat4(); - uboVS.modelMatrix = glm::rotate(uboVS.modelMatrix, deg_to_rad(rotation.x), glm::vec3(1.0f, 0.0f, 0.0f)); - uboVS.modelMatrix = glm::rotate(uboVS.modelMatrix, deg_to_rad(rotation.y), glm::vec3(0.0f, 1.0f, 0.0f)); - uboVS.modelMatrix = glm::rotate(uboVS.modelMatrix, deg_to_rad(rotation.z), glm::vec3(0.0f, 0.0f, 1.0f)); + uboVS.modelMatrix = glm::rotate(uboVS.modelMatrix, glm::radians(rotation.x), glm::vec3(1.0f, 0.0f, 0.0f)); + uboVS.modelMatrix = glm::rotate(uboVS.modelMatrix, glm::radians(rotation.y), glm::vec3(0.0f, 1.0f, 0.0f)); + uboVS.modelMatrix = glm::rotate(uboVS.modelMatrix, glm::radians(rotation.z), glm::vec3(0.0f, 0.0f, 1.0f)); // Map uniform buffer and update it uint8_t *pData;