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

Math/Angle: Rename parameters to prevent name clash

This commit is contained in:
Jérôme Leclercq 2018-09-05 15:18:35 +02:00
parent f0e215f8f5
commit 4c8e40bb6c
2 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,9 +22,9 @@ namespace Nz
{ {
public: public:
Angle() = default; Angle() = default;
Angle(T Angle); Angle(T value);
template<AngleUnit U = Unit, typename C = std::enable_if_t<Unit == AngleUnit::Degree>> explicit Angle(const Angle<AngleUnit::Radian, T>& Angle) { Set(Angle); } 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 C = std::enable_if_t<Unit == AngleUnit::Radian>> explicit Angle(const Angle<AngleUnit::Degree, T>& Angle) { Set(Angle); } template<AngleUnit U = Unit, typename C = std::enable_if_t<Unit == 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;
@ -49,16 +49,16 @@ namespace Nz
Angle& operator=(const Angle&) = default; Angle& operator=(const Angle&) = default;
Angle operator+(const Angle& Angle) const; Angle operator+(const Angle& other) const;
Angle operator-(const Angle& Angle) const; Angle operator-(const Angle& other) const;
Angle& operator+=(const Angle& Angle); Angle& operator+=(const Angle& other);
Angle& operator-=(const Angle& Angle); Angle& operator-=(const Angle& other);
Angle& operator*=(T scalar); Angle& operator*=(T scalar);
Angle& operator/=(T divider); Angle& operator/=(T divider);
bool operator==(const Angle& Angle) const; bool operator==(const Angle& other) const;
bool operator!=(const Angle& Angle) const; bool operator!=(const Angle& other) const;
static Angle Zero(); static Angle Zero();

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

@ -147,11 +147,11 @@ namespace Nz
/*! /*!
* \brief Constructs an Angle object with an angle value * \brief Constructs an Angle object with an angle value
* *
* \param Angle value of the angle * \param value value of the angle
*/ */
template<AngleUnit Unit, typename T> template<AngleUnit Unit, typename T>
Angle<Unit, T>::Angle(T Angle) : Angle<Unit, T>::Angle(T value) :
angle(Angle) angle(value)
{ {
} }
@ -323,10 +323,10 @@ namespace Nz
* \brief Addition operator * \brief Addition operator
* \return Adds two angles together * \return Adds two angles together
* *
* \param angle Angle to add * \param other Angle to add
*/ */
template<AngleUnit Unit, typename T> template<AngleUnit Unit, typename T>
Angle<Unit, T> Angle<Unit, T>::operator+(const Angle& Angle) const Angle<Unit, T> Angle<Unit, T>::operator+(const Angle& other) const
{ {
return Angle(angle + Angle.angle); return Angle(angle + Angle.angle);
} }
@ -335,10 +335,10 @@ namespace Nz
* \brief Subtraction operator * \brief Subtraction operator
* \return Subtracts two angles together * \return Subtracts two angles together
* *
* \param angle Angle to subtract * \param other Angle to subtract
*/ */
template<AngleUnit Unit, typename T> template<AngleUnit Unit, typename T>
Angle<Unit, T> Angle<Unit, T>::operator-(const Angle& Angle) const Angle<Unit, T> Angle<Unit, T>::operator-(const Angle& other) const
{ {
return Angle(angle - Angle.angle); return Angle(angle - Angle.angle);
} }
@ -347,10 +347,10 @@ namespace Nz
* \brief Adds an angle by another * \brief Adds an angle by another
* \return A reference to the angle * \return A reference to the angle
* *
* \param angle Angle to add * \param other Angle to add
*/ */
template<AngleUnit Unit, typename T> template<AngleUnit Unit, typename T>
Angle<Unit, T>& Angle<Unit, T>::operator+=(const Angle& Angle) Angle<Unit, T>& Angle<Unit, T>::operator+=(const Angle& other)
{ {
angle += Angle.angle; angle += Angle.angle;
return *this; return *this;
@ -360,10 +360,10 @@ namespace Nz
* \brief Subtract an angle by another * \brief Subtract an angle by another
* \return A reference to the angle * \return A reference to the angle
* *
* \param angle Angle to subtract * \param other Angle to subtract
*/ */
template<AngleUnit Unit, typename T> template<AngleUnit Unit, typename T>
Angle<Unit, T>& Angle<Unit, T>::operator-=(const Angle& Angle) Angle<Unit, T>& Angle<Unit, T>::operator-=(const Angle& other)
{ {
angle -= Angle.angle; angle -= Angle.angle;
return *this; return *this;
@ -399,24 +399,24 @@ namespace Nz
* \brief Compares the angle to another for equality * \brief Compares the angle to another for equality
* \return True if both angles are equal * \return True if both angles are equal
* *
* \param Angle The other angle to compare to * \param other The other angle to compare to
*/ */
template<AngleUnit Unit, typename T> template<AngleUnit Unit, typename T>
bool Angle<Unit, T>::operator==(const Angle& Angle) const bool Angle<Unit, T>::operator==(const Angle& other) const
{ {
return NumberEquals(angle, Angle.angle, Detail::AngleUtils<Unit>::GetEpsilon<T>()); return NumberEquals(angle, other.angle, Detail::AngleUtils<Unit>::GetEpsilon<T>());
} }
/*! /*!
* \brief Compares the angle to another for inequality * \brief Compares the angle to another for inequality
* \return True if both angles are equal * \return True if both angles are equal
* *
* \param Angle The other angle to compare to * \param other The other angle to compare to
*/ */
template<AngleUnit Unit, typename T> template<AngleUnit Unit, typename T>
bool Angle<Unit, T>::operator!=(const Angle& Angle) const bool Angle<Unit, T>::operator!=(const Angle& other) const
{ {
return !NumberEquals(angle, Angle.angle, Detail::AngleUtils<Unit>::GetEpsilon<T>()); return !NumberEquals(angle, other.angle, Detail::AngleUtils<Unit>::GetEpsilon<T>());
} }
/*! /*!