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

Cleaned interface 

Former-commit-id: b5f1871c164dd72098e389b76edf0994fb1fb124
This commit is contained in:
Lynix 2013-06-05 15:56:51 +02:00
parent 146ca80a63
commit 910a79fc84
2 changed files with 24 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
include/Nazara/Math/Basic.hpp
View File

@ -23,23 +23,23 @@ template<typename T> T NzApproach(T value, T objective, T increment);
template<typename T> T NzClamp(T value, T min, T max); template<typename T> T NzClamp(T value, T min, T max);
template<typename T> T NzDegrees(T degrees); template<typename T> T NzDegrees(T degrees);
template<typename T> T NzDegreeToRadian(T degrees); template<typename T> T NzDegreeToRadian(T degrees);
inline unsigned int NzIntegralPow(unsigned int base, unsigned int exponent); unsigned int NzIntegralPow(unsigned int base, unsigned int exponent);
inline unsigned int NzGetNumberLength(signed char number); unsigned int NzGetNumberLength(signed char number);
inline unsigned int NzGetNumberLength(unsigned char number); unsigned int NzGetNumberLength(unsigned char number);
inline unsigned int NzGetNumberLength(int number); unsigned int NzGetNumberLength(int number);
inline unsigned int NzGetNumberLength(unsigned int number); unsigned int NzGetNumberLength(unsigned int number);
inline unsigned int NzGetNumberLength(long long number); unsigned int NzGetNumberLength(long long number);
inline unsigned int NzGetNumberLength(unsigned long long number); unsigned int NzGetNumberLength(unsigned long long number);
inline unsigned int NzGetNumberLength(float number, nzUInt8 precision = NAZARA_CORE_REAL_PRECISION); unsigned int NzGetNumberLength(float number, nzUInt8 precision = NAZARA_CORE_REAL_PRECISION);
inline unsigned int NzGetNumberLength(double number, nzUInt8 precision = NAZARA_CORE_REAL_PRECISION); unsigned int NzGetNumberLength(double number, nzUInt8 precision = NAZARA_CORE_REAL_PRECISION);
inline unsigned int NzGetNumberLength(long double number, nzUInt8 precision = NAZARA_CORE_REAL_PRECISION); unsigned int NzGetNumberLength(long double number, nzUInt8 precision = NAZARA_CORE_REAL_PRECISION);
template<typename T, typename T2> T NzLerp(T from, T to, T2 interpolation); template<typename T, typename T2> T NzLerp(T from, T to, T2 interpolation);
template<typename T> T NzNormalizeAngle(T angle); template<typename T> T NzNormalizeAngle(T angle);
template<typename T> bool NzNumberEquals(T a, T b); template<typename T> bool NzNumberEquals(T a, T b);
inline NzString NzNumberToString(long long number, nzUInt8 radix = 10); NzString NzNumberToString(long long number, nzUInt8 radix = 10);
template<typename T> T NzRadians(T radians); template<typename T> T NzRadians(T radians);
template<typename T> T NzRadianToDegree(T radians); template<typename T> T NzRadianToDegree(T radians);
inline long long NzStringToNumber(NzString str, nzUInt8 radix = 10, bool* ok = nullptr); long long NzStringToNumber(NzString str, nzUInt8 radix = 10, bool* ok = nullptr);
#include <Nazara/Math/Basic.inl> #include <Nazara/Math/Basic.inl>

25
include/Nazara/Math/Basic.inl
View File

@ -50,7 +50,7 @@ T NzDegreeToRadian(T degrees)
return degrees * F(M_PI/180.0); return degrees * F(M_PI/180.0);
} }
unsigned int NzIntegralPow(unsigned int base, unsigned int exponent) inline unsigned int NzIntegralPow(unsigned int base, unsigned int exponent)
{ {
unsigned int r = 1; unsigned int r = 1;
for (unsigned int i = 0; i < exponent; ++i) for (unsigned int i = 0; i < exponent; ++i)
@ -59,8 +59,7 @@ unsigned int NzIntegralPow(unsigned int base, unsigned int exponent)
return r; return r;
} }
inline unsigned int NzGetNumberLength(signed char number)
unsigned int NzGetNumberLength(signed char number)
{ {
// Le standard définit le char comme étant codé sur un octet // Le standard définit le char comme étant codé sur un octet
static_assert(sizeof(number) == 1, "Signed char must be one byte-sized"); static_assert(sizeof(number) == 1, "Signed char must be one byte-sized");
@ -79,7 +78,7 @@ unsigned int NzGetNumberLength(signed char number)
return 4; return 4;
} }
unsigned int NzGetNumberLength(unsigned char number) inline unsigned int NzGetNumberLength(unsigned char number)
{ {
// Le standard définit le char comme étant codé sur un octet // Le standard définit le char comme étant codé sur un octet
static_assert(sizeof(number) == 1, "Unsigned char must be one byte-sized"); static_assert(sizeof(number) == 1, "Unsigned char must be one byte-sized");
@ -92,7 +91,7 @@ unsigned int NzGetNumberLength(unsigned char number)
return 1; return 1;
} }
unsigned int NzGetNumberLength(int number) inline unsigned int NzGetNumberLength(int number)
{ {
if (number == 0) if (number == 0)
return 1; return 1;
@ -100,7 +99,7 @@ unsigned int NzGetNumberLength(int number)
return static_cast<unsigned int>(std::log10(std::abs(number)))+(number < 0 ? 2 : 1); return static_cast<unsigned int>(std::log10(std::abs(number)))+(number < 0 ? 2 : 1);
} }
unsigned int NzGetNumberLength(unsigned int number) inline unsigned int NzGetNumberLength(unsigned int number)
{ {
if (number == 0) if (number == 0)
return 1; return 1;
@ -108,7 +107,7 @@ unsigned int NzGetNumberLength(unsigned int number)
return static_cast<unsigned int>(std::log10(number))+1; return static_cast<unsigned int>(std::log10(number))+1;
} }
unsigned int NzGetNumberLength(long long number) inline unsigned int NzGetNumberLength(long long number)
{ {
if (number == 0) if (number == 0)
return 1; return 1;
@ -116,7 +115,7 @@ unsigned int NzGetNumberLength(long long number)
return static_cast<unsigned int>(std::log10(std::abs(number)))+(number < 0 ? 2 : 1); return static_cast<unsigned int>(std::log10(std::abs(number)))+(number < 0 ? 2 : 1);
} }
unsigned int NzGetNumberLength(unsigned long long number) inline unsigned int NzGetNumberLength(unsigned long long number)
{ {
if (number == 0) if (number == 0)
return 1; return 1;
@ -124,19 +123,19 @@ unsigned int NzGetNumberLength(unsigned long long number)
return static_cast<unsigned int>(std::log10(number))+1; return static_cast<unsigned int>(std::log10(number))+1;
} }
unsigned int NzGetNumberLength(float number, nzUInt8 precision) inline unsigned int NzGetNumberLength(float number, nzUInt8 precision)
{ {
// L'imprécision des flottants nécessite un cast (log10(9.99999) = 1) // L'imprécision des flottants nécessite un cast (log10(9.99999) = 1)
return NzGetNumberLength(static_cast<long long>(number)) + precision + 1; // Plus un pour le point return NzGetNumberLength(static_cast<long long>(number)) + precision + 1; // Plus un pour le point
} }
unsigned int NzGetNumberLength(double number, nzUInt8 precision) inline unsigned int NzGetNumberLength(double number, nzUInt8 precision)
{ {
// L'imprécision des flottants nécessite un cast (log10(9.99999) = 1) // L'imprécision des flottants nécessite un cast (log10(9.99999) = 1)
return NzGetNumberLength(static_cast<long long>(number)) + precision + 1; // Plus un pour le point return NzGetNumberLength(static_cast<long long>(number)) + precision + 1; // Plus un pour le point
} }
unsigned int NzGetNumberLength(long double number, nzUInt8 precision) inline unsigned int NzGetNumberLength(long double number, nzUInt8 precision)
{ {
// L'imprécision des flottants nécessite un cast (log10(9.99999) = 1) // L'imprécision des flottants nécessite un cast (log10(9.99999) = 1)
return NzGetNumberLength(static_cast<long long>(number)) + precision + 1; // Plus un pour le point return NzGetNumberLength(static_cast<long long>(number)) + precision + 1; // Plus un pour le point
@ -188,7 +187,7 @@ bool NzNumberEquals(T a, T b)
return std::fabs(a-b) < std::numeric_limits<T>::epsilon(); return std::fabs(a-b) < std::numeric_limits<T>::epsilon();
} }
NzString NzNumberToString(long long number, nzUInt8 radix) inline NzString NzNumberToString(long long number, nzUInt8 radix)
{ {
#if NAZARA_MATH_SAFE #if NAZARA_MATH_SAFE
if (radix < 2 || radix > 36) if (radix < 2 || radix > 36)
@ -244,7 +243,7 @@ T NzRadianToDegree(T radians)
return radians * F(180.0/M_PI); return radians * F(180.0/M_PI);
} }
long long NzStringToNumber(NzString str, nzUInt8 radix, bool* ok) inline long long NzStringToNumber(NzString str, nzUInt8 radix, bool* ok)
{ {
#if NAZARA_MATH_SAFE #if NAZARA_MATH_SAFE
if (radix < 2 || radix > 36) if (radix < 2 || radix > 36)