commit 82c3f33547ae3294d5417d1a051884d3c8f8ed87
author Adam Sawicki <Adam.Sawicki@amd.com> Mon Jun 11 15:27:33 2018 +0200
committer Adam Sawicki <Adam.Sawicki@amd.com> Mon Jun 11 15:27:33 2018 +0200
tree 9022ea98e214c69a5858196d12dcbe3ef51b30bf
parent d292417cdb06e30ee128eb70b947d7f851226c96

Added custom, simple structures: vec3, vec4, mat4. Removed dependency on external library MathFu.

src/VulkanSample.cpp

diff --git a/src/VulkanSample.cpp b/src/VulkanSample.cpp
index d3937b7..91f2bf2 100644
--- a/src/VulkanSample.cpp
+++ b/src/VulkanSample.cpp
@@ -573,7 +573,7 @@
 

 struct UniformBufferObject

 {

-    mathfu::vec4_packed ModelViewProj[4];

+    mat4 ModelViewProj;

 };

 

 static void RegisterDebugCallbacks()

@@ -1573,18 +1573,16 @@
         VK_PIPELINE_BIND_POINT_GRAPHICS,

         g_hPipeline);

 

-    mathfu::mat4 view = mathfu::mat4::LookAt(

-        mathfu::kZeros3f,

-        mathfu::vec3(0.f, -2.f, 4.f),

-        mathfu::kAxisY3f);

-    mathfu::mat4 proj = mathfu::mat4::Perspective(

+    mat4 view = mat4::LookAt(

+        vec3(0.f, 0.f, 0.f),

+        vec3(0.f, -2.f, 4.f),

+        vec3(0.f, 1.f, 0.f));

+    mat4 proj = mat4::Perspective(

         1.0471975511966f, // 60 degrees

         (float)g_Extent.width / (float)g_Extent.height,

         0.1f,

-        1000.f,

-        -1.f);

-    //proj[1][1] *= -1.f;

-    mathfu::mat4 viewProj = proj * view;

+        1000.f);

+    mat4 viewProj = view * proj;

 

     vkCmdBindDescriptorSets(

         hCommandBuffer,

@@ -1596,17 +1594,11 @@
         0,

         nullptr);

 

-    float rotationAngle = (float)GetTickCount() * 0.001f * (float)M_PI * 0.2f;

-    mathfu::mat3 model_3 = mathfu::mat3::RotationY(rotationAngle);

-    mathfu::mat4 model_4 = mathfu::mat4(

-        model_3(0, 0), model_3(0, 1), model_3(0, 2), 0.f,

-        model_3(1, 0), model_3(1, 1), model_3(1, 2), 0.f,

-        model_3(2, 0), model_3(2, 1), model_3(2, 2), 0.f,

-        0.f, 0.f, 0.f, 1.f);

-    mathfu::mat4 modelViewProj = viewProj * model_4;

+    float rotationAngle = (float)GetTickCount() * 0.001f * (float)PI * 0.2f;

+    mat4 model = mat4::RotationY(rotationAngle);

 

     UniformBufferObject ubo = {};

-    modelViewProj.Pack(ubo.ModelViewProj);

+    ubo.ModelViewProj = model * viewProj;

     vkCmdPushConstants(hCommandBuffer, g_hPipelineLayout, VK_SHADER_STAGE_VERTEX_BIT, 0, sizeof(UniformBufferObject), &ubo);

 

     VkBuffer vertexBuffers[] = { g_hVertexBuffer };