Merge branch 'master' into reflection-mapping

2017-10-02 21:11:15 +02:00
parent 9efcfb54ac 99d21b8722
commit c763dea4e1
518 changed files with 6740 additions and 2355 deletions
--- a/src/Nazara/Graphics/AbstractRenderTechnique.cpp
+++ b/src/Nazara/Graphics/AbstractRenderTechnique.cpp
@@ -3,9 +3,7 @@
 // For conditions of distribution and use, see copyright notice in Config.hpp

 #include <Nazara/Graphics/AbstractRenderTechnique.hpp>
-#include <Nazara/Core/Error.hpp>
 #include <Nazara/Graphics/RenderTechniques.hpp>
-#include <Nazara/Renderer/Renderer.hpp>
 #include <Nazara/Graphics/Debug.hpp>

 namespace Nz
--- a/src/Nazara/Graphics/Billboard.cpp
+++ b/src/Nazara/Graphics/Billboard.cpp
@@ -4,10 +4,6 @@

 #include <Nazara/Graphics/Billboard.hpp>
 #include <Nazara/Graphics/AbstractRenderQueue.hpp>
-#include <Nazara/Graphics/AbstractViewer.hpp>
-#include <Nazara/Math/Algorithm.hpp>
-#include <cstring>
-#include <memory>
 #include <Nazara/Graphics/Debug.hpp>

 namespace Nz
--- a/src/Nazara/Graphics/ColorBackground.cpp
+++ b/src/Nazara/Graphics/ColorBackground.cpp
@@ -3,8 +3,10 @@
 // For conditions of distribution and use, see copyright notice in Config.hpp

 #include <Nazara/Graphics/ColorBackground.hpp>
+#include <Nazara/Core/ParameterList.hpp>
 #include <Nazara/Renderer/Renderer.hpp>
-#include <memory>
+#include <Nazara/Renderer/RenderStates.hpp>
+#include <Nazara/Renderer/UberShaderInstance.hpp>
 #include <Nazara/Graphics/Debug.hpp>

 namespace Nz
--- a/src/Nazara/Graphics/DeferredBloomPass.cpp
+++ b/src/Nazara/Graphics/DeferredBloomPass.cpp
@@ -4,7 +4,6 @@

 #include <Nazara/Graphics/DeferredBloomPass.hpp>
 #include <Nazara/Renderer/Renderer.hpp>
-#include <memory>
 #include <Nazara/Graphics/Debug.hpp>

 namespace Nz
--- a/src/Nazara/Graphics/DeferredDOFPass.cpp
+++ b/src/Nazara/Graphics/DeferredDOFPass.cpp
@@ -3,10 +3,8 @@
 // For conditions of distribution and use, see copyright notice in Config.hpp

 #include <Nazara/Graphics/DeferredDOFPass.hpp>
-#include <Nazara/Graphics/AbstractViewer.hpp>
 #include <Nazara/Renderer/Renderer.hpp>
 #include <Nazara/Renderer/RenderTexture.hpp>
-#include <memory>
 #include <Nazara/Graphics/Debug.hpp>

 namespace Nz
--- a/src/Nazara/Graphics/DeferredFXAAPass.cpp
+++ b/src/Nazara/Graphics/DeferredFXAAPass.cpp
@@ -5,7 +5,7 @@
 #include <Nazara/Graphics/DeferredFXAAPass.hpp>
 #include <Nazara/Renderer/Renderer.hpp>
 #include <Nazara/Renderer/RenderTexture.hpp>
-#include <memory>
+#include <Nazara/Renderer/UberShaderInstance.hpp>
 #include <Nazara/Graphics/Debug.hpp>

 namespace Nz
--- a/src/Nazara/Graphics/DeferredFinalPass.cpp
+++ b/src/Nazara/Graphics/DeferredFinalPass.cpp
@@ -3,9 +3,12 @@
 // For conditions of distribution and use, see copyright notice in Config.hpp

 #include <Nazara/Graphics/DeferredFinalPass.hpp>
+#include <Nazara/Core/ParameterList.hpp>
 #include <Nazara/Graphics/AbstractViewer.hpp>
+#include <Nazara/Graphics/SceneData.hpp>
 #include <Nazara/Renderer/Renderer.hpp>
-#include <memory>
+#include <Nazara/Renderer/Shader.hpp>
+#include <Nazara/Renderer/UberShaderInstance.hpp>
 #include <Nazara/Graphics/Debug.hpp>

 namespace Nz
--- a/src/Nazara/Graphics/DeferredFogPass.cpp
+++ b/src/Nazara/Graphics/DeferredFogPass.cpp
@@ -4,9 +4,9 @@

 #include <Nazara/Graphics/DeferredFogPass.hpp>
 #include <Nazara/Graphics/AbstractViewer.hpp>
+#include <Nazara/Graphics/SceneData.hpp>
 #include <Nazara/Renderer/Renderer.hpp>
 #include <Nazara/Renderer/RenderTexture.hpp>
-#include <memory>
 #include <Nazara/Graphics/Debug.hpp>

 namespace Nz
--- a/src/Nazara/Graphics/DeferredForwardPass.cpp
+++ b/src/Nazara/Graphics/DeferredForwardPass.cpp
@@ -6,6 +6,7 @@
 #include <Nazara/Core/Error.hpp>
 #include <Nazara/Graphics/AbstractBackground.hpp>
 #include <Nazara/Graphics/AbstractViewer.hpp>
+#include <Nazara/Graphics/SceneData.hpp>
 #include <Nazara/Graphics/DeferredRenderTechnique.hpp>
 #include <Nazara/Graphics/ForwardRenderTechnique.hpp>
 #include <Nazara/Renderer/Renderer.hpp>
--- a/src/Nazara/Graphics/DeferredGeometryPass.cpp
+++ b/src/Nazara/Graphics/DeferredGeometryPass.cpp
@@ -8,12 +8,9 @@
 #include <Nazara/Graphics/AbstractViewer.hpp>
 #include <Nazara/Graphics/DeferredRenderTechnique.hpp>
 #include <Nazara/Graphics/Material.hpp>
+#include <Nazara/Graphics/SceneData.hpp>
 #include <Nazara/Renderer/Renderer.hpp>
 #include <Nazara/Renderer/RenderTexture.hpp>
-#include <Nazara/Utility/BufferMapper.hpp>
-#include <Nazara/Utility/StaticMesh.hpp>
-#include <Nazara/Utility/VertexStruct.hpp>
-#include <memory>
 #include <Nazara/Graphics/Debug.hpp>

 namespace Nz
--- a/src/Nazara/Graphics/DeferredPhongLightingPass.cpp
+++ b/src/Nazara/Graphics/DeferredPhongLightingPass.cpp
@@ -3,12 +3,13 @@
 // For conditions of distribution and use, see copyright notice in Config.hpp

 #include <Nazara/Graphics/DeferredPhongLightingPass.hpp>
+#include <Nazara/Core/Primitive.hpp>
 #include <Nazara/Graphics/AbstractViewer.hpp>
 #include <Nazara/Graphics/DeferredRenderQueue.hpp>
+#include <Nazara/Graphics/SceneData.hpp>
 #include <Nazara/Renderer/Renderer.hpp>
 #include <Nazara/Renderer/RenderTexture.hpp>
 #include <Nazara/Utility/StaticMesh.hpp>
-#include <memory>
 #include <Nazara/Graphics/Debug.hpp>

 namespace Nz
--- a/src/Nazara/Graphics/DeferredRenderPass.cpp
+++ b/src/Nazara/Graphics/DeferredRenderPass.cpp
@@ -3,8 +3,9 @@
 // For conditions of distribution and use, see copyright notice in Config.hpp

 #include <Nazara/Graphics/DeferredRenderPass.hpp>
-#include <Nazara/Core/Error.hpp>
 #include <Nazara/Graphics/DeferredRenderTechnique.hpp>
+#include <Nazara/Graphics/DeferredRenderQueue.hpp>
+#include <Nazara/Math/Vector2.hpp>
 #include <Nazara/Graphics/Debug.hpp>

 namespace Nz
--- a/src/Nazara/Graphics/DeferredRenderQueue.cpp
+++ b/src/Nazara/Graphics/DeferredRenderQueue.cpp
@@ -3,9 +3,7 @@
 // For conditions of distribution and use, see copyright notice in Config.hpp

 #include <Nazara/Graphics/DeferredRenderQueue.hpp>
-#include <Nazara/Graphics/AbstractViewer.hpp>
 #include <Nazara/Graphics/ForwardRenderQueue.hpp>
-#include <Nazara/Graphics/Light.hpp>
 #include <Nazara/Graphics/Debug.hpp>

 ///TODO: Render billboards using Deferred Shading if possible
--- a/src/Nazara/Graphics/DeferredRenderTechnique.cpp
+++ b/src/Nazara/Graphics/DeferredRenderTechnique.cpp
@@ -8,7 +8,6 @@

 #include <Nazara/Graphics/DeferredRenderTechnique.hpp>
 #include <Nazara/Core/ErrorFlags.hpp>
-#include <Nazara/Graphics/AbstractBackground.hpp>
 #include <Nazara/Graphics/AbstractViewer.hpp>
 #include <Nazara/Graphics/DeferredBloomPass.hpp>
 #include <Nazara/Graphics/DeferredDOFPass.hpp>
@@ -18,18 +17,13 @@
 #include <Nazara/Graphics/DeferredFXAAPass.hpp>
 #include <Nazara/Graphics/DeferredGeometryPass.hpp>
 #include <Nazara/Graphics/DeferredPhongLightingPass.hpp>
-#include <Nazara/Graphics/Drawable.hpp>
-#include <Nazara/Graphics/Light.hpp>
-#include <Nazara/Graphics/Material.hpp>
-#include <Nazara/Graphics/Sprite.hpp>
+#include <Nazara/Graphics/SceneData.hpp>
 #include <Nazara/Renderer/Config.hpp>
 #include <Nazara/Renderer/OpenGL.hpp>
 #include <Nazara/Renderer/Renderer.hpp>
 #include <Nazara/Renderer/Shader.hpp>
 #include <Nazara/Renderer/ShaderStage.hpp>
-#include <limits>
 #include <memory>
-#include <random>
 #include <Nazara/Graphics/Debug.hpp>

 namespace Nz
--- a/src/Nazara/Graphics/DepthRenderQueue.cpp
+++ b/src/Nazara/Graphics/DepthRenderQueue.cpp
@@ -5,6 +5,7 @@
 #include <Nazara/Graphics/DepthRenderQueue.hpp>
 #include <Nazara/Graphics/AbstractViewer.hpp>
 #include <Nazara/Graphics/Material.hpp>
+#include <Nazara/Graphics/SceneData.hpp>
 #include <Nazara/Graphics/Debug.hpp>

 namespace Nz
--- a/src/Nazara/Graphics/DepthRenderTechnique.cpp
+++ b/src/Nazara/Graphics/DepthRenderTechnique.cpp
@@ -5,19 +5,14 @@
 #include <Nazara/Graphics/DepthRenderTechnique.hpp>
 #include <Nazara/Core/ErrorFlags.hpp>
 #include <Nazara/Core/OffsetOf.hpp>
-#include <Nazara/Graphics/AbstractBackground.hpp>
-#include <Nazara/Graphics/AbstractViewer.hpp>
 #include <Nazara/Graphics/Drawable.hpp>
-#include <Nazara/Graphics/Light.hpp>
 #include <Nazara/Graphics/Material.hpp>
-#include <Nazara/Graphics/Sprite.hpp>
+#include <Nazara/Graphics/SceneData.hpp>
 #include <Nazara/Renderer/Config.hpp>
 #include <Nazara/Renderer/Renderer.hpp>
 #include <Nazara/Utility/BufferMapper.hpp>
-#include <Nazara/Utility/StaticMesh.hpp>
 #include <Nazara/Utility/VertexStruct.hpp>
 #include <limits>
-#include <memory>
 #include <Nazara/Graphics/Debug.hpp>

 namespace Nz
--- a/src/Nazara/Graphics/Formats/MeshLoader.cpp
+++ b/src/Nazara/Graphics/Formats/MeshLoader.cpp
@@ -3,13 +3,11 @@
 // For conditions of distribution and use, see copyright notice in Config.hpp

 #include <Nazara/Graphics/Formats/MeshLoader.hpp>
-#include <Nazara/Core/ErrorFlags.hpp>
 #include <Nazara/Graphics/Material.hpp>
 #include <Nazara/Graphics/Model.hpp>
 #include <Nazara/Graphics/SkeletalModel.hpp>
 #include <Nazara/Utility/MaterialData.hpp>
 #include <Nazara/Utility/Mesh.hpp>
-#include <memory>
 #include <Nazara/Graphics/Debug.hpp>

 namespace Nz
--- a/src/Nazara/Graphics/Formats/TextureLoader.cpp
+++ b/src/Nazara/Graphics/Formats/TextureLoader.cpp
@@ -5,7 +5,6 @@
 #include <Nazara/Graphics/Formats/TextureLoader.hpp>
 #include <Nazara/Graphics/Material.hpp>
 #include <Nazara/Renderer/Texture.hpp>
-#include <memory>
 #include <Nazara/Graphics/Debug.hpp>

 namespace Nz
--- a/src/Nazara/Graphics/ForwardRenderQueue.cpp
+++ b/src/Nazara/Graphics/ForwardRenderQueue.cpp
@@ -4,7 +4,7 @@

 #include <Nazara/Graphics/ForwardRenderQueue.hpp>
 #include <Nazara/Graphics/AbstractViewer.hpp>
-#include <Nazara/Graphics/Light.hpp>
+#include <Nazara/Utility/VertexStruct.hpp>
 #include <Nazara/Graphics/Debug.hpp>

 ///TODO: Replace sinus/cosinus by a lookup table (which will lead to a speed up about 10x)
@@ -697,7 +697,7 @@ namespace Nz
 		auto it = layers.find(i);
 		if (it == layers.end())
 			it = layers.insert(std::make_pair(i, Layer())).first;
-		
+
 		Layer& layer = it->second;
 		layer.clearCount = 0;

@@ -729,7 +729,6 @@ namespace Nz
 	void ForwardRenderQueue::SortForOrthographic(const AbstractViewer * viewer)
 	{
 		Planef nearPlane = viewer->GetFrustum().GetPlane(FrustumPlane_Near);
-		Vector3f viewerPos = viewer->GetEyePosition();

 		for (auto& pair : layers)
 		{
--- a/src/Nazara/Graphics/ForwardRenderTechnique.cpp
+++ b/src/Nazara/Graphics/ForwardRenderTechnique.cpp
@@ -10,14 +10,12 @@
 #include <Nazara/Graphics/Drawable.hpp>
 #include <Nazara/Graphics/Light.hpp>
 #include <Nazara/Graphics/Material.hpp>
-#include <Nazara/Graphics/Sprite.hpp>
+#include <Nazara/Graphics/SceneData.hpp>
 #include <Nazara/Renderer/Config.hpp>
 #include <Nazara/Renderer/Renderer.hpp>
 #include <Nazara/Utility/BufferMapper.hpp>
-#include <Nazara/Utility/StaticMesh.hpp>
 #include <Nazara/Utility/VertexStruct.hpp>
 #include <limits>
-#include <memory>
 #include <Nazara/Graphics/Debug.hpp>

 namespace Nz
--- a/src/Nazara/Graphics/Graphics.cpp
+++ b/src/Nazara/Graphics/Graphics.cpp
@@ -173,7 +173,7 @@ namespace Nz
 	}

 	/*!
-	* \brief Uninitializes the Core module
+	* \brief Uninitializes the Graphics module
 	*
 	* \remark Produces a NazaraNotice
 	*/
--- a/src/Nazara/Graphics/GuillotineTextureAtlas.cpp
+++ b/src/Nazara/Graphics/GuillotineTextureAtlas.cpp
@@ -3,7 +3,6 @@
 // For conditions of distribution and use, see copyright notice in Config.hpp

 #include <Nazara/Graphics/GuillotineTextureAtlas.hpp>
-#include <Nazara/Renderer/Renderer.hpp>
 #include <Nazara/Renderer/Texture.hpp>
 #include <Nazara/Graphics/Debug.hpp>

--- a/src/Nazara/Graphics/Light.cpp
+++ b/src/Nazara/Graphics/Light.cpp
@@ -8,9 +8,6 @@
 #include <Nazara/Graphics/Enums.hpp>
 #include <Nazara/Math/Algorithm.hpp>
 #include <Nazara/Math/Sphere.hpp>
-#include <Nazara/Renderer/Renderer.hpp>
-#include <Nazara/Renderer/Shader.hpp>
-#include <cstring>
 #include <Nazara/Graphics/Debug.hpp>

 ///TODO: Use of UBOs
--- a/src/Nazara/Graphics/Material.cpp
+++ b/src/Nazara/Graphics/Material.cpp
@@ -5,8 +5,7 @@
 #include <Nazara/Graphics/Material.hpp>
 #include <Nazara/Core/ErrorFlags.hpp>
 #include <Nazara/Renderer/Renderer.hpp>
-#include <cstring>
-#include <memory>
+#include <Nazara/Utility/MaterialData.hpp>
 #include <Nazara/Graphics/Debug.hpp>

 namespace Nz
--- a/src/Nazara/Graphics/ParticleDeclaration.cpp
+++ b/src/Nazara/Graphics/ParticleDeclaration.cpp
@@ -1,4 +1,4 @@
-// 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

@@ -10,7 +10,6 @@
 #include <Nazara/Graphics/Enums.hpp>
 #include <Nazara/Graphics/ParticleStruct.hpp>
 #include <Nazara/Utility/Utility.hpp>
-#include <cstring>
 #include <Nazara/Graphics/Debug.hpp>

 namespace Nz
@@ -287,7 +286,7 @@ namespace Nz
 			// ParticleLayout_Billboard : ParticleStruct_Billboard
 			declaration = &s_declarations[ParticleLayout_Billboard];
 			declaration->EnableComponent(ParticleComponent_Color,    ComponentType_Color,  NazaraOffsetOf(ParticleStruct_Billboard, color));
-			declaration->EnableComponent(ParticleComponent_Life,     ComponentType_Int1,   NazaraOffsetOf(ParticleStruct_Billboard, life));
+			declaration->EnableComponent(ParticleComponent_Life,     ComponentType_Float1, NazaraOffsetOf(ParticleStruct_Billboard, life));
 			declaration->EnableComponent(ParticleComponent_Normal,   ComponentType_Float3, NazaraOffsetOf(ParticleStruct_Billboard, normal));
 			declaration->EnableComponent(ParticleComponent_Position, ComponentType_Float3, NazaraOffsetOf(ParticleStruct_Billboard, position));
 			declaration->EnableComponent(ParticleComponent_Rotation, ComponentType_Float1, NazaraOffsetOf(ParticleStruct_Billboard, rotation));
@@ -298,7 +297,7 @@ namespace Nz

 			// ParticleLayout_Model : ParticleStruct_Model
 			declaration = &s_declarations[ParticleLayout_Model];
-			declaration->EnableComponent(ParticleComponent_Life,     ComponentType_Int1,       NazaraOffsetOf(ParticleStruct_Model, life));
+			declaration->EnableComponent(ParticleComponent_Life,     ComponentType_Float1,     NazaraOffsetOf(ParticleStruct_Model, life));
 			declaration->EnableComponent(ParticleComponent_Position, ComponentType_Float3,     NazaraOffsetOf(ParticleStruct_Model, position));
 			declaration->EnableComponent(ParticleComponent_Rotation, ComponentType_Quaternion, NazaraOffsetOf(ParticleStruct_Model, rotation));
 			declaration->EnableComponent(ParticleComponent_Velocity, ComponentType_Float3,     NazaraOffsetOf(ParticleStruct_Model, velocity));
@@ -308,7 +307,7 @@ namespace Nz
 			// ParticleLayout_Sprite : ParticleStruct_Sprite
 			declaration = &s_declarations[ParticleLayout_Sprite];
 			declaration->EnableComponent(ParticleComponent_Color,    ComponentType_Color,  NazaraOffsetOf(ParticleStruct_Sprite, color));
-			declaration->EnableComponent(ParticleComponent_Life,     ComponentType_Int1,   NazaraOffsetOf(ParticleStruct_Sprite, life));
+			declaration->EnableComponent(ParticleComponent_Life,     ComponentType_Float1, NazaraOffsetOf(ParticleStruct_Sprite, life));
 			declaration->EnableComponent(ParticleComponent_Position, ComponentType_Float3, NazaraOffsetOf(ParticleStruct_Sprite, position));
 			declaration->EnableComponent(ParticleComponent_Rotation, ComponentType_Float1, NazaraOffsetOf(ParticleStruct_Sprite, rotation));
 			declaration->EnableComponent(ParticleComponent_Velocity, ComponentType_Float3, NazaraOffsetOf(ParticleStruct_Sprite, velocity));
--- a/src/Nazara/Graphics/ParticleEmitter.cpp
+++ b/src/Nazara/Graphics/ParticleEmitter.cpp
@@ -3,13 +3,8 @@
 // For conditions of distribution and use, see copyright notice in Config.hpp

 #include <Nazara/Graphics/ParticleEmitter.hpp>
-#include <Nazara/Core/CallOnExit.hpp>
-#include <Nazara/Core/ErrorFlags.hpp>
-#include <Nazara/Core/StringStream.hpp>
 #include <Nazara/Graphics/ParticleMapper.hpp>
 #include <Nazara/Graphics/ParticleGroup.hpp>
-#include <cstdlib>
-#include <memory>
 #include <Nazara/Graphics/Debug.hpp>

 namespace Nz
--- a/src/Nazara/Graphics/ParticleGroup.cpp
+++ b/src/Nazara/Graphics/ParticleGroup.cpp
@@ -7,8 +7,6 @@
 #include <Nazara/Core/ErrorFlags.hpp>
 #include <Nazara/Core/StringStream.hpp>
 #include <Nazara/Graphics/ParticleMapper.hpp>
-#include <cstdlib>
-#include <memory>
 #include <Nazara/Graphics/Debug.hpp>

 namespace Nz
--- a/src/Nazara/Graphics/ParticleMapper.cpp
+++ b/src/Nazara/Graphics/ParticleMapper.cpp
@@ -3,7 +3,6 @@
 // For conditions of distribution and use, see copyright notice in Config.hpp

 #include <Nazara/Graphics/ParticleMapper.hpp>
-#include <Nazara/Core/ErrorFlags.hpp>
 #include <Nazara/Graphics/Debug.hpp>

 namespace Nz
--- a/src/Nazara/Graphics/SkeletalModel.cpp
+++ b/src/Nazara/Graphics/SkeletalModel.cpp
@@ -6,8 +6,8 @@
 #include <Nazara/Graphics/AbstractRenderQueue.hpp>
 #include <Nazara/Graphics/Config.hpp>
 #include <Nazara/Graphics/SkinningManager.hpp>
-#include <Nazara/Utility/BufferMapper.hpp>
 #include <Nazara/Utility/MeshData.hpp>
+#include <Nazara/Utility/Sequence.hpp>
 #include <Nazara/Utility/SkeletalMesh.hpp>
 #include <memory>
 #include <Nazara/Graphics/Debug.hpp>
--- a/src/Nazara/Graphics/SkinningManager.cpp
+++ b/src/Nazara/Graphics/SkinningManager.cpp
@@ -1,4 +1,4 @@
-// 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

@@ -6,10 +6,11 @@
 #include <Nazara/Core/ErrorFlags.hpp>
 #include <Nazara/Core/TaskScheduler.hpp>
 #include <Nazara/Utility/Algorithm.hpp>
+#include <Nazara/Utility/Joint.hpp>
+#include <Nazara/Utility/Skeleton.hpp>
 #include <Nazara/Utility/SkeletalMesh.hpp>
+#include <Nazara/Utility/Skeleton.hpp>
 #include <Nazara/Utility/VertexBuffer.hpp>
-#include <Nazara/Utility/VertexMapper.hpp>
-#include <memory>
 #include <unordered_map>
 #include <Nazara/Graphics/Debug.hpp>

--- a/src/Nazara/Graphics/SkyboxBackground.cpp
+++ b/src/Nazara/Graphics/SkyboxBackground.cpp
@@ -6,10 +6,11 @@
 #include <Nazara/Core/ErrorFlags.hpp>
 #include <Nazara/Graphics/AbstractViewer.hpp>
 #include <Nazara/Renderer/Renderer.hpp>
+#include <Nazara/Renderer/RenderStates.hpp>
+#include <Nazara/Renderer/Shader.hpp>
 #include <Nazara/Utility/IndexBuffer.hpp>
 #include <Nazara/Utility/VertexBuffer.hpp>
 #include <Nazara/Utility/VertexDeclaration.hpp>
-#include <memory>
 #include <Nazara/Graphics/Debug.hpp>

 namespace Nz
--- a/src/Nazara/Graphics/Sprite.cpp
+++ b/src/Nazara/Graphics/Sprite.cpp
@@ -4,9 +4,7 @@

 #include <Nazara/Graphics/Sprite.hpp>
 #include <Nazara/Graphics/AbstractRenderQueue.hpp>
-#include <Nazara/Graphics/AbstractViewer.hpp>
-#include <cstring>
-#include <memory>
+#include <Nazara/Utility/VertexStruct.hpp>
 #include <Nazara/Graphics/Debug.hpp>

 namespace Nz
--- a/src/Nazara/Graphics/TextSprite.cpp
+++ b/src/Nazara/Graphics/TextSprite.cpp
@@ -6,9 +6,9 @@
 #include <Nazara/Core/CallOnExit.hpp>
 #include <Nazara/Core/SparsePtr.hpp>
 #include <Nazara/Graphics/AbstractRenderQueue.hpp>
-#include <Nazara/Graphics/AbstractViewer.hpp>
-#include <memory>
+#include <Nazara/Utility/AbstractTextDrawer.hpp>
 #include <Nazara/Utility/Font.hpp>
+#include <memory>
 #include <Nazara/Graphics/Debug.hpp>

 namespace Nz
--- a/src/Nazara/Graphics/TextureBackground.cpp
+++ b/src/Nazara/Graphics/TextureBackground.cpp
@@ -4,7 +4,8 @@

 #include <Nazara/Graphics/TextureBackground.hpp>
 #include <Nazara/Renderer/Renderer.hpp>
-#include <memory>
+#include <Nazara/Renderer/RenderStates.hpp>
+#include <Nazara/Renderer/UberShaderInstance.hpp>
 #include <Nazara/Graphics/Debug.hpp>

 namespace Nz
--- a/src/Nazara/Graphics/TileMap.cpp
+++ b/src/Nazara/Graphics/TileMap.cpp
@@ -4,10 +4,8 @@

 #include <Nazara/Graphics/TileMap.hpp>
 #include <Nazara/Graphics/AbstractRenderQueue.hpp>
-#include <Nazara/Graphics/AbstractViewer.hpp>
 #include <Nazara/Math/Rect.hpp>
-#include <cstring>
-#include <memory>
+#include <Nazara/Utility/VertexStruct.hpp>
 #include <Nazara/Graphics/Debug.hpp>

 namespace Nz