From 910a79fc841efb876b9ff07f774c70b2800b121d Mon Sep 17 00:00:00 2001 From: Lynix Date: Wed, 5 Jun 2013 15:56:51 +0200 Subject: [PATCH] Cleaned interface Former-commit-id: b5f1871c164dd72098e389b76edf0994fb1fb124 --- include/Nazara/Math/Basic.hpp | 24 ++++++++++++------------ include/Nazara/Math/Basic.inl | 25 ++++++++++++------------- 2 files changed, 24 insertions(+), 25 deletions(-) diff --git a/include/Nazara/Math/Basic.hpp b/include/Nazara/Math/Basic.hpp index a8a6c98b0..bcdba87e8 100644 --- a/include/Nazara/Math/Basic.hpp +++ b/include/Nazara/Math/Basic.hpp @@ -23,23 +23,23 @@ template T NzApproach(T value, T objective, T increment); template T NzClamp(T value, T min, T max); template T NzDegrees(T degrees); template T NzDegreeToRadian(T degrees); -inline unsigned int NzIntegralPow(unsigned int base, unsigned int exponent); -inline unsigned int NzGetNumberLength(signed char number); -inline unsigned int NzGetNumberLength(unsigned char number); -inline unsigned int NzGetNumberLength(int number); -inline unsigned int NzGetNumberLength(unsigned int number); -inline unsigned int NzGetNumberLength(long long number); -inline unsigned int NzGetNumberLength(unsigned long long number); -inline unsigned int NzGetNumberLength(float number, nzUInt8 precision = NAZARA_CORE_REAL_PRECISION); -inline 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 NzIntegralPow(unsigned int base, unsigned int exponent); +unsigned int NzGetNumberLength(signed char number); +unsigned int NzGetNumberLength(unsigned char number); +unsigned int NzGetNumberLength(int number); +unsigned int NzGetNumberLength(unsigned int number); +unsigned int NzGetNumberLength(long long number); +unsigned int NzGetNumberLength(unsigned long long number); +unsigned int NzGetNumberLength(float number, nzUInt8 precision = NAZARA_CORE_REAL_PRECISION); +unsigned int NzGetNumberLength(double number, nzUInt8 precision = NAZARA_CORE_REAL_PRECISION); +unsigned int NzGetNumberLength(long double number, nzUInt8 precision = NAZARA_CORE_REAL_PRECISION); template T NzLerp(T from, T to, T2 interpolation); template T NzNormalizeAngle(T angle); template bool NzNumberEquals(T a, T b); -inline NzString NzNumberToString(long long number, nzUInt8 radix = 10); +NzString NzNumberToString(long long number, nzUInt8 radix = 10); template T NzRadians(T radians); template 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 diff --git a/include/Nazara/Math/Basic.inl b/include/Nazara/Math/Basic.inl index e5bcf4b22..a53c950c0 100644 --- a/include/Nazara/Math/Basic.inl +++ b/include/Nazara/Math/Basic.inl @@ -50,7 +50,7 @@ T NzDegreeToRadian(T degrees) 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; for (unsigned int i = 0; i < exponent; ++i) @@ -59,8 +59,7 @@ unsigned int NzIntegralPow(unsigned int base, unsigned int exponent) return r; } - -unsigned int NzGetNumberLength(signed char number) +inline unsigned int NzGetNumberLength(signed char number) { // Le standard définit le char comme étant codé sur un octet static_assert(sizeof(number) == 1, "Signed char must be one byte-sized"); @@ -79,7 +78,7 @@ unsigned int NzGetNumberLength(signed char number) 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 static_assert(sizeof(number) == 1, "Unsigned char must be one byte-sized"); @@ -92,7 +91,7 @@ unsigned int NzGetNumberLength(unsigned char number) return 1; } -unsigned int NzGetNumberLength(int number) +inline unsigned int NzGetNumberLength(int number) { if (number == 0) return 1; @@ -100,7 +99,7 @@ unsigned int NzGetNumberLength(int number) return static_cast(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) return 1; @@ -108,7 +107,7 @@ unsigned int NzGetNumberLength(unsigned int number) return static_cast(std::log10(number))+1; } -unsigned int NzGetNumberLength(long long number) +inline unsigned int NzGetNumberLength(long long number) { if (number == 0) return 1; @@ -116,7 +115,7 @@ unsigned int NzGetNumberLength(long long number) return static_cast(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) return 1; @@ -124,19 +123,19 @@ unsigned int NzGetNumberLength(unsigned long long number) return static_cast(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) return NzGetNumberLength(static_cast(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) return NzGetNumberLength(static_cast(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) return NzGetNumberLength(static_cast(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::epsilon(); } -NzString NzNumberToString(long long number, nzUInt8 radix) +inline NzString NzNumberToString(long long number, nzUInt8 radix) { #if NAZARA_MATH_SAFE if (radix < 2 || radix > 36) @@ -244,7 +243,7 @@ T NzRadianToDegree(T radians) 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 (radix < 2 || radix > 36)