Merge branch 'master' into reflection-mapping

include/Nazara/Graphics/AbstractRenderQueue.hpp

@@ -13,8 +13,6 @@
 #include <Nazara/Graphics/Config.hpp>
 #include <Nazara/Math/Box.hpp>
 #include <Nazara/Math/Matrix4.hpp>
-#include <Nazara/Utility/Enums.hpp>
-#include <Nazara/Utility/VertexStruct.hpp>
 #include <vector>
 
 namespace Nz
@@ -23,6 +21,7 @@ namespace Nz
 	class Material;
 	class Texture;
 	struct MeshData;
+	struct VertexStruct_XYZ_Color_UV;
 
 	class NAZARA_GRAPHICS_API AbstractRenderQueue
 	{

include/Nazara/Graphics/AbstractRenderTechnique.hpp

@@ -8,16 +8,13 @@
 #define NAZARA_ABSTRACTRENDERTECHNIQUE_HPP
 
 #include <Nazara/Prerequesites.hpp>
-#include <Nazara/Core/Color.hpp>
 #include <Nazara/Core/String.hpp>
-#include <Nazara/Graphics/AbstractRenderQueue.hpp>
+#include <Nazara/Graphics/Config.hpp>
 #include <Nazara/Graphics/Enums.hpp>
-#include <Nazara/Graphics/SceneData.hpp>
 
 namespace Nz
 {
-	class AbstractViewer;
-	class Background;
+	class AbstractRenderQueue;
 	struct SceneData;
 
 	class NAZARA_GRAPHICS_API AbstractRenderTechnique

include/Nazara/Graphics/ConfigCheck.hpp

@@ -12,7 +12,7 @@
 #include <type_traits>
 #define NazaraCheckTypeAndVal(name, type, op, val, err) static_assert(std::is_ ##type <decltype(name)>::value && name op val, #type err)
 
-// We fore the value of MANAGE_MEMORY in debug
+// We force the value of MANAGE_MEMORY in debug
 #if defined(NAZARA_DEBUG) && !NAZARA_GRAPHICS_MANAGE_MEMORY
 	#undef NAZARA_GRAPHICS_MANAGE_MEMORY
 	#define NAZARA_GRAPHICS_MANAGE_MEMORY 0

include/Nazara/Graphics/DeferredRenderPass.hpp

@@ -9,18 +9,14 @@
 
 #include <Nazara/Prerequesites.hpp>
 #include <Nazara/Graphics/Config.hpp>
-#include <Nazara/Graphics/Enums.hpp>
-#include <Nazara/Graphics/SceneData.hpp>
 #include <Nazara/Math/Vector2.hpp>
 
 namespace Nz
 {
-	class AbstractViewer;
 	class DeferredRenderTechnique;
 	class DeferredRenderQueue;
-	class RenderBuffer;
+	struct SceneData;
 	class RenderTexture;
-	class Scene;
 	class Texture;
 
 	class NAZARA_GRAPHICS_API DeferredRenderPass

include/Nazara/Graphics/DeferredRenderQueue.hpp

@@ -8,7 +8,6 @@
 #define NAZARA_DEFERREDRENDERQUEUE_HPP
 
 #include <Nazara/Prerequesites.hpp>
-#include <Nazara/Core/Color.hpp>
 #include <Nazara/Graphics/ForwardRenderQueue.hpp>
 #include <Nazara/Graphics/Material.hpp>
 #include <Nazara/Math/Box.hpp>
@@ -17,7 +16,6 @@
 #include <Nazara/Utility/MeshData.hpp>
 #include <Nazara/Utility/VertexBuffer.hpp>
 #include <map>
-#include <tuple>
 
 namespace Nz
 {

include/Nazara/Graphics/DeferredRenderTechnique.hpp

@@ -9,21 +9,18 @@
 
 #include <Nazara/Prerequesites.hpp>
 #include <Nazara/Graphics/AbstractRenderTechnique.hpp>
-#include <Nazara/Graphics/DeferredRenderPass.hpp>
 #include <Nazara/Graphics/DeferredRenderQueue.hpp>
 #include <Nazara/Graphics/ForwardRenderTechnique.hpp>
 #include <Nazara/Math/Vector2.hpp>
-#include <Nazara/Renderer/RenderBuffer.hpp>
-#include <Nazara/Renderer/RenderStates.hpp>
 #include <Nazara/Renderer/RenderTexture.hpp>
 #include <Nazara/Renderer/Texture.hpp>
-#include <Nazara/Renderer/TextureSampler.hpp>
-#include <Nazara/Utility/Mesh.hpp>
 #include <map>
 #include <memory>
 
 namespace Nz
 {
+	class DeferredRenderPass;
+
 	class NAZARA_GRAPHICS_API DeferredRenderTechnique : public AbstractRenderTechnique
 	{
 		friend class Graphics;

include/Nazara/Graphics/DepthRenderQueue.hpp

@@ -8,15 +8,9 @@
 #define NAZARA_DEPTHRENDERQUEUE_HPP
 
 #include <Nazara/Prerequesites.hpp>
-#include <Nazara/Core/Color.hpp>
-#include <Nazara/Graphics/AbstractRenderQueue.hpp>
 #include <Nazara/Graphics/ForwardRenderQueue.hpp>
 #include <Nazara/Math/Box.hpp>
 #include <Nazara/Math/Matrix4.hpp>
-#include <Nazara/Utility/IndexBuffer.hpp>
-#include <Nazara/Utility/VertexBuffer.hpp>
-#include <map>
-#include <tuple>
 
 namespace Nz
 {

include/Nazara/Graphics/DepthRenderTechnique.hpp

@@ -11,7 +11,6 @@
 #include <Nazara/Graphics/AbstractRenderTechnique.hpp>
 #include <Nazara/Graphics/Config.hpp>
 #include <Nazara/Graphics/DepthRenderQueue.hpp>
-#include <Nazara/Graphics/Light.hpp>
 #include <Nazara/Renderer/Shader.hpp>
 #include <Nazara/Utility/IndexBuffer.hpp>
 #include <Nazara/Utility/VertexBuffer.hpp>

include/Nazara/Graphics/ForwardRenderQueue.hpp

@@ -18,7 +18,6 @@
 #include <Nazara/Utility/MeshData.hpp>
 #include <Nazara/Utility/VertexBuffer.hpp>
 #include <map>
-#include <tuple>
 
 namespace Nz
 {

include/Nazara/Graphics/Graphics.hpp

@@ -8,7 +8,6 @@
 #define NAZARA_GRAPHICS_HPP
 
 #include <Nazara/Prerequesites.hpp>
-#include <Nazara/Core/Initializer.hpp>
 #include <Nazara/Graphics/Config.hpp>
 
 namespace Nz

include/Nazara/Graphics/InstancedRenderable.hpp

@@ -7,7 +7,6 @@
 #ifndef NAZARA_INSTANCEDRENDERABLE_HPP
 #define NAZARA_INSTANCEDRENDERABLE_HPP
 
-#include <Nazara/Core/PrimitiveList.hpp>
 #include <Nazara/Core/ObjectLibrary.hpp>
 #include <Nazara/Core/ObjectRef.hpp>
 #include <Nazara/Core/RefCounted.hpp>

include/Nazara/Graphics/Light.hpp

@@ -11,14 +11,10 @@
 #include <Nazara/Core/Color.hpp>
 #include <Nazara/Graphics/Enums.hpp>
 #include <Nazara/Graphics/Renderable.hpp>
-#include <Nazara/Renderer/RenderTexture.hpp>
 #include <Nazara/Renderer/Texture.hpp>
 
 namespace Nz
 {
-	class Light;
-	struct LightUniforms;
-
 	class NAZARA_GRAPHICS_API Light : public Renderable
 	{
 		public:

include/Nazara/Graphics/Light.inl

@@ -2,7 +2,7 @@
 // This file is part of the "Nazara Engine - Graphics module"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
-#include <memory>
+#include <Nazara/Utility/PixelFormat.hpp>
 #include <Nazara/Renderer/Debug.hpp>
 
 namespace Nz

include/Nazara/Graphics/Material.hpp

@@ -24,7 +24,6 @@
 #include <Nazara/Renderer/Texture.hpp>
 #include <Nazara/Renderer/TextureSampler.hpp>
 #include <Nazara/Renderer/UberShader.hpp>
-#include <Nazara/Utility/MaterialData.hpp>
 
 namespace Nz
 {

include/Nazara/Graphics/Material.inl

@@ -1465,4 +1465,3 @@ namespace Nz
 }
 
 #include <Nazara/Graphics/DebugOff.hpp>
-#include "Material.hpp"

include/Nazara/Graphics/MaterialPipeline.hpp

@@ -10,10 +10,8 @@
 #include <Nazara/Prerequesites.hpp>
 #include <Nazara/Graphics/Config.hpp>
 #include <Nazara/Graphics/Enums.hpp>
-#include <Nazara/Renderer/Enums.hpp>
 #include <Nazara/Renderer/RenderPipeline.hpp>
 #include <Nazara/Renderer/UberShader.hpp>
-#include <Nazara/Utility/Enums.hpp>
 #include <array>
 
 namespace Nz

include/Nazara/Graphics/MaterialPipeline.inl

@@ -2,9 +2,8 @@
 // This file is part of the "Nazara Engine - Graphics module"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
-#include <Nazara/Graphics/MaterialPipeline.hpp>
-#include <Nazara/Core/Algorithm.hpp>
 #include <Nazara/Renderer/Renderer.hpp>
+#include <Nazara/Renderer/UberShaderInstance.hpp>
 #include <functional>
 #include <Nazara/Graphics/Debug.hpp>
 

include/Nazara/Graphics/ParticleFunctionController.inl

@@ -2,7 +2,6 @@
 // This file is part of the "Nazara Engine - Graphics module"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
-#include <Nazara/Graphics/ParticleFunctionController.hpp>
 #include <memory>
 #include <Nazara/Graphics/Debug.hpp>
 

include/Nazara/Graphics/ParticleFunctionGenerator.inl

@@ -2,7 +2,6 @@
 // This file is part of the "Nazara Engine - Graphics module"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
-#include <Nazara/Graphics/ParticleFunctionGenerator.hpp>
 #include <memory>
 #include <Nazara/Graphics/Debug.hpp>
 

include/Nazara/Graphics/ParticleFunctionRenderer.inl

@@ -2,7 +2,6 @@
 // This file is part of the "Nazara Engine - Graphics module"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
-#include <Nazara/Graphics/ParticleFunctionRenderer.hpp>
 #include <memory>
 #include <Nazara/Graphics/Debug.hpp>
 

include/Nazara/Graphics/ParticleGroup.hpp

@@ -15,9 +15,7 @@
 #include <Nazara/Graphics/ParticleGenerator.hpp>
 #include <Nazara/Graphics/ParticleRenderer.hpp>
 #include <Nazara/Graphics/Renderable.hpp>
-#include <Nazara/Math/BoundingVolume.hpp>
 #include <functional>
-#include <memory>
 #include <set>
 #include <vector>
 

include/Nazara/Graphics/ParticleGroup.inl

@@ -2,8 +2,6 @@
 // This file is part of the "Nazara Engine - Graphics module"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
-#include <Nazara/Graphics/ParticleGroup.hpp>
-#include <Nazara/Core/Error.hpp>
 #include <Nazara/Graphics/Debug.hpp>
 
 namespace Nz

include/Nazara/Graphics/ParticleMapper.inl

@@ -1,9 +1,10 @@
-// Copyright (C) 2017 Jérôme Leclercq
+// Copyright (C) 2017 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
 
 #include <Nazara/Core/Error.hpp>
 #include <Nazara/Graphics/Debug.hpp>
+#include <Nazara/Utility/Algorithm.hpp>
 
 namespace Nz
 {
@@ -26,7 +27,7 @@ namespace Nz
 		std::size_t offset;
 		m_declaration->GetComponent(component, &enabled, &type, &offset);
 
-		if (enabled)
+		if (enabled && GetComponentTypeOf<T>() == type)
 		{
 			///TODO: Check the ratio between the type of the attribute and the template type ?
 			return SparsePtr<T>(m_ptr + offset, m_declaration->GetStride());
@@ -57,7 +58,7 @@ namespace Nz
 		std::size_t offset;
 		m_declaration->GetComponent(component, &enabled, &type, &offset);
 
-		if (enabled)
+		if (enabled && GetComponentTypeOf<T>() == type)
 		{
 			///TODO: Check the ratio between the type of the attribute and the template type ?
 			return SparsePtr<const T>(m_ptr + offset, m_declaration->GetStride());

include/Nazara/Graphics/SkeletalModel.hpp

@@ -12,9 +12,7 @@
 #include <Nazara/Core/Updatable.hpp>
 #include <Nazara/Graphics/Model.hpp>
 #include <Nazara/Utility/Animation.hpp>
-#include <Nazara/Utility/Buffer.hpp>
-#include <Nazara/Utility/VertexBuffer.hpp>
-#include <vector>
+#include <Nazara/Utility/Skeleton.hpp>
 
 namespace Nz
 {

include/Nazara/Graphics/SkyboxBackground.hpp

@@ -9,14 +9,12 @@
 
 #include <Nazara/Prerequesites.hpp>
 #include <Nazara/Graphics/AbstractBackground.hpp>
-#include <Nazara/Renderer/Shader.hpp>
 #include <Nazara/Renderer/Texture.hpp>
 #include <Nazara/Renderer/TextureSampler.hpp>
-#include <Nazara/Utility/IndexBuffer.hpp>
-#include <Nazara/Utility/VertexBuffer.hpp>
 
 namespace Nz
 {
+	class AbstractViewer;
 	class SkyboxBackground;
 
 	using SkyboxBackgroundConstRef = ObjectRef<const SkyboxBackground>;

include/Nazara/Graphics/Sprite.hpp

@@ -10,7 +10,6 @@
 #include <Nazara/Prerequesites.hpp>
 #include <Nazara/Graphics/InstancedRenderable.hpp>
 #include <Nazara/Graphics/Material.hpp>
-#include <Nazara/Utility/VertexStruct.hpp>
 #include <array>
 
 namespace Nz

include/Nazara/Graphics/TextSprite.hpp

@@ -11,13 +11,11 @@
 #include <Nazara/Graphics/Material.hpp>
 #include <Nazara/Graphics/InstancedRenderable.hpp>
 #include <Nazara/Utility/AbstractAtlas.hpp>
-#include <Nazara/Utility/AbstractTextDrawer.hpp>
 #include <Nazara/Utility/VertexStruct.hpp>
-#include <memory>
-#include <set>
 
 namespace Nz
 {
+	class AbstractTextDrawer;
 	class TextSprite;
 
 	using TextSpriteConstRef = ObjectRef<const TextSprite>;

include/Nazara/Graphics/TileMap.hpp

@@ -10,8 +10,6 @@
 #include <Nazara/Prerequesites.hpp>
 #include <Nazara/Graphics/InstancedRenderable.hpp>
 #include <Nazara/Graphics/Material.hpp>
-#include <Nazara/Utility/VertexStruct.hpp>
-#include <array>
 #include <set>
 
 namespace Nz

include/Nazara/Graphics/TileMap.inl

@@ -2,7 +2,6 @@
 // This file is part of the "Nazara Engine - Graphics module"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
-#include <Nazara/Graphics/TileMap.hpp>
 #include <Nazara/Core/Error.hpp>
 #include <memory>
 #include <Nazara/Graphics/Debug.hpp>