Merge branch 'nazara-next' into vulkan

2020-02-25 19:15:07 +01:00
parent 79f732ee8a d298e93c13
commit cb66dddd45
448 changed files with 2739 additions and 15884 deletions
--- a/src/Nazara/Renderer/RenderWindow.cpp
+++ b/src/Nazara/Renderer/RenderWindow.cpp
@@ -4,8 +4,9 @@

 #include <Nazara/Renderer/RenderWindow.hpp>
 #include <Nazara/Core/Error.hpp>
-#include <Nazara/Core/Thread.hpp>
 #include <Nazara/Renderer/Renderer.hpp>
+#include <chrono>
+#include <thread>
 #include <Nazara/Renderer/Debug.hpp>

 namespace Nz
@@ -16,7 +17,7 @@ namespace Nz
 		{
 			int remainingTime = 1000/static_cast<int>(m_framerateLimit) - static_cast<int>(m_clock.GetMilliseconds());
 			if (remainingTime > 0)
-				Thread::Sleep(remainingTime);
+				std::this_thread::sleep_for(std::chrono::milliseconds(remainingTime));

 			m_clock.Restart();
 		}