Cleaned code

Former-commit-id: 65b235b0c8326e060ec7032bb2a153e22518a25a

include/Nazara/Math/Basic.hpp

@@ -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);

include/Nazara/Math/Basic.inl

@@ -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)

include/Nazara/Prerequesites.hpp

@@ -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

include/Nazara/Renderer/Context.hpp

@@ -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;
 };

src/Nazara/Audio/Loaders/sndfile/Loader.cpp

@@ -17,19 +17,19 @@ namespace
 {
 	sf_count_t GetSize(void* user_data)
 	{
-        NzInputStream* stream = reinterpret_cast<NzInputStream*>(user_data);
+        NzInputStream* stream = static_cast<NzInputStream*>(user_data);
 		return stream->GetSize();
 	}
 
     sf_count_t Read(void* ptr, sf_count_t count, void* user_data)
     {
-        NzInputStream* stream = reinterpret_cast<NzInputStream*>(user_data);
+        NzInputStream* stream = static_cast<NzInputStream*>(user_data);
         return stream->Read(ptr, count);
     }
 
     sf_count_t Seek(sf_count_t offset, int whence, void* user_data)
     {
-        NzInputStream* stream = reinterpret_cast<NzInputStream*>(user_data);
+        NzInputStream* stream = static_cast<NzInputStream*>(user_data);
         switch (whence)
         {
 			case SEEK_CUR:

src/Nazara/Core/Win32/FileImpl.cpp

@@ -1,4 +1,4 @@
-// Copyright (C) 2012 Jérôme Leclercq
+// Copyright (C) 2012 Jérôme Leclercq
 // This file is part of the "Nazara Engine - Core module"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
@@ -113,11 +113,11 @@ std::size_t NzFileImpl::Read(void* buffer, std::size_t size)
 		m_endOfFileUpdated = true;
 
 		return read;
-		///FIXME: D'après la documenation, read vaut 0 si ReadFile atteint la fin du fichier
+		///FIXME: D'après la documentation, read vaut 0 si ReadFile atteint la fin du fichier
-		///       D'après les tests, ce n'est pas le cas, la taille lue est inférieure à la taille en argument, mais pas nulle
+		///       D'après les tests, ce n'est pas le cas, la taille lue est inférieure à la taille en argument, mais pas nulle
-		///       Peut-être ais-je mal compris la documentation
+		///       Peut-être ais-je mal compris la documentation
-		///       Le correctif (dans le cas où la doc serait vraie) est commenté en début de fonction et après ce commentaire
+		///       Le correctif (dans le cas où la doc serait vraie) est commenté en début de fonction et après ce commentaire
-		///       Il est cependant plus lourd, et ne fonctionne pas avec le comportement observé de la fonction
+		///       Il est cependant plus lourd, et ne fonctionne pas avec le comportement observé de la fonction
 		/*
 		if (read == 0)
 		{

src/Nazara/Renderer/Context.cpp

@@ -37,27 +37,27 @@ namespace
 		ss << "\n-Source: ";
 		switch (source)
 		{
-			case GL_DEBUG_SOURCE_API_ARB:
+			case GL_DEBUG_SOURCE_API:
 				ss << "OpenGL";
 				break;
 
-			case GL_DEBUG_SOURCE_WINDOW_SYSTEM_ARB:
+			case GL_DEBUG_SOURCE_WINDOW_SYSTEM:
 				ss << "Operating system";
 				break;
 
-			case GL_DEBUG_SOURCE_SHADER_COMPILER_ARB:
+			case GL_DEBUG_SOURCE_SHADER_COMPILER:
 				ss << "Shader compiler";
 				break;
 
-			case GL_DEBUG_SOURCE_THIRD_PARTY_ARB:
+			case GL_DEBUG_SOURCE_THIRD_PARTY:
 				ss << "Shader compiler";
 				break;
 
-			case GL_DEBUG_SOURCE_APPLICATION_ARB:
+			case GL_DEBUG_SOURCE_APPLICATION:
 				ss << "Application";
 				break;
 
-			case GL_DEBUG_SOURCE_OTHER_ARB:
+			case GL_DEBUG_SOURCE_OTHER:
 				ss << "Other";
 				break;
 
@@ -71,27 +71,27 @@ namespace
 		ss << "-Type: ";
 		switch (type)
 		{
-			case GL_DEBUG_TYPE_ERROR_ARB:
+			case GL_DEBUG_TYPE_ERROR:
 				ss << "Error";
 				break;
 
-			case GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR_ARB:
+			case GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR:
 				ss << "Deprecated behavior";
 				break;
 
-			case GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR_ARB:
+			case GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR:
 				ss << "Undefined behavior";
 				break;
 
-			case GL_DEBUG_TYPE_PORTABILITY_ARB:
+			case GL_DEBUG_TYPE_PORTABILITY:
 				ss << "Portability";
 				break;
 
-			case GL_DEBUG_TYPE_PERFORMANCE_ARB:
+			case GL_DEBUG_TYPE_PERFORMANCE:
 				ss << "Performance";
 				break;
 
-			case GL_DEBUG_TYPE_OTHER_ARB:
+			case GL_DEBUG_TYPE_OTHER:
 				ss << "Other";
 				break;
 
@@ -105,15 +105,15 @@ namespace
 		ss << "-Severity: ";
 		switch (severity)
 		{
-			case GL_DEBUG_SEVERITY_HIGH_ARB:
+			case GL_DEBUG_SEVERITY_HIGH:
 				ss << "High";
 				break;
 
-			case GL_DEBUG_SEVERITY_MEDIUM_ARB:
+			case GL_DEBUG_SEVERITY_MEDIUM:
 				ss << "Medium";
 				break;
 
-			case GL_DEBUG_SEVERITY_LOW_ARB:
+			case GL_DEBUG_SEVERITY_LOW:
 				ss << "Low";
 				break;
 
@@ -130,11 +130,6 @@ namespace
 	}
 }
 
-NzContext::NzContext() :
-m_impl(nullptr)
-{
-}
-
 NzContext::~NzContext()
 {
 	Destroy();

src/Nazara/Renderer/Renderer.cpp

@@ -616,8 +616,13 @@ bool NzRenderer::SetTarget(NzRenderTarget* target)
 	if (s_target == target)
 		return true;
 
-	if (s_target && !s_target->HasContext())
+	if (s_target)
-		s_target->Desactivate();
+	{
+		if (!s_target->HasContext())
+			s_target->Desactivate();
+
+		s_target = nullptr;
+	}
 
 	if (target)
 	{
@@ -629,18 +634,14 @@ bool NzRenderer::SetTarget(NzRenderTarget* target)
 		}
 		#endif
 
-		if (target->Activate())
+		if (!target->Activate())
-			s_target = target;
-		else
 		{
 			NazaraError("Failed to activate target");
-			s_target = nullptr;
-
 			return false;
 		}
+
+		s_target = target;
 	}
-	else
-		s_target = nullptr;
 
 	return true;
 }

src/Nazara/Utility/Buffer.cpp

@@ -292,10 +292,9 @@ bool NzBuffer::SetStorage(nzBufferStorage storage)
 
 	m_impl->Unmap();
 	m_impl->Destroy();
-
 	delete m_impl;
-	m_impl = impl;
 
+	m_impl = impl;
 	m_storage = storage;
 
 	return true;