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

Fix some other oopsies

This commit is contained in:
Jérôme Leclercq 2018-09-05 16:24:10 +02:00
parent 500ad417a7
commit 1114bb0fdd
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,8 +24,8 @@ namespace Nz
public: public:
Angle() = default; Angle() = default;
Angle(T value); Angle(T value);
template<AngleUnit U = Unit, typename C = std::enable_if_t<Unit == AngleUnit::Degree>> explicit Angle(const Angle<AngleUnit::Radian, T>& value) { Set(value); } template<AngleUnit U = Unit, typename = std::enable_if_t<U == AngleUnit::Degree>> explicit Angle(const Angle<AngleUnit::Radian, T>& value) { Set(value); }
template<AngleUnit U = Unit, typename C = std::enable_if_t<Unit == AngleUnit::Radian>> explicit Angle(const Angle<AngleUnit::Degree, T>& value) { Set(value); } template<AngleUnit U = Unit, typename = std::enable_if_t<U == AngleUnit::Radian>> explicit Angle(const Angle<AngleUnit::Degree, T>& value) { Set(value); }
template<typename U> explicit Angle(const Angle<Unit, U>& Angle); template<typename U> explicit Angle(const Angle<Unit, U>& Angle);
Angle(const Angle&) = default; Angle(const Angle&) = default;
~Angle() = default; ~Angle() = default;

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

@ -328,7 +328,7 @@ namespace Nz
template<AngleUnit Unit, typename T> template<AngleUnit Unit, typename T>
Angle<Unit, T> Angle<Unit, T>::operator+(const Angle& other) const Angle<Unit, T> Angle<Unit, T>::operator+(const Angle& other) const
{ {
return Angle(angle + Angle.angle); return Angle(angle + other.angle);
} }
/*! /*!
@ -340,7 +340,7 @@ namespace Nz
template<AngleUnit Unit, typename T> template<AngleUnit Unit, typename T>
Angle<Unit, T> Angle<Unit, T>::operator-(const Angle& other) const Angle<Unit, T> Angle<Unit, T>::operator-(const Angle& other) const
{ {
return Angle(angle - Angle.angle); return Angle(angle - other.angle);
} }
/*! /*!
@ -352,7 +352,7 @@ namespace Nz
template<AngleUnit Unit, typename T> template<AngleUnit Unit, typename T>
Angle<Unit, T>& Angle<Unit, T>::operator+=(const Angle& other) Angle<Unit, T>& Angle<Unit, T>::operator+=(const Angle& other)
{ {
angle += Angle.angle; angle += other.angle;
return *this; return *this;
} }
@ -365,7 +365,7 @@ namespace Nz
template<AngleUnit Unit, typename T> template<AngleUnit Unit, typename T>
Angle<Unit, T>& Angle<Unit, T>::operator-=(const Angle& other) Angle<Unit, T>& Angle<Unit, T>::operator-=(const Angle& other)
{ {
angle -= Angle.angle; angle -= other.angle;
return *this; return *this;
} }