Merge remote-tracking branch 'upstream/master'

Conflicts:
	include/Nazara/Noise/NoiseMachine.hpp
	src/Nazara/Noise/ComplexNoiseBase.cpp
	src/Nazara/Noise/NoiseMachine.cpp

Former-commit-id: 54af2e19e336cfacee63cabe785d7b05fa392b53

include/Nazara/Noise/ComplexNoiseBase.hpp

@@ -1,5 +1,5 @@
-// Copyright (C) 2012 Rémi Bèges
-// This file is part of the "Nazara Engine".
+// Copyright (C) 2012 Rémi Bèges
+// This file is part of the "Nazara Engine - Noise module"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
 #pragma once

include/Nazara/Noise/Config.hpp

@@ -1,11 +1,7 @@
 /*
-	Nazara Engine
+	Nazara Engine - Noise module
 
-	Copyright (C) 2012 Jérôme "Lynix" Leclercq (Lynix680@gmail.com)
-
-	Nazara Engine - NzNoise Module
-
-	Copyright (C) 2012 Rémi "Overdrivr" Bèges (remi.beges@laposte.net)
+	Copyright (C) 2012 Rémi "Overdrivr" Bèges (remi.beges@laposte.net)
 
 	Permission is hereby granted, free of charge, to any person obtaining a copy of
 	this software and associated documentation files (the "Software"), to deal in
@@ -31,12 +27,12 @@
 #ifndef NAZARA_CONFIG_NOISE_HPP
 #define NAZARA_CONFIG_NOISE_HPP
 
-/// Chaque modification d'un paramètre du module nécessite une recompilation de celui-ci
+/// Chaque modification d'un paramètre du module nécessite une recompilation de celui-ci
 
-// Utilise un tracker pour repérer les éventuels leaks (Ralentit l'exécution)
+// Utilise un tracker pour repérer les éventuels leaks (Ralentit l'exécution)
 #define NAZARA_NOISE_MEMORYLEAKTRACKER 0
 
-// Active les tests de sécurité basés sur le code (Conseillé pour le développement)
+// Active les tests de sécurité basés sur le code (Conseillé pour le développement)
 #define NAZARA_NOISE_SAFE 1
 
 #endif // NAZARA_CONFIG_MODULENAME_HPP

include/Nazara/Noise/Debug.hpp

@@ -1,5 +1,5 @@
-// Copyright (C) 2012 Rémi "Overdrivr" Bèges (remi.beges@laposte.net)
-// This file is part of the "Nazara Engine".
+// Copyright (C) 2012 Rémi Bèges
+// This file is part of the "Nazara Engine - Noise module"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
 #include <Nazara/Noise/Config.hpp>

include/Nazara/Noise/DebugOff.hpp

@@ -1,5 +1,5 @@
-// Copyright (C) 2012 Rémi "Overdrivr" Bèges (remi.beges@laposte.net)
-// This file is part of the "Nazara Engine".
+// Copyright (C) 2012 Rémi Bèges
+// This file is part of the "Nazara Engine - Noise module"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
 #if NAZARA_NOISE_MEMORYLEAKTRACKER || defined(NAZARA_DEBUG)

include/Nazara/Noise/Noise.hpp

@@ -1,5 +1,5 @@
-// Copyright (C) 2012 Rémi Bèges
-// This file is part of the "Nazara Engine".
+// Copyright (C) 2012 Rémi Bèges
+// This file is part of the "Nazara Engine - Noise module"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
 #pragma once
@@ -8,20 +8,22 @@
 #define NAZARA_NOISE_HPP
 
 #include <Nazara/Prerequesites.hpp>
+#include <Nazara/Core/Initializer.hpp>
 
 class NAZARA_API NzNoise
 {
 	public:
-		NzNoise();
-		~NzNoise();
+		NzNoise() = delete;
+		~NzNoise() = delete;
 
-		bool Initialize();
-		void Uninitialize();
+		static bool Initialize();
 
 		static bool IsInitialized();
 
+		static void Uninitialize();
+
 	private:
-		static bool s_initialized;
+		static unsigned int s_moduleReferenceCouter;
 };
 
-#endif // NOISE_HPP
+#endif // NAZARA_NOISE_HPP

include/Nazara/Noise/NoiseBase.hpp

@@ -1,5 +1,5 @@
-// Copyright (C) 2012 Rémi Bèges
-// This file is part of the "Nazara Engine".
+// Copyright (C) 2012 Rémi Bèges
+// This file is part of the "Nazara Engine - Noise module"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
 #pragma once

include/Nazara/Noise/Perlin2D.hpp

@@ -1,5 +1,5 @@
-// Copyright (C) 2012 Rémi Bèges
-// This file is part of the "Nazara Engine".
+// Copyright (C) 2012 Rémi Bèges
+// This file is part of the "Nazara Engine - Noise module"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
 #pragma once

include/Nazara/Noise/Perlin2D.inl

@@ -1,5 +1,5 @@
-// Copyright (C) 2012 Rémi Bèges
-// This file is part of the "Nazara Engine".
+// Copyright (C) 2012 Rémi Bèges
+// This file is part of the "Nazara Engine - Noise module"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
 #include <Nazara/Core/Error.hpp>

include/Nazara/Noise/Perlin3D.hpp

@@ -1,5 +1,5 @@
-// Copyright (C) 2012 Rémi Bèges
-// This file is part of the "Nazara Engine".
+// Copyright (C) 2012 Rémi Bèges
+// This file is part of the "Nazara Engine - Noise module"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
 #pragma once

include/Nazara/Noise/Perlin3D.inl

@@ -1,5 +1,5 @@
-// Copyright (C) 2012 Rémi Bèges
-// This file is part of the "Nazara Engine".
+// Copyright (C) 2012 Rémi Bèges
+// This file is part of the "Nazara Engine - Noise module"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
 #include <Nazara/Core/Error.hpp>

include/Nazara/Noise/Perlin4D.hpp

@@ -1,5 +1,5 @@
-// Copyright (C) 2012 Rémi Bèges
-// This file is part of the "Nazara Engine".
+// Copyright (C) 2012 Rémi Bèges
+// This file is part of the "Nazara Engine - Noise module"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
 #pragma once

include/Nazara/Noise/Perlin4D.inl

@@ -1,5 +1,5 @@
-// Copyright (C) 2012 Rémi Bèges
-// This file is part of the "Nazara Engine".
+// Copyright (C) 2012 Rémi Bèges
+// This file is part of the "Nazara Engine - Noise module"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
 #include <Nazara/Core/Error.hpp>

include/Nazara/Noise/Simplex2D.hpp

@@ -1,5 +1,5 @@
-// Copyright (C) 2012 Rémi Bèges
-// This file is part of the "Nazara Engine".
+// Copyright (C) 2012 Rémi Bèges
+// This file is part of the "Nazara Engine - Noise module"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
 #pragma once

include/Nazara/Noise/Simplex2D.inl

@@ -1,5 +1,5 @@
-// Copyright (C) 2012 Rémi Bèges
-// This file is part of the "Nazara Engine".
+// Copyright (C) 2012 Rémi Bèges
+// This file is part of the "Nazara Engine - Noise module"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
 #include <Nazara/Core/Error.hpp>

include/Nazara/Noise/Simplex3D.hpp

@@ -1,5 +1,5 @@
-// Copyright (C) 2012 Rémi Bèges
-// This file is part of the "Nazara Engine".
+// Copyright (C) 2012 Rémi Bèges
+// This file is part of the "Nazara Engine - Noise module"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
 #pragma once

include/Nazara/Noise/Simplex3D.inl

@@ -1,5 +1,5 @@
-// Copyright (C) 2012 Rémi Bèges
-// This file is part of the "Nazara Engine".
+// Copyright (C) 2012 Rémi Bèges
+// This file is part of the "Nazara Engine - Noise module"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
 #include <Nazara/Core/Error.hpp>

include/Nazara/Noise/Simplex4D.hpp

@@ -1,5 +1,5 @@
-// Copyright (C) 2012 Rémi Bèges
-// This file is part of the "Nazara Engine".
+// Copyright (C) 2012 Rémi Bèges
+// This file is part of the "Nazara Engine - Noise module"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
 #pragma once

include/Nazara/Noise/Simplex4D.inl

@@ -1,5 +1,5 @@
-// Copyright (C) 2012 Rémi Bèges
-// This file is part of the "Nazara Engine".
+// Copyright (C) 2012 Rémi Bèges
+// This file is part of the "Nazara Engine - Noise module"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
 #include <Nazara/Core/Error.hpp>