Merge branch 'master' into vulkan

2020-05-27 19:48:22 +02:00
parent 8fa456bdf5 81f03f04e5
commit 68208f5426
179 changed files with 41359 additions and 5418 deletions
--- a/include/Nazara/Platform/Window.inl
+++ b/include/Nazara/Platform/Window.inl
@@ -19,7 +19,7 @@ namespace Nz
 		Create(mode, title, style);
 	}

-	inline Window::Window(WindowHandle handle) :
+	inline Window::Window(void* handle) :
 	Window()
 	{
 		ErrorFlags flags(ErrorFlag_ThrowException, true);
@@ -109,6 +109,16 @@ namespace Nz
 			}
 		}
 	}
+
+	inline WindowImpl* Window::GetImpl()
+	{
+		return m_impl;
+	}
+
+	inline const WindowImpl* Window::GetImpl() const
+	{
+		return m_impl;
+	}
 }

 #include <Nazara/Platform/DebugOff.hpp>