sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

And again

This commit is contained in:
Jérôme Leclercq 2018-09-25 15:56:35 +02:00
parent 2243749480
commit e1cfa2e184
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/Nazara/Math/Angle.hpp
View File

@ -42,10 +42,10 @@ namespace Nz
void Normalize(); void Normalize();
template<AngleUnit U = Unit, typename = std::enable_if_t<U == AngleUnit::Degree>> Angle& Set(const Angle<AngleUnit::Radian, T>& Angle); template<AngleUnit U = Unit, typename = std::enable_if_t<U == AngleUnit::Degree>> Angle& Set(const Angle<AngleUnit::Radian, T>& ang);
template<AngleUnit U = Unit, typename = std::enable_if_t<U == AngleUnit::Radian>> Angle& Set(const Angle<AngleUnit::Degree, T>& Angle); template<AngleUnit U = Unit, typename = std::enable_if_t<U == AngleUnit::Radian>> Angle& Set(const Angle<AngleUnit::Degree, T>& ang);
Angle& Set(const Angle& Angle); Angle& Set(const Angle& ang);
template<typename U> Angle& Set(const Angle<Unit, U>& Angle); template<typename U> Angle& Set(const Angle<Unit, U>& ang);
Angle<AngleUnit::Degree, T> ToDegrees() const; Angle<AngleUnit::Degree, T> ToDegrees() const;
EulerAngles<T> ToEulerAngles() const; EulerAngles<T> ToEulerAngles() const;

16
include/Nazara/Math/Angle.inl
View File

@ -243,9 +243,9 @@ namespace Nz
*/ */
template<AngleUnit Unit, typename T> template<AngleUnit Unit, typename T>
template<AngleUnit U, typename> template<AngleUnit U, typename>
Angle<Unit, T>& Angle<Unit, T>::Set(const Angle<AngleUnit::Radian, T>& angle) Angle<Unit, T>& Angle<Unit, T>::Set(const Angle<AngleUnit::Radian, T>& ang)
{ {
angle = RadianToDegree(angle.angle); angle = RadianToDegree(ang.angle);
return *this; return *this;
} }
@ -256,9 +256,9 @@ namespace Nz
*/ */
template<AngleUnit Unit, typename T> template<AngleUnit Unit, typename T>
template<AngleUnit U, typename> template<AngleUnit U, typename>
Angle<Unit, T>& Angle<Unit, T>::Set(const Angle<AngleUnit::Degree, T>& angle) Angle<Unit, T>& Angle<Unit, T>::Set(const Angle<AngleUnit::Degree, T>& ang)
{ {
angle = DegreeToRadian(angle.angle); angle = DegreeToRadian(ang.angle);
return *this; return *this;
} }
@ -268,9 +268,9 @@ namespace Nz
* \param Angle Angle which will be copied * \param Angle Angle which will be copied
*/ */
template<AngleUnit Unit, typename T> template<AngleUnit Unit, typename T>
Angle<Unit, T>& Angle<Unit, T>::Set(const Angle& angle) Angle<Unit, T>& Angle<Unit, T>::Set(const Angle& ang)
{ {
angle = angle.angle; angle = ang.angle;
return *this; return *this;
} }
@ -283,9 +283,9 @@ namespace Nz
*/ */
template<AngleUnit Unit, typename T> template<AngleUnit Unit, typename T>
template<typename U> template<typename U>
Angle<Unit, T>& Angle<Unit, T>::Set(const Angle<Unit, U>& angle) Angle<Unit, T>& Angle<Unit, T>::Set(const Angle<Unit, U>& ang)
{ {
angle = static_cast<T>(angle.angle); angle = static_cast<T>(ang.angle);
return *this; return *this;
} }