Merge remote-tracking branch 'origin/Particle-Update'

Former-commit-id: 272203af1d740dc32e9714e00e4f889db6b13350
2015-01-19 02:23:07 +01:00
parent ead44173ba b79a4c503c
commit 304b46b17d
12 changed files with 326 additions and 26 deletions
--- a/include/Nazara/Math/Vector2.inl
+++ b/include/Nazara/Math/Vector2.inl
@@ -69,7 +69,7 @@ inline unsigned int NzVector2<unsigned int>::AbsDotProduct(const NzVector2<unsig
 template<typename T>
 T NzVector2<T>::AngleBetween(const NzVector2& vec) const
 {
-	return NzRadians(std::atan2(vec.y, vec.x) - std::atan2(y, x));
+	return NzFromRadians(std::atan2(vec.y, vec.x) - std::atan2(y, x));
 }

 template<typename T>