Clean up header part 2

src/graphics/command_buffer.cpp

@@ -19,6 +19,7 @@
 
 #include "graphics/command_buffer.hpp"
 #include "graphics/central_settings.hpp"
+#include "graphics/stk_mesh_scene_node.hpp"
 #include "utils/cpp2011.hpp"
 
 // ----------------------------------------------------------------------------

src/graphics/command_buffer.hpp

@@ -24,23 +24,11 @@
 #include "graphics/gl_headers.hpp"
 #include "graphics/material.hpp"
 #include "graphics/materials.hpp"
-#include "graphics/render_info.hpp"
-#include "graphics/stk_mesh_scene_node.hpp"
 #include "graphics/vao_manager.hpp"
 #include <irrlicht.h>
 #include <array>
 #include <unordered_map>
 
-typedef STK::Tuple<scene::ISceneNode*, core::vector2df, core::vector2df, int32_t> InstanceSettings;
-
-struct InstanceList
-{
-    GLMesh *m_mesh;
-    std::vector<InstanceSettings> m_instance_settings;
-};
-
-typedef std::unordered_map <irr::scene::IMeshBuffer *, InstanceList > MeshMap;
-
 // ----------------------------------------------------------------------------
 /** Fill origin, orientation and scale attributes
  *  \param node The scene node of the mesh

src/graphics/draw_calls.cpp

@@ -19,17 +19,17 @@
 #include "graphics/draw_calls.hpp"
 
 #include "config/user_config.hpp"
+#include "graphics/command_buffer.hpp"
 #include "graphics/draw_tools.hpp"
 #include "graphics/gpu_particles.hpp"
 #include "graphics/lod_node.hpp"
 #include "graphics/materials.hpp"
+#include "graphics/render_info.hpp"
 #include "graphics/shadow_matrices.hpp"
 #include "graphics/shaders.hpp"
 #include "graphics/stk_animated_mesh.hpp"
 #include "graphics/stk_billboard.hpp"
 #include "graphics/stk_mesh.hpp"
-#include "graphics/stk_mesh_scene_node.hpp"
-#include "graphics/vao_manager.hpp"
 #include "tracks/track.hpp"
 #include "utils/profiler.hpp"
 

src/graphics/draw_calls.hpp

@@ -19,14 +19,21 @@
 #define HEADER_DRAW_CALLS_HPP
 
 #ifndef SERVER_ONLY
-#include "graphics/command_buffer.hpp"
+#include "graphics/material.hpp"
+#include "graphics/vao_manager.hpp"
 #include <irrlicht.h>
+#include <set>
 #include <unordered_map>
 
+class GlowCommandBuffer;
 class ParticleSystemProxy;
+class ReflectiveShadowMapCommandBuffer;
 class ShadowMatrices;
+class ShadowCommandBuffer;
+class SolidCommandBuffer;
 class STKAnimatedMesh;
 class STKBillboard;
+class STKMeshCommon;
 
 class DrawCalls
 {

src/graphics/draw_policies.cpp

@@ -18,6 +18,7 @@
 #ifndef SERVER_ONLY
 
 #include "graphics/draw_policies.hpp"
+#include "graphics/draw_calls.hpp"
 #include "graphics/draw_tools.hpp"
 #include "graphics/materials.hpp"
 

src/graphics/draw_policies.hpp

@@ -20,8 +20,10 @@
 
 #ifndef SERVER_ONLY
 
-#include "graphics/draw_calls.hpp"
+#include "graphics/abstract_renderer.hpp"
 
+using namespace irr;
+class DrawCalls;
 
 /** Rendering methods in this class only require
  *  OpenGL3.2 functions */

src/graphics/draw_tools.hpp

@@ -20,11 +20,9 @@
 
 #include "graphics/shader.hpp"
 #include "graphics/irr_driver.hpp"
-#include "graphics/render_info.hpp"
 #include "graphics/stk_mesh.hpp"
 #include "graphics/texture_manager.hpp"
 
-
 // ----------------------------------------------------------------------------
 /** Variadic template to draw a mesh (using OpenGL 3.2 function)
  * using specified shader with per mesh custom uniforms.*/

src/graphics/geometry_passes.hpp

@@ -20,8 +20,10 @@
 #ifndef HEADER_GEOMETRY_PASSES_HPP
 #define HEADER_GEOMETRY_PASSES_HPP
 
+#include "graphics/central_settings.hpp"
 #include "graphics/draw_calls.hpp"
 #include "graphics/glwrap.hpp"
+#include "graphics/irr_driver.hpp"
 #include "graphics/shadow_matrices.hpp"
 #include "utils/profiler.hpp"
 #include <ITexture.h>

src/graphics/render_target.cpp

@@ -20,6 +20,7 @@
 
 #include "graphics/2dutils.hpp"
 #include "graphics/glwrap.hpp"
+#include "graphics/irr_driver.hpp"
 #include "graphics/rtts.hpp"
 #include "graphics/shader_based_renderer.hpp"
 

src/graphics/shader_based_renderer.cpp

@@ -26,12 +26,14 @@
 #include "graphics/geometry_passes.hpp"
 #include "graphics/glwrap.hpp"
 #include "graphics/graphics_restrictions.hpp"
+#include "graphics/irr_driver.hpp"
 #include "graphics/lod_node.hpp"
 #include "graphics/post_processing.hpp"
 #include "graphics/render_target.hpp"
 #include "graphics/rtts.hpp"
 #include "graphics/shaders.hpp"
 #include "graphics/skybox.hpp"
+#include "graphics/stk_mesh_scene_node.hpp"
 #include "graphics/spherical_harmonics.hpp"
 #include "graphics/texture_manager.hpp"
 #include "items/item_manager.hpp"

src/graphics/shader_based_renderer.hpp

@@ -29,6 +29,7 @@
 #include <string>
 
 class AbstractGeometryPasses;
+class Camera;
 class GL3RenderTarget;
 class RenderTarget;
 class RTT;

src/graphics/vao_manager.hpp

@@ -18,14 +18,18 @@
 #ifndef VAOMANAGER_HPP
 #define VAOMANAGER_HPP
 
-#include "gl_headers.hpp"
+#include "graphics/gl_headers.hpp"
 #include "utils/singleton.hpp"
+#include "utils/tuple.hpp"
 #include <S3DVertex.h>
 #include <IMeshBuffer.h>
+#include <ISceneNode.h>
 #include <vector>
 #include <map>
 #include <unordered_map>
 
+using namespace irr;
+
 enum InstanceType : unsigned int
 {
     InstanceTypeThreeTex,
@@ -36,6 +40,17 @@ enum InstanceType : unsigned int
     InstanceTypeCount,
 };
 
+typedef STK::Tuple<scene::ISceneNode*, core::vector2df, core::vector2df,
+    int32_t> InstanceSettings;
+
+struct GLMesh;
+struct InstanceList
+{
+    GLMesh* m_mesh;
+    std::vector<InstanceSettings> m_instance_settings;
+};
+typedef std::unordered_map <scene::IMeshBuffer *, InstanceList> MeshMap;
+
 #ifdef WIN32
 #pragma pack(push, 1)
 #endif