Use forward declaration in libscene

src/engine/engine.cpp

@@ -23,12 +23,16 @@
 #include "graphics/context.h"
 #include "graphics/features.h"
 #include "graphics/lip/lips.h"
+#include "graphics/materials.h"
 #include "graphics/model/models.h"
+#include "graphics/pbribl.h"
+#include "graphics/renderbuffer.h"
 #include "graphics/services.h"
 #include "graphics/walkmesh/walkmeshes.h"
 #include "resource/resourceprovider.h"
 #include "resource/services.h"
 #include "scene/services.h"
+#include "scene/pipeline/world.h"
 #include "script/services.h"
 
 using namespace std;

src/engine/game/game.cpp

@@ -23,7 +23,10 @@
 #include "../graphics/features.h"
 #include "../graphics/lip/lips.h"
 #include "../graphics/model/models.h"
+#include "../graphics/pbribl.h"
+#include "../graphics/renderbuffer.h"
 #include "../graphics/walkmesh/walkmeshes.h"
+#include "../scene/pipeline/world.h"
 #include "../video/bikreader.h"
 
 using namespace std;

src/engine/game/game_save.cpp

@@ -27,6 +27,7 @@
 #include "../resource/format/erfreader.h"
 #include "../resource/format/erfwriter.h"
 #include "../resource/format/gffwriter.h"
+#include "../scene/pipeline/world.h"
 
 #include "enginetype/location.h"
 #include "party.h"

src/engine/gui/control/button.cpp

@@ -17,6 +17,8 @@
 
 #include "button.h"
 
+#include "../../graphics/renderbuffer.h"
+
 namespace reone {
 
 namespace gui {

src/engine/gui/control/control.cpp

@@ -22,6 +22,7 @@
 #include "../../graphics/fonts.h"
 #include "../../graphics/mesh/mesh.h"
 #include "../../graphics/mesh/meshes.h"
+#include "../../graphics/renderbuffer.h"
 #include "../../graphics/shader/shaders.h"
 #include "../../graphics/texture/textures.h"
 #include "../../graphics/textutil.h"

src/engine/gui/control/imagebutton.cpp

@@ -21,6 +21,7 @@
 #include "../../graphics/fonts.h"
 #include "../../graphics/mesh/mesh.h"
 #include "../../graphics/mesh/meshes.h"
+#include "../../graphics/renderbuffer.h"
 
 #include "../gui.h"
 

src/engine/gui/control/label.cpp

@@ -17,6 +17,8 @@
 
 #include "label.h"
 
+#include "../../graphics/renderbuffer.h"
+
 namespace reone {
 
 namespace gui {

src/engine/gui/control/listbox.cpp

@@ -19,6 +19,7 @@
 
 #include "../../common/log.h"
 #include "../../graphics/mesh/meshes.h"
+#include "../../graphics/renderbuffer.h"
 #include "../../graphics/shader/shaders.h"
 #include "../../graphics/textutil.h"
 #include "../../resource/resources.h"

src/engine/gui/control/panel.cpp

@@ -17,6 +17,8 @@
 
 #include "panel.h"
 
+#include "../../graphics/renderbuffer.h"
+
 namespace reone {
 
 namespace gui {

src/engine/gui/control/progressbar.cpp

@@ -20,6 +20,7 @@
 #include "../../graphics/context.h"
 #include "../../graphics/mesh/mesh.h"
 #include "../../graphics/mesh/meshes.h"
+#include "../../graphics/renderbuffer.h"
 #include "../../graphics/texture/textures.h"
 
 #include "../gui.h"

src/engine/gui/control/scrollbar.cpp

@@ -20,6 +20,7 @@
 #include "../../graphics/context.h"
 #include "../../graphics/mesh/mesh.h"
 #include "../../graphics/mesh/meshes.h"
+#include "../../graphics/renderbuffer.h"
 #include "../../graphics/shader/shaders.h"
 #include "../../graphics/texture/textures.h"
 #include "../../resource/resources.h"

src/engine/gui/control/slider.cpp

@@ -17,6 +17,8 @@
 
 #include "slider.h"
 
+#include "../../graphics/renderbuffer.h"
+
 namespace reone {
 
 namespace gui {

src/engine/gui/control/togglebutton.cpp

@@ -17,6 +17,8 @@
 
 #include "togglebutton.h"
 
+#include "../../graphics/renderbuffer.h"
+
 namespace reone {
 
 namespace gui {

src/engine/scene/node/camera.h

@@ -17,10 +17,10 @@
 
 #pragma once
 
-#include "scenenode.h"
-
 #include "../../graphics/aabb.h"
 
+#include "scenenode.h"
+
 namespace reone {
 
 namespace scene {

src/engine/scene/node/emitter.cpp

@@ -23,6 +23,7 @@
 #include "../../graphics/mesh/mesh.h"
 #include "../../graphics/mesh/meshes.h"
 #include "../../graphics/shader/shaders.h"
+#include "../../graphics/texture/texture.h"
 
 #include "../scenegraph.h"
 

src/engine/scene/node/emitter.h

@@ -19,7 +19,6 @@
 
 #include "../../common/timer.h"
 #include "../../graphics/beziercurve.h"
-#include "../../graphics/model/modelnode.h"
 
 #include "../nodeelement.h"
 

src/engine/scene/node/grass.cpp

@@ -22,6 +22,7 @@
 #include "../../graphics/mesh/mesh.h"
 #include "../../graphics/mesh/meshes.h"
 #include "../../graphics/shader/shaders.h"
+#include "../../graphics/texture/texture.h"
 
 #include "../scenegraph.h"
 

src/engine/scene/node/grass.h

@@ -17,14 +17,18 @@
 
 #pragma once
 
-#include "../../graphics/texture/texture.h"
-
 #include "../nodeelement.h"
 
 #include "scenenode.h"
 
 namespace reone {
 
+namespace graphics {
+
+class Texture;
+
+}
+
 namespace scene {
 
 class GrassSceneNode : public SceneNode {

src/engine/scene/node/light.cpp

@@ -22,6 +22,7 @@
 #include "../../graphics/mesh/mesh.h"
 #include "../../graphics/mesh/meshes.h"
 #include "../../graphics/shader/shaders.h"
+#include "../../graphics/texture/texture.h"
 #include "../../graphics/window.h"
 
 #include "../scenegraph.h"

src/engine/scene/node/mesh.cpp

@@ -22,8 +22,11 @@
 #include "../../common/random.h"
 #include "../../graphics/context.h"
 #include "../../graphics/features.h"
+#include "../../graphics/materials.h"
 #include "../../graphics/mesh/mesh.h"
 #include "../../graphics/pbribl.h"
+#include "../../graphics/texture/texture.h"
+#include "../../graphics/texture/textures.h"
 
 #include "../scenegraph.h"
 

src/engine/scene/node/mesh.h

@@ -17,18 +17,19 @@
 
 #pragma once
 
+#include "../../graphics/material.h"
+#include "../../graphics/model/modelnode.h"
+
 #include "modelnode.h"
 
-#include "../../graphics/material.h"
-#include "../../graphics/materials.h"
-#include "../../graphics/model/model.h"
-#include "../../graphics/model/modelnode.h"
-#include "../../graphics/pbribl.h"
-#include "../../graphics/shader/shaders.h"
-#include "../../graphics/texture/textures.h"
-
 namespace reone {
 
+namespace graphics {
+
+class Texture;
+
+}
+
 namespace scene {
 
 class ModelSceneNode;

src/engine/scene/node/modelnode.cpp

@@ -18,6 +18,7 @@
 #include "modelnode.h"
 
 #include "../../common/guardutil.h"
+#include "../../graphics/model/modelnode.h"
 
 using namespace std;
 

src/engine/scene/node/modelnode.h

@@ -17,12 +17,16 @@
 
 #pragma once
 
-#include "../../graphics/model/modelnode.h"
-
 #include "scenenode.h"
 
 namespace reone {
 
+namespace graphics {
+
+class ModelNode;
+
+}
+
 namespace scene {
 
 class ModelNodeSceneNode : public SceneNode {

src/engine/scene/pipeline/control.cpp

@@ -20,7 +20,10 @@
 #include "../../graphics/context.h"
 #include "../../graphics/mesh/mesh.h"
 #include "../../graphics/mesh/meshes.h"
+#include "../../graphics/renderbuffer.h"
+#include "../../graphics/services.h"
 #include "../../graphics/shader/shaders.h"
+#include "../../graphics/texture/texture.h"
 #include "../../graphics/texture/textures.h"
 #include "../../graphics/texture/textureutil.h"
 

src/engine/scene/pipeline/control.h

@@ -19,15 +19,20 @@
 
 #include "../../graphics/framebuffer.h"
 #include "../../graphics/renderbuffer.h"
-#include "../../graphics/services.h"
-#include "../../graphics/texture/texture.h"
-
-#include "../scenegraph.h"
 
 namespace reone {
 
+namespace graphics {
+
+class GraphicsServices;
+class Texture;
+
+}
+
 namespace scene {
 
+class SceneGraph;
+
 class ControlRenderPipeline : boost::noncopyable {
 public:
     ControlRenderPipeline(glm::ivec4 extent, graphics::GraphicsServices &graphics, SceneGraph &scene);

src/engine/scene/pipeline/world.cpp

@@ -21,7 +21,9 @@
 #include "../../graphics/mesh/mesh.h"
 #include "../../graphics/mesh/meshes.h"
 #include "../../graphics/pbribl.h"
+#include "../../graphics/renderbuffer.h"
 #include "../../graphics/shader/shaders.h"
+#include "../../graphics/texture/texture.h"
 #include "../../graphics/texture/textures.h"
 #include "../../graphics/texture/textureutil.h"
 #include "../../graphics/texture/tgawriter.h"

src/engine/scene/pipeline/world.h

@@ -18,17 +18,23 @@
 #pragma once
 
 #include "../../graphics/framebuffer.h"
-#include "../../graphics/renderbuffer.h"
-#include "../../graphics/services.h"
-#include "../../graphics/texture/texture.h"
+#include "../../graphics/options.h"
 #include "../../graphics/types.h"
 
-#include "../scenegraph.h"
-
 namespace reone {
 
+namespace graphics {
+
+class GraphicsServices;
+class Renderbuffer;
+class Texture;
+
+}
+
 namespace scene {
 
+class SceneGraph;
+
 class WorldRenderPipeline : boost::noncopyable {
 public:
     WorldRenderPipeline(graphics::GraphicsOptions options, graphics::GraphicsServices &graphics, SceneGraph &sceneGraph);

src/engine/scene/scenegraph.h

@@ -19,6 +19,7 @@
 
 #include "../graphics/options.h"
 #include "../graphics/services.h"
+#include "../graphics/shader/shaders.h"
 
 #include "node/camera.h"
 #include "node/emitter.h"

src/engine/scene/services.cpp

@@ -17,6 +17,12 @@
 
 #include "services.h"
 
+#include "../graphics/renderbuffer.h"
+#include "../graphics/texture/texture.h"
+
+#include "pipeline/world.h"
+#include "scenegraph.h"
+
 using namespace std;
 
 using namespace reone::graphics;

src/engine/scene/services.h

@@ -18,15 +18,20 @@
 #pragma once
 
 #include "../graphics/options.h"
-#include "../graphics/services.h"
-
-#include "pipeline/world.h"
-#include "scenegraph.h"
 
 namespace reone {
 
+namespace graphics {
+
+class GraphicsServices;
+
+}
+
 namespace scene {
 
+class SceneGraph;
+class WorldRenderPipeline;
+
 class SceneServices : boost::noncopyable {
 public:
     SceneServices(graphics::GraphicsOptions options, graphics::GraphicsServices &graphics);