From 1e190caa2c179eab60420a36b77ca82a5fdb02ce Mon Sep 17 00:00:00 2001
From: Lynix <lynix680@gmail.com>
Date: Fri, 24 Nov 2017 20:15:04 +0100
Subject: [PATCH] Fix compilation

---
 examples/VulkanTest/build.lua                |  1 +
 examples/VulkanTest/main.cpp                 | 15 ++++++++-------
 include/Nazara/Renderer/RenderSurface.hpp    |  2 +-
 include/Nazara/Renderer/RenderWindowImpl.hpp |  2 +-
 include/Nazara/VulkanRenderer.hpp            |  2 ++
 5 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/examples/VulkanTest/build.lua b/examples/VulkanTest/build.lua
index eab5abd2c..3137d0f43 100644
--- a/examples/VulkanTest/build.lua
+++ b/examples/VulkanTest/build.lua
@@ -14,6 +14,7 @@ EXAMPLE.Files = {
 
 EXAMPLE.Libraries = {
 	"NazaraCore",
+	"NazaraPlatform",
 	"NazaraVulkanRenderer",
 	"NazaraUtility"
 }
diff --git a/examples/VulkanTest/main.cpp b/examples/VulkanTest/main.cpp
index 1cf1592d3..7fc74f32b 100644
--- a/examples/VulkanTest/main.cpp
+++ b/examples/VulkanTest/main.cpp
@@ -176,7 +176,7 @@ int main()
 		{{0.0f, -1.f, 0.0f},  {0.0f, 0.0f, 1.0f}}
 	};
 
-	Nz::Matrix4f projection = Nz::Matrix4f::Perspective(70.f, float(window.GetWidth()) / window.GetHeight(), 1.f, 1000.f);
+	Nz::Matrix4f projection = Nz::Matrix4f::Perspective(70.f, float(windowSize.x) / windowSize.y, 1.f, 1000.f);
 	Nz::Matrix4f world = Nz::Matrix4f::Translate(Nz::Vector3f::Forward() * 5.f);
 
 	for (unsigned int i = 0; i < 3; ++i)
@@ -302,7 +302,8 @@ int main()
 	}
 	ubo;
 
-	ubo.projectionMatrix = Nz::Matrix4f::Perspective(70.f, float(window.GetWidth()) / window.GetHeight(), 0.1f, 1000.f);
+	Nz::Vector2ui windowSize = window.GetSize();
+	ubo.projectionMatrix = Nz::Matrix4f::Perspective(70.f, float(windowSize.x) / windowSize.y, 0.1f, 1000.f);
 	ubo.viewMatrix = Nz::Matrix4f::Translate(Nz::Vector3f::Backward() * 1);
 	ubo.modelMatrix = Nz::Matrix4f::Translate(Nz::Vector3f::Forward() * 2 + Nz::Vector3f::Right());
 
@@ -593,8 +594,8 @@ int main()
 				0                                           // int32_t                        y
 			},
 			{                                           // VkExtent2D                     extent
-				window.GetWidth(),                                        // int32_t                        width
-				window.GetHeight(),                                        // int32_t                        height
+				windowSize.x,                                        // int32_t                        width
+				windowSize.y,                                        // int32_t                        height
 			}
 		};
 
@@ -637,8 +638,8 @@ int main()
 		renderCmd.BindVertexBuffer(0, vertexBuffer, 0);
 		renderCmd.BindDescriptorSet(VK_PIPELINE_BIND_POINT_GRAPHICS, pipelineLayout, 0, descriptorSet);
 		renderCmd.BindPipeline(VK_PIPELINE_BIND_POINT_GRAPHICS, pipeline);
-		renderCmd.SetScissor(Nz::Recti{0, 0, int(window.GetWidth()), int(window.GetHeight())});
-		renderCmd.SetViewport({0.f, 0.f, float(window.GetWidth()), float(window.GetHeight())}, 0.f, 1.f);
+		renderCmd.SetScissor(Nz::Recti{0, 0, int(windowSize.x), int(windowSize.y)});
+		renderCmd.SetViewport({0.f, 0.f, float(windowSize.x), float(windowSize.y)}, 0.f, 1.f);
 		renderCmd.DrawIndexed(indexCount);
 		renderCmd.EndRenderPass();
 
@@ -689,7 +690,7 @@ int main()
 
 					// Pour éviter que le curseur ne sorte de l'écran, nous le renvoyons au centre de la fenêtre
 					// Cette fonction est codée de sorte à ne pas provoquer d'évènement MouseMoved
-					Nz::Mouse::SetPosition(window.GetWidth() / 2, window.GetHeight() / 2, window);
+					Nz::Mouse::SetPosition(windowSize.x / 2, windowSize.y / 2, window);
 					updateUniforms = true;
 					break;
 				}
diff --git a/include/Nazara/Renderer/RenderSurface.hpp b/include/Nazara/Renderer/RenderSurface.hpp
index 9835af794..a452dcfbc 100644
--- a/include/Nazara/Renderer/RenderSurface.hpp
+++ b/include/Nazara/Renderer/RenderSurface.hpp
@@ -8,7 +8,7 @@
 #define NAZARA_RENDERSURFACE_HPP
 
 #include <Nazara/Prerequesites.hpp>
-#include <Nazara/Utility/WindowHandle.hpp>
+#include <Nazara/Platform/WindowHandle.hpp>
 #include <Nazara/Renderer/Config.hpp>
 
 namespace Nz
diff --git a/include/Nazara/Renderer/RenderWindowImpl.hpp b/include/Nazara/Renderer/RenderWindowImpl.hpp
index 85b1b9c36..d9d7f51cd 100644
--- a/include/Nazara/Renderer/RenderWindowImpl.hpp
+++ b/include/Nazara/Renderer/RenderWindowImpl.hpp
@@ -9,9 +9,9 @@
 
 #include <Nazara/Prerequesites.hpp>
 #include <Nazara/Math/Vector2.hpp>
+#include <Nazara/Platform/WindowHandle.hpp>
 #include <Nazara/Renderer/Config.hpp>
 #include <Nazara/Renderer/RenderWindowParameters.hpp>
-#include <Nazara/Utility/WindowHandle.hpp>
 #include <vector>
 
 namespace Nz
diff --git a/include/Nazara/VulkanRenderer.hpp b/include/Nazara/VulkanRenderer.hpp
index 367c2a55a..ed3a8c88f 100644
--- a/include/Nazara/VulkanRenderer.hpp
+++ b/include/Nazara/VulkanRenderer.hpp
@@ -35,7 +35,9 @@
 #include <Nazara/VulkanRenderer/VkRenderWindow.hpp>
 #include <Nazara/VulkanRenderer/Vulkan.hpp>
 #include <Nazara/VulkanRenderer/VulkanBuffer.hpp>
+#include <Nazara/VulkanRenderer/VulkanDevice.hpp>
 #include <Nazara/VulkanRenderer/VulkanRenderer.hpp>
+#include <Nazara/VulkanRenderer/VulkanSurface.hpp>
 #include <Nazara/VulkanRenderer/Wrapper.hpp>
 
 #endif // NAZARA_GLOBAL_VULKANRENDERER_HPP