Merge branch 'master' into vulkan

SDK/include/NDK/BaseComponent.hpp

@@ -23,7 +23,7 @@ namespace Ndk
 			using Factory = std::function<BaseComponent*()>;
 
 			BaseComponent(ComponentIndex componentIndex);
-			BaseComponent(BaseComponent&&) = default;
+			BaseComponent(BaseComponent&&) noexcept = default;
 			virtual ~BaseComponent();
 
 			virtual std::unique_ptr<BaseComponent> Clone() const = 0;
@@ -34,7 +34,7 @@ namespace Ndk
 			inline static ComponentIndex GetMaxComponentIndex();
 
 			BaseComponent& operator=(const BaseComponent&) = delete;
-			BaseComponent& operator=(BaseComponent&&) = default;
+			BaseComponent& operator=(BaseComponent&&) noexcept = default;
 
 		protected:
 			BaseComponent(const BaseComponent&) = default;

SDK/include/NDK/BaseWidget.hpp

@@ -30,7 +30,7 @@ namespace Ndk
 
 			BaseWidget(BaseWidget* parent);
 			BaseWidget(const BaseWidget&) = delete;
-			BaseWidget(BaseWidget&&) = default;
+			BaseWidget(BaseWidget&&) = delete;
 			virtual ~BaseWidget();
 
 			template<typename T, typename... Args> T* Add(Args&&... args);
@@ -72,7 +72,7 @@ namespace Ndk
 			void Show(bool show = true);
 
 			BaseWidget& operator=(const BaseWidget&) = delete;
-			BaseWidget& operator=(BaseWidget&&) = default;
+			BaseWidget& operator=(BaseWidget&&) = delete;
 
 			struct Padding
 			{

SDK/include/NDK/Components/GraphicsComponent.hpp

@@ -28,7 +28,7 @@ namespace Ndk
 		public:
 			using RenderableList = std::vector<Nz::InstancedRenderableRef>;
 
-			GraphicsComponent();
+			inline GraphicsComponent();
 			inline GraphicsComponent(const GraphicsComponent& graphicsComponent);
 			~GraphicsComponent() = default;
 

SDK/include/NDK/Components/GraphicsComponent.inl

@@ -10,6 +10,7 @@
 namespace Ndk
 {
 	inline GraphicsComponent::GraphicsComponent() :
+	m_reflectiveMaterialCount(0),
 	m_scissorRect(-1, -1)
 	{
 	}
@@ -22,6 +23,7 @@ namespace Ndk
 	inline GraphicsComponent::GraphicsComponent(const GraphicsComponent& graphicsComponent) :
 	Component(graphicsComponent),
 	HandledObject(graphicsComponent),
+	m_reflectiveMaterialCount(0),
 	m_boundingVolume(graphicsComponent.m_boundingVolume),
 	m_transformMatrix(graphicsComponent.m_transformMatrix),
 	m_boundingVolumeUpdated(graphicsComponent.m_boundingVolumeUpdated),

SDK/include/NDK/Components/PhysicsComponent2D.hpp

@@ -30,6 +30,8 @@ namespace Ndk
 			void AddImpulse(const Nz::Vector2f& impulse, const Nz::Vector2f& point, Nz::CoordSys coordSys = Nz::CoordSys_Global);
 			void AddTorque(float torque);
 
+			bool ClosestPointQuery(const Nz::Vector2f& position, Nz::Vector2f* closestPoint, float* closestDistance) const;
+
 			Nz::Rectf GetAABB() const;
 			float GetAngularVelocity() const;
 			Nz::Vector2f GetCenterOfGravity(Nz::CoordSys coordSys = Nz::CoordSys_Local) const;

SDK/include/NDK/Components/PhysicsComponent2D.inl

@@ -2,6 +2,7 @@
 // This file is part of the "Nazara Development Kit"
 // For conditions of distribution and use, see copyright notice in Prerequisites.hpp
 
+#include <NDK/Components/PhysicsComponent2D.hpp>
 #include <Nazara/Core/Error.hpp>
 
 namespace Ndk
@@ -97,6 +98,23 @@ namespace Ndk
 		m_object->AddTorque(torque);
 	}
 
+	/*!
+	* \brief Finds the closest point on the entity relative to a position
+	* \return True if such a point exists (will return false if no collider exists)
+	*
+	* \param position The starting point which will be used for the query
+	* \param closestPoint The closest point on entity surface
+	* \param closestDistance The distance between the closest point and the starting point, may be negative if starting point is inside the entity
+	*
+	* \remark Produces a NazaraAssert if the physics object is invalid
+	*/
+	inline bool PhysicsComponent2D::ClosestPointQuery(const Nz::Vector2f& position, Nz::Vector2f* closestPoint, float* closestDistance) const
+	{
+		NazaraAssert(m_object, "Invalid physics object");
+
+		return m_object->ClosestPointQuery(position, closestPoint, closestDistance);
+	}
+
 	/*!
 	* \brief Gets the AABB of the physics object
 	* \return AABB of the object

SDK/include/NDK/System.hpp

@@ -17,11 +17,11 @@ namespace Ndk
 		public:
 			System();
 			System(const System&) = delete;
-			System(System&&) = default;
+			System(System&&) noexcept = default;
 			virtual ~System();
 
 			System& operator=(const System&) = delete;
-			System& operator=(System&&) = default;
+			System& operator=(System&&) noexcept = default;
 
 			static SystemIndex RegisterSystem();
 	};

SDK/include/NDK/Widgets/CheckboxWidget.hpp

@@ -1,4 +1,4 @@
-// Copyright (C) 2017 Samy Bensaid
+// Copyright (C) 2017 Samy Bensaid
 // This file is part of the "Nazara Development Kit"
 // For conditions of distribution and use, see copyright notice in Prerequisites.hpp
 

SDK/src/NDK/Lua/LuaBinding_Network.cpp

@@ -266,14 +266,15 @@ namespace Ndk
 		state.SetGlobal("ResolveError");
 
 		// Nz::SocketError
-		static_assert(Nz::SocketError_Max + 1 == 15, "Nz::ResolveError has been updated but change was not reflected to Lua binding");
-		state.PushTable(0, 15);
+		static_assert(Nz::SocketError_Max + 1 == 16, "Nz::SocketError has been updated but change was not reflected to Lua binding");
+		state.PushTable(0, 16);
 		{
 			state.PushField("AddressNotAvailable", Nz::SocketError_AddressNotAvailable);
 			state.PushField("ConnectionClosed",    Nz::SocketError_ConnectionClosed);
 			state.PushField("ConnectionRefused",   Nz::SocketError_ConnectionRefused);
 			state.PushField("DatagramSize",        Nz::SocketError_DatagramSize);
 			state.PushField("Internal",            Nz::SocketError_Internal);
+			state.PushField("Interrupted",         Nz::SocketError_Interrupted);
 			state.PushField("Packet",              Nz::SocketError_Packet);
 			state.PushField("NetworkError",        Nz::SocketError_NetworkError);
 			state.PushField("NoError",             Nz::SocketError_NoError);