Merge remote-tracking branch 'origin/master' into Resource-Update

Conflicts:
	include/Nazara/Audio/Music.hpp
	include/Nazara/Audio/SoundBuffer.hpp
	include/Nazara/Core/Resource.hpp
	include/Nazara/Core/ResourceListener.hpp
	include/Nazara/Graphics/Material.hpp
	include/Nazara/Renderer/Context.hpp
	include/Nazara/Renderer/RenderBuffer.hpp
	include/Nazara/Renderer/Shader.hpp
	include/Nazara/Renderer/Texture.hpp
	include/Nazara/Renderer/UberShader.hpp
	include/Nazara/Utility/Animation.hpp
	include/Nazara/Utility/Buffer.hpp
	include/Nazara/Utility/Image.hpp
	include/Nazara/Utility/IndexBuffer.hpp
	include/Nazara/Utility/Mesh.hpp
	include/Nazara/Utility/SkeletalMesh.hpp
	include/Nazara/Utility/Skeleton.hpp
	include/Nazara/Utility/StaticMesh.hpp
	include/Nazara/Utility/SubMesh.hpp
	include/Nazara/Utility/VertexBuffer.hpp
	include/Nazara/Utility/VertexDeclaration.hpp
	src/Nazara/Core/Resource.cpp
	src/Nazara/Core/ResourceListener.cpp
	src/Nazara/Graphics/DeferredRenderQueue.cpp
	src/Nazara/Graphics/ForwardRenderQueue.cpp
	src/Nazara/Graphics/SkinningManager.cpp
	src/Nazara/Renderer/RenderTexture.cpp
	src/Nazara/Renderer/Renderer.cpp
	src/Nazara/Utility/Mesh.cpp

Former-commit-id: 99b5ad26a19fe9c9f8118da7b5920bffe89f60f8

include/Nazara/Graphics/ParticleDeclaration.hpp

@@ -0,0 +1,70 @@
+// Copyright (C) 2015 Jérôme Leclercq
+// This file is part of the "Nazara Engine - Graphics module"
+// For conditions of distribution and use, see copyright notice in Config.hpp
+
+#pragma once
+
+#ifndef NAZARA_PARTICLEDECLARATION_HPP
+#define NAZARA_PARTICLEDECLARATION_HPP
+
+#include <Nazara/Prerequesites.hpp>
+#include <Nazara/Core/ObjectListenerWrapper.hpp>
+#include <Nazara/Core/ObjectRef.hpp>
+#include <Nazara/Core/RefCounted.hpp>
+#include <Nazara/Graphics/Enums.hpp>
+#include <Nazara/Utility/Enums.hpp>
+
+class NzParticleDeclaration;
+
+using NzParticleDeclarationConstListener = NzObjectListenerWrapper<const NzParticleDeclaration>;
+using NzParticleDeclarationConstRef = NzObjectRef<const NzParticleDeclaration>;
+using NzParticleDeclarationListener = NzObjectListenerWrapper<NzParticleDeclaration>;
+using NzParticleDeclarationRef = NzObjectRef<NzParticleDeclaration>;
+
+class NAZARA_API NzParticleDeclaration : public NzRefCounted
+{
+	friend class NzGraphics;
+
+	public:
+		NzParticleDeclaration();
+		NzParticleDeclaration(const NzParticleDeclaration& declaration);
+		~NzParticleDeclaration();
+
+		void DisableComponent(nzParticleComponent component);
+		void EnableComponent(nzParticleComponent component, nzComponentType type, unsigned int offset);
+
+		void GetComponent(nzParticleComponent component, bool* enabled, nzComponentType* type, unsigned int* offset) const;
+		unsigned int GetStride() const;
+
+		void SetStride(unsigned int stride);
+
+		NzParticleDeclaration& operator=(const NzParticleDeclaration& declaration);
+
+		static NzParticleDeclaration* Get(nzParticleLayout layout);
+		static bool IsTypeSupported(nzComponentType type);
+
+	private:
+		static bool Initialize();
+		static void Uninitialize();
+
+		struct Component
+		{
+			nzComponentType type;
+			bool enabled = false;
+			unsigned int offset;
+
+			/*
+			** -Lynix:
+			** Il serait aussi possible de préciser le stride de façon indépendante, ce que je ne permets pas
+			** pour décomplexifier l'interface en enlevant quelque chose que je juge inutile.
+			** Si vous pensez que ça peut être utile, n'hésitez pas à me le faire savoir !
+			*/
+		};
+
+		Component m_components[nzParticleComponent_Max+1];
+		unsigned int m_stride;
+
+		static NzParticleDeclaration s_declarations[nzParticleLayout_Max+1];
+};
+
+#endif // NAZARA_PARTICLEDECLARATION_HPP