Cleaned code

Former-commit-id: 65b235b0c8326e060ec7032bb2a153e22518a25a
This commit is contained in:
Lynix
2012-10-04 09:32:55 +02:00
parent b219b19710
commit 7bab3d9443
9 changed files with 48 additions and 87 deletions

View File

@@ -24,12 +24,8 @@ template<typename T> T NzDegrees(T degrees);
template<typename T> T NzDegreeToRadian(T degrees);
inline unsigned int NzGetNumberLength(signed char number);
inline unsigned int NzGetNumberLength(unsigned char number);
inline unsigned int NzGetNumberLength(short number);
inline unsigned int NzGetNumberLength(unsigned short number);
inline unsigned int NzGetNumberLength(int number);
inline unsigned int NzGetNumberLength(unsigned int number);
inline unsigned int NzGetNumberLength(long number);
inline unsigned int NzGetNumberLength(unsigned long 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);

View File

@@ -52,9 +52,6 @@ T NzDegreeToRadian(T degrees)
unsigned int NzGetNumberLength(signed char number)
{
if (number == 0)
return 1;
// Le standard définit le char comme étant codé sur un octet
static_assert(sizeof(number) == 1, "Signed char must be one byte-sized");
@@ -62,15 +59,18 @@ unsigned int NzGetNumberLength(signed char number)
return 3;
else if (number >= 10)
return 2;
else
else if (number >= 0)
return 1;
else if (number > -10)
return 2;
else if (number > -100)
return 3;
else
return 4;
}
unsigned int NzGetNumberLength(unsigned char number)
{
if (number == 0)
return 1;
// Le standard définit le char comme étant codé sur un octet
static_assert(sizeof(number) == 1, "Signed char must be one byte-sized");
@@ -82,22 +82,6 @@ unsigned int NzGetNumberLength(unsigned char number)
return 1;
}
unsigned int NzGetNumberLength(short number)
{
if (number == 0)
return 1;
return static_cast<unsigned int>(std::log10(std::abs(number)))+(number < 0 ? 2 : 1);
}
unsigned int NzGetNumberLength(unsigned short number)
{
if (number == 0)
return 1;
return static_cast<unsigned int>(std::log10(number))+1;
}
unsigned int NzGetNumberLength(int number)
{
if (number == 0)
@@ -114,22 +98,6 @@ unsigned int NzGetNumberLength(unsigned int number)
return static_cast<unsigned int>(std::log10(number))+1;
}
unsigned int NzGetNumberLength(long number)
{
if (number == 0)
return 1;
return static_cast<unsigned int>(std::log10(std::abs(number)))+(number < 0 ? 2 : 1);
}
unsigned int NzGetNumberLength(unsigned long number)
{
if (number == 0)
return 1;
return static_cast<unsigned int>(std::log10(number))+1;
}
unsigned int NzGetNumberLength(long long number)
{
if (number == 0)

View File

@@ -63,6 +63,8 @@
#define NazaraUnused(a) (void) a
#if defined(_WIN32) || defined(__WIN32__)
#define NAZARA_PLATFORM_WINDOWS
#if !defined(NAZARA_STATIC)
#ifdef NAZARA_BUILD
#define NAZARA_API __declspec(dllexport)
@@ -72,7 +74,6 @@
#else
#define NAZARA_API
#endif
#define NAZARA_PLATFORM_WINDOWS
// Des defines pour le header Windows
#if defined(NAZARA_BUILD) // Pour ne pas entrer en conflit avec les defines de l'application ou d'une autre bibliothèque
@@ -102,13 +103,14 @@
#endif
#endif
#elif defined(__linux__) || defined(linux) || defined(__linux)
#define NAZARA_PLATFORM_LINUX
#define NAZARA_PLATFORM_POSIX
#if !defined(NAZARA_STATIC) && defined(NAZARA_COMPILER_GCC)
#define NAZARA_API __attribute__((visibility ("default")))
#else
#define NAZARA_API
#endif
#define NAZARA_PLATFORM_LINUX
#define NAZARA_PLATFORM_POSIX
/*#elif defined(__APPLE__) || defined(macintosh) || defined(Macintosh)
#define NAZARA_API
#define NAZARA_PLATFORM_MACOS

View File

@@ -39,7 +39,7 @@ class NAZARA_API NzContext : public NzResource
private:
NzContextParameters m_parameters;
NzContextImpl* m_impl;
NzContextImpl* m_impl = nullptr;
static NzContext* s_reference;
};