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

Renamed Degrees|Radians functions to From[Degrees|Radians]

Browse Source 
Also added To[Degrees|Radians] functions


Former-commit-id: b7445a42e5ee88319009db9d664d8d9f8fe88c18
This commit is contained in:
Lynix
2014-09-06 11:52:37 +02:00
parent 023e41512f
commit 68bd3304c6
5 changed files with 45 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
include/Nazara/Math/Algorithm.inl
View File

@@ -31,7 +31,13 @@ constexpr T NzClamp(T value, T min, T max)
}
template<typename T>
constexpr T NzDegrees(T degrees)
constexpr T NzDegreeToRadian(T degrees)
{
return degrees * F(M_PI/180.0);
}
template<typename T>
constexpr T NzFromDegrees(T degrees)
{
#if NAZARA_MATH_ANGLE_RADIAN
return NzDegreeToRadian(degrees);
@@ -41,9 +47,13 @@ constexpr T NzDegrees(T degrees)
}
template<typename T>
constexpr T NzDegreeToRadian(T degrees)
constexpr T NzFromRadians(T radians)
{
return degrees * F(M_PI/180.0);
#if NAZARA_MATH_ANGLE_RADIAN
return radians;
#else
return NzRadianToDegree(radians);
#endif
}
inline unsigned int NzGetNearestPowerOfTwo(unsigned int number)
@@ -51,7 +61,7 @@ inline unsigned int NzGetNearestPowerOfTwo(unsigned int number)
///TODO: Marquer comme constexpr en C++14
unsigned int x = 1;
// Tant que x est plus petit que n, on décale ses bits vers la gauche, ce qui revient à multiplier par deux
while(x <= number)
while (x <= number)
x <<= 1;
return x;
@@ -268,16 +278,6 @@ inline NzString NzNumberToString(long long number, nzUInt8 radix)
return str.Reversed();
}
template<typename T>
T NzRadians(T radians)
{
#if NAZARA_MATH_ANGLE_RADIAN
return radians;
#else
return NzRadianToDegree(radians);
#endif
}
template<typename T>
T NzRadianToDegree(T radians)
{
@@ -333,6 +333,26 @@ inline long long NzStringToNumber(NzString str, nzUInt8 radix, bool* ok)
return (negative) ? -static_cast<long long>(total) : total;
}
template<typename T>
constexpr T NzToDegrees(T angle)
{
#if NAZARA_MATH_ANGLE_RADIAN
return NzRadianToDegree(angle);
#else
return angle;
#endif
}
template<typename T>
constexpr T NzToRadians(T angle)
{
#if NAZARA_MATH_ANGLE_RADIAN
return angle;
#else
return NzDegreeToRadian(angle);
#endif
}
#undef F2
#undef F