Some more cleanup of includes and forward declarations

diff --git a/source/builders/font.h b/source/builders/font.h
index 18c225c13a3dd0399f6f767b3f168a5588d76daa..2bb61f750783aa6e179ea7a21c7989dee883ff21 100644 (file)
--- a/source/builders/font.h
+++ b/source/builders/font.h
@@ -5,7 +5,6 @@
 #include <string>
 #include <msp/datafile/objectloader.h>
 #include <msp/stringcodec/utf8.h>
-#include "vertexarray.h"
 
 namespace Msp {
 namespace GL {

diff --git a/source/builders/sequencetemplate.cpp b/source/builders/sequencetemplate.cpp
index 6e50c24838aafeebd751008a10e7e36d40022ec9..67fb4d91d1988cf0cac5e3461d4ac67d05adccfb 100644 (file)
--- a/source/builders/sequencetemplate.cpp
+++ b/source/builders/sequencetemplate.cpp
@@ -1,5 +1,6 @@
 #include <msp/core/maputils.h>
 #include <msp/datafile/collection.h>
+#include <msp/strings/format.h>
 #include "ambientocclusion.h"
 #include "blend.h"
 #include "bloom.h"

diff --git a/source/builders/sequencetemplate.h b/source/builders/sequencetemplate.h
index 81a130ef40a04947ceeb1c4e22b143671878890c..c49b2d43dfa95c8ea30a56c521863430f4332348 100644 (file)
--- a/source/builders/sequencetemplate.h
+++ b/source/builders/sequencetemplate.h
@@ -8,7 +8,7 @@
 #include "blend.h"
 #include "depthtest.h"
 #include "postprocessor.h"
-#include "predicate.h"
+#include "resources.h"
 #include "stenciltest.h"
 
 namespace Msp {

diff --git a/source/effects/ambientocclusion.cpp b/source/effects/ambientocclusion.cpp
index d8470077f03ca3e453f36510777880fb2c04dbe7..d431bcdd51ea68417a6b285b1b7ba8773542742b 100644 (file)
--- a/source/effects/ambientocclusion.cpp
+++ b/source/effects/ambientocclusion.cpp
@@ -2,8 +2,10 @@
 #include "ambientocclusion.h"
 #include "blend.h"
 #include "camera.h"
+#include "mesh.h"
 #include "renderer.h"
 #include "resources.h"
+#include "texture2d.h"
 
 using namespace std;
 

diff --git a/source/effects/ambientocclusion.h b/source/effects/ambientocclusion.h
index 0171d89e87ac2e781ba267f72d67e918ff3d29c1..fd3b6574cbbdfec1b83b2244d1e5e744cf003532 100644 (file)
--- a/source/effects/ambientocclusion.h
+++ b/source/effects/ambientocclusion.h
@@ -1,17 +1,15 @@
 #ifndef MSP_GL_AMBIENTOCCLUSION_H_
 #define MSP_GL_AMBIENTOCCLUSION_H_
 
-#include "framebuffer.h"
-#include "mesh.h"
 #include "postprocessor.h"
-#include "program.h"
 #include "programdata.h"
 #include "rendertarget.h"
-#include "texture2d.h"
 
 namespace Msp {
 namespace GL {
 
+class Program;
+
 /**
 Implements screen-space ambient occlusion.
 

diff --git a/source/effects/bloom.cpp b/source/effects/bloom.cpp
index aac226d90c133a9a174b25ca0fb1d0a715bfc9b4..a6fefa6ecc014cb68ddcb41e443128f33295e430 100644 (file)
--- a/source/effects/bloom.cpp
+++ b/source/effects/bloom.cpp
@@ -1,9 +1,10 @@
 #include <cmath>
 #include <msp/strings/format.h>
-#include "blend.h"
 #include "bloom.h"
+#include "mesh.h"
 #include "renderer.h"
 #include "resources.h"
+#include "texture2d.h"
 
 using namespace std;
 

diff --git a/source/effects/bloom.h b/source/effects/bloom.h
index b80388d6b6848b2af6023b8de17d165fb467a653..d6c9307cf8d43148818669f3007dbca223c8ec5d 100644 (file)
--- a/source/effects/bloom.h
+++ b/source/effects/bloom.h
@@ -1,17 +1,15 @@
 #ifndef MSP_GL_BLOOM_H_
 #define MSP_GL_BLOOM_H_
 
-#include "framebuffer.h"
-#include "mesh.h"
 #include "postprocessor.h"
-#include "texture2d.h"
-#include "program.h"
 #include "programdata.h"
 #include "rendertarget.h"
 
 namespace Msp {
 namespace GL {
 
+class Program;
+
 /**
 The Bloom post-processing effect causes very bright areas of the image to bleed
 into surrounding pixels.  Commonly used together with HDR rendering.

diff --git a/source/effects/colorcurve.h b/source/effects/colorcurve.h
index 3ccfbf76b00d8c99493d63394ee2e59dad796fdc..01a7d35dcb37eecfebc9fb1e3df8fc6c5b57b21f 100644 (file)
--- a/source/effects/colorcurve.h
+++ b/source/effects/colorcurve.h
@@ -2,13 +2,14 @@
 #define MSP_GL_COLORCURVE_H_
 
 #include "postprocessor.h"
-#include "program.h"
 #include "programdata.h"
 #include "texture1d.h"
 
 namespace Msp {
 namespace GL {
 
+class Program;
+
 /**
 Processes oversaturated colors to preserve hues.  When one color component
 exceeds 1.0, the overflow is distributed to the other components, scaling the

diff --git a/source/effects/effect.cpp b/source/effects/effect.cpp
index e335b46a69dae807d8e0bb3b58f7c55ead2f72f9..584117e74533e3a629aa5746ae3adc27f8da1a6a 100644 (file)
--- a/source/effects/effect.cpp
+++ b/source/effects/effect.cpp
@@ -1,5 +1,4 @@
 #include "effect.h"
-#include "sampler.h"
 
 namespace Msp {
 namespace GL {

diff --git a/source/effects/effect.h b/source/effects/effect.h
index a4f108fbcf9f739bcca08fc55b520fe0d5fab202..d763f251bd473b7b22e58c2230400805442d2fdd 100644 (file)
--- a/source/effects/effect.h
+++ b/source/effects/effect.h
@@ -2,14 +2,11 @@
 #define MSP_GL_EFFECT_H_
 
 #include <set>
-#include <msp/core/refptr.h>
 #include "renderable.h"
 
 namespace Msp {
 namespace GL {
 
-class Sampler;
-
 /**
 Effects are used to wrap other renderables and give them additional visual
 properties.  An Effect's render method should set up the necessary state, call

diff --git a/source/effects/environmentmap.h b/source/effects/environmentmap.h
index 9c8447f6173f988d2f952f91d08b4cb4d52846b7..98328488580a563182e7fee0eedc4cde0bc6f3b1 100644 (file)
--- a/source/effects/environmentmap.h
+++ b/source/effects/environmentmap.h
@@ -1,19 +1,19 @@
 #ifndef MSP_GL_ENVIRONMENTMAP_H_
 #define MSP_GL_ENVIRONMENTMAP_H_
 
+#include <vector>
 #include "camera.h"
 #include "effect.h"
 #include "framebuffer.h"
-#include "matrix.h"
 #include "programdata.h"
 #include "texture2d.h"
 #include "texturecube.h"
-#include "vector.h"
 
 namespace Msp {
 namespace GL {
 
 class Mesh;
+class Sampler;
 
 /**
 Creates a cube map texture of the surroundings of the renderable.  This texture

diff --git a/source/effects/shadowmap.cpp b/source/effects/shadowmap.cpp
index bf07577878476506ad815a95f2144e4aaef98d07..972fefc202e7433a1fd47db0c35fca1b0f3d8f23 100644 (file)
--- a/source/effects/shadowmap.cpp
+++ b/source/effects/shadowmap.cpp
@@ -1,10 +1,6 @@
-#include <cmath>
-#include <cstdlib>
-#include "camera.h"
 #include "light.h"
 #include "renderer.h"
 #include "resources.h"
-#include "scene.h"
 #include "shadowmap.h"
 
 using namespace std;

diff --git a/source/effects/shadowmap.h b/source/effects/shadowmap.h
index 81563a72887acec2fc848d4c954776f51fa98165..63d946c20e04c4aa4710dad2c345ce4e4e254a35 100644 (file)
--- a/source/effects/shadowmap.h
+++ b/source/effects/shadowmap.h
@@ -13,7 +13,6 @@ namespace Msp {
 namespace GL {
 
 class Light;
-class Resources;
 
 /**
 Creates shadows on a renderable through a shadow map texture.  In the setup

diff --git a/source/effects/sky.h b/source/effects/sky.h
index 74580d7502a165fb1b8e1d48f8206c600ab7397d..be31b3085625001c9603adb1c28f4232e64862da 100644 (file)
--- a/source/effects/sky.h
+++ b/source/effects/sky.h
@@ -2,7 +2,6 @@
 #define MSP_GL_SKY_H_
 
 #include "effect.h"
-#include "framebuffer.h"
 #include "programdata.h"
 #include "rendertarget.h"
 

diff --git a/source/materials/light.cpp b/source/materials/light.cpp
index e8cbbaac9990551c10fbcf729fa5e4e174b83704..8f5461727879545999e4566827a8574cc5c6ff7c 100644 (file)
--- a/source/materials/light.cpp
+++ b/source/materials/light.cpp
@@ -1,7 +1,6 @@
 #include <stdexcept>
 #include <msp/strings/format.h>
 #include "light.h"
-#include "matrix.h"
 #include "programdata.h"
 
 using namespace std;

diff --git a/source/materials/light.h b/source/materials/light.h
index 4532d0d42c4035c2442fbcaf2e1eea414ce6c164..a6ffd16efd3701d456cb3b0d3578b0ee558d6f6b 100644 (file)
--- a/source/materials/light.h
+++ b/source/materials/light.h
@@ -1,15 +1,15 @@
 #ifndef MSP_GL_LIGHT_H_
 #define MSP_GL_LIGHT_H_
 
-#include <vector>
 #include <msp/datafile/objectloader.h>
+#include <msp/geometry/angle.h>
 #include "color.h"
 #include "placeable.h"
+#include "vector.h"
 
 namespace Msp {
 namespace GL {
 
-class Matrix;
 class ProgramData;
 
 /**

diff --git a/source/materials/lighting.cpp b/source/materials/lighting.cpp
index 4c22ba3c01e70b01d68852f31f411799fce2f91f..0fc26ab5a7f17c921dafb54d1c8d02deb725afad 100644 (file)
--- a/source/materials/lighting.cpp
+++ b/source/materials/lighting.cpp
@@ -4,10 +4,8 @@
 #include <msp/datafile/collection.h>
 #include <msp/fs/utils.h>
 #include <msp/strings/format.h>
-#include "error.h"
 #include "light.h"
 #include "lighting.h"
-#include "matrix.h"
 
 using namespace std;
 

diff --git a/source/materials/technique.cpp b/source/materials/technique.cpp
index e41f0c8ef4919612577fcf34baacced5719044fa..21cb3a3211b24c6607c9a08ffc35d7a765322f18 100644 (file)
--- a/source/materials/technique.cpp
+++ b/source/materials/technique.cpp
@@ -3,9 +3,7 @@
 #include <msp/fs/utils.h>
 #include <msp/strings/format.h>
 #include "material.h"
-#include "program.h"
 #include "programdata.h"
-#include "tag.h"
 #include "technique.h"
 #include "texture.h"
 

diff --git a/source/materials/technique.h b/source/materials/technique.h
index 74c37fc8e2ca0e03c24fdd4f691a60f96abeb640..419c676570a653b41549b65b8467d1fa84a1ad58 100644 (file)
--- a/source/materials/technique.h
+++ b/source/materials/technique.h
@@ -1,6 +1,7 @@
 #ifndef MSP_GL_TECHNIQUE_H_
 #define MSP_GL_TECHNIQUE_H_
 
+#include <map>
 #include "renderpass.h"
 #include "tag.h"
 

diff --git a/source/render/instancearray.cpp b/source/render/instancearray.cpp
index 37d7ccb68e3815f8f24b31351d904f4f41175490..d27fa8196657f1b127f10f4e10e6ccacbf25a1c5 100644 (file)
--- a/source/render/instancearray.cpp
+++ b/source/render/instancearray.cpp
@@ -1,7 +1,6 @@
 #include <msp/core/algorithm.h>
 #include <msp/core/maputils.h>
 #include "buffer.h"
-#include "camera.h"
 #include "instancearray.h"
 #include "mesh.h"
 #include "object.h"

diff --git a/source/render/instancearray.h b/source/render/instancearray.h
index 4d7d3475bbaa500d405ef05b6e3868402f9a2921..8f5c73225519a374623c818b6298cdc55a308471 100644 (file)
--- a/source/render/instancearray.h
+++ b/source/render/instancearray.h
@@ -13,8 +13,6 @@ namespace GL {
 class Buffer;
 class Object;
 class ObjectInstance;
-class VertexArray;
-class VertexSetup;
 
 /**
 Renders multiple instances of an Object in an efficient manner.  If instanced

diff --git a/source/render/object.cpp b/source/render/object.cpp
index 479e77afa986ac124137a4726717d055af56910a..98eb05f7cdb53deb5eb9e7703f48a5aebfdde0cf 100644 (file)
--- a/source/render/object.cpp
+++ b/source/render/object.cpp
@@ -2,12 +2,9 @@
 #include <msp/fs/utils.h>
 #include <msp/strings/format.h>
 #include "error.h"
-#include "material.h"
 #include "mesh.h"
 #include "object.h"
 #include "objectinstance.h"
-#include "program.h"
-#include "programdata.h"
 #include "renderer.h"
 #include "resourcemanager.h"
 #include "technique.h"

diff --git a/source/render/object.h b/source/render/object.h
index ca41ffac0a2f086633dcb7153046b08ef1554d3d..0fbcf3830331cd893dbd5bc4b0f6f46dc72a9381 100644 (file)
--- a/source/render/object.h
+++ b/source/render/object.h
@@ -9,11 +9,9 @@
 namespace Msp {
 namespace GL {
 
-class Material;
 class Mesh;
 class ObjectInstance;
 class Technique;
-class Texture;
 
 /**
 Combines a Mesh with a Technique to give it an appearance.  The Technique will

diff --git a/source/render/occludedscene.cpp b/source/render/occludedscene.cpp
index 975510e54c9ed12a4510ce534321de7affb7f5cb..81af42b3598e1f1cdc7054d0dabc8d41b29a05b9 100644 (file)
--- a/source/render/occludedscene.cpp
+++ b/source/render/occludedscene.cpp
@@ -1,9 +1,10 @@
 #include <algorithm>
 #include "camera.h"
+#include "mesh.h"
 #include "occludedscene.h"
+#include "program.h"
 #include "renderer.h"
 #include "resources.h"
-#include "sphere.h"
 
 using namespace std;
 

diff --git a/source/render/occludedscene.h b/source/render/occludedscene.h
index f11c707e6781c0ea656a7676e733e3981209ea41..d51b29b36c87def2ef0ed1e7c30544a0aabea148 100644 (file)
--- a/source/render/occludedscene.h
+++ b/source/render/occludedscene.h
@@ -5,14 +5,15 @@
 #include <vector>
 #include "blend.h"
 #include "depthtest.h"
-#include "mesh.h"
-#include "program.h"
 #include "query.h"
 #include "scene.h"
 
 namespace Msp {
 namespace GL {
 
+class Mesh;
+class Program;
+
 /**
 A scene that performs occlusion queries on renderables to skip those that are
 entirely occluded by others.

diff --git a/source/render/orderedscene.h b/source/render/orderedscene.h
index 3e2974e9d25a32ed10992c23d2f2eaa349b37a94..e4a35afae594c1fd09ce9ded5889f9c3e920b963 100644 (file)
--- a/source/render/orderedscene.h
+++ b/source/render/orderedscene.h
@@ -1,7 +1,7 @@
 #ifndef MSP_GL_ORDEREDSCENE_H_
 #define MSP_GL_ORDEREDSCENE_H_
 
-#include <list>
+#include <vector>
 #include "scene.h"
 
 namespace Msp {

diff --git a/source/render/programdata.cpp b/source/render/programdata.cpp
index 31fc8fa262949b9b5ea5fa328012525ef6d03833..1dcac641907d382999943f27784946ab2465821d 100644 (file)
--- a/source/render/programdata.cpp
+++ b/source/render/programdata.cpp
@@ -1,7 +1,5 @@
 #include <msp/core/algorithm.h>
-#include <msp/core/maputils.h>
 #include <msp/debug/demangle.h>
-#include <msp/gl/extensions/arb_direct_state_access.h>
 #include <msp/io/print.h>
 #include "buffer.h"
 #include "color.h"

diff --git a/source/render/programdata.h b/source/render/programdata.h
index 474ca4e8d326d3bebbadb567cea32263175ffc5e..e5c3e4f5259be76a3965f052e077a67bcaba1d34 100644 (file)
--- a/source/render/programdata.h
+++ b/source/render/programdata.h
@@ -1,7 +1,6 @@
 #ifndef MSP_GL_PROGRAMDATA_H_
 #define MSP_GL_PROGRAMDATA_H_
 
-#include <map>
 #include <stdexcept>
 #include <msp/datafile/objectloader.h>
 #include "datatype.h"
@@ -21,7 +20,6 @@ public:
 };
 
 class Buffer;
-class BufferBackedUniformBlock;
 class PipelineState;
 class Program;
 class UniformBlock;

diff --git a/source/render/renderable.h b/source/render/renderable.h
index 4175dd81294821f7d8d7c82d76c286ca99ad8cc0..022c87087b7b08bcf1f6034d1668b79df2021ee4 100644 (file)
--- a/source/render/renderable.h
+++ b/source/render/renderable.h
@@ -1,8 +1,6 @@
 #ifndef MSP_GL_RENDERABLE_H_
 #define MSP_GL_RENDERABLE_H_
 
-#include <string>
-#include <msp/core/attributes.h>
 #include <msp/geometry/boundingsphere.h>
 #include "tag.h"
 

diff --git a/source/render/renderer.cpp b/source/render/renderer.cpp
index 1d729200dc8909e78d875911942718c930a30ba0..b142da75448652c3135a9aa3b30e796aa374f8ac 100644 (file)
--- a/source/render/renderer.cpp
+++ b/source/render/renderer.cpp
@@ -2,8 +2,8 @@
 #include "buffer.h"
 #include "camera.h"
 #include "clipping.h"
-#include "deviceinfo.h"
 #include "error.h"
+#include "framebuffer.h"
 #include "lighting.h"
 #include "material.h"
 #include "program.h"

diff --git a/source/render/renderer.h b/source/render/renderer.h
index 3e0e50d83d80290a08642b81b978cc3048152c35..af9eac0426e4c265a76bd2dc54879a5f85b636c3 100644 (file)
--- a/source/render/renderer.h
+++ b/source/render/renderer.h
@@ -4,7 +4,6 @@
 #include <set>
 #include <vector>
 #include "commands.h"
-#include "framebuffer.h"
 #include "matrix.h"
 #include "pipelinestate.h"
 #include "programdata.h"
@@ -16,6 +15,7 @@ namespace GL {
 class Batch;
 class Buffer;
 class Camera;
+union ClearValue;
 class Clipping;
 class Material;
 class Mesh;

diff --git a/source/render/scene.cpp b/source/render/scene.cpp
index 3c101b8a172cdba1fc421eecc5a182946bb3f308..87d8c423852ac749ec29a45e9af7331c5f214031 100644 (file)
--- a/source/render/scene.cpp
+++ b/source/render/scene.cpp
@@ -1,5 +1,6 @@
 #include <msp/datafile/collection.h>
 #include <msp/fs/utils.h>
+#include <msp/strings/format.h>
 #include "camera.h"
 #include "objectinstance.h"
 #include "occludedscene.h"

diff --git a/source/render/scene.h b/source/render/scene.h
index fcf5d33e8eb9645caccdbc9bff5f7d34a3427f27..b68953446d72df4c735440a9700f827b29191a79 100644 (file)
--- a/source/render/scene.h
+++ b/source/render/scene.h
@@ -1,12 +1,11 @@
 #ifndef MSP_GL_SCENE_H_
 #define MSP_GL_SCENE_H_
 
-#include <vector>
+#include <map>
 #include <msp/core/typeregistry.h>
 #include <msp/datafile/objectloader.h>
 #include "matrix.h"
 #include "renderable.h"
-#include "vector.h"
 
 namespace Msp {
 namespace GL {

diff --git a/source/render/sequence.cpp b/source/render/sequence.cpp
index ef96a9e7cb8adf8dfff2cfdf17f52127ac015dc5..e0c333dec2b26b679ed0b293063678b9c5b6680d 100644 (file)
--- a/source/render/sequence.cpp
+++ b/source/render/sequence.cpp
@@ -1,11 +1,9 @@
-#include <msp/core/maputils.h>
 #include <msp/strings/format.h>
-#include "blend.h"
 #include "error.h"
-#include "framebuffer.h"
 #include "lighting.h"
 #include "postprocessor.h"
 #include "renderer.h"
+#include "rendertarget.h"
 #include "sequence.h"
 #include "texture2d.h"
 

diff --git a/source/render/sequence.h b/source/render/sequence.h
index cfd14942e9de044bd5e33af8dc99e43470caf96d..ebdb55dd664636936ea9caea0c01de1a11c2a843 100644 (file)
--- a/source/render/sequence.h
+++ b/source/render/sequence.h
@@ -1,24 +1,20 @@
 #ifndef MSP_GL_SEQUENCE_H_
 #define MSP_GL_SEQUENCE_H_
 
-#include <map>
-#include <set>
+#include <vector>
 #include "blend.h"
 #include "depthtest.h"
-#include "framebuffer.h"
+#include "frameformat.h"
 #include "renderable.h"
-#include "rendertarget.h"
 #include "stenciltest.h"
-#include "texture2d.h"
 
 namespace Msp {
 namespace GL {
 
-class Blend;
-class Camera;
 class Clipping;
 class Lighting;
 class PostProcessor;
+class RenderTarget;
 
 /**
 Top-level content class.  Typically a Sequence is used as the content

diff --git a/source/render/text.cpp b/source/render/text.cpp
index b3d85deb899a5f837d9e0d64d8720c89925b14bc..5305de4bd5b46db5f12874aa9a03ec73e27bcd8c 100644 (file)
--- a/source/render/text.cpp
+++ b/source/render/text.cpp
@@ -1,6 +1,7 @@
 #include "meshbuilder.h"
 #include "program.h"
 #include "renderer.h"
+#include "technique.h"
 #include "text.h"
 #include "texture2d.h"
 

diff --git a/source/render/text.h b/source/render/text.h
index dda0a4f0e8fe2be4c0fa7d5365300e52ddcbcdf5..0b4fa92c4ac5fe0197dbc917f19bb6453eded733 100644 (file)
--- a/source/render/text.h
+++ b/source/render/text.h
@@ -5,7 +5,6 @@
 #include "mesh.h"
 #include "object.h"
 #include "objectinstance.h"
-#include "technique.h"
 
 namespace Msp {
 namespace GL {

diff --git a/source/render/view.h b/source/render/view.h
index df623c3a7d88b632e89a397609da0fba3d42d6c7..155a6fa995d91bab92f90d7090b6da9f8496f113 100644 (file)
--- a/source/render/view.h
+++ b/source/render/view.h
@@ -1,7 +1,7 @@
 #ifndef MSP_GL_VIEW_H_
 #define MSP_GL_VIEW_H_
 
-#include <list>
+#include <sigc++/trackable.h>
 #include "framebuffer.h"
 
 namespace Msp {

diff --git a/source/render/windowview.h b/source/render/windowview.h
index 8b6f1431d7a9df8d068a4c4975500445179797f0..ee7c44dce994268f8b75555b576609e1386221e4 100644 (file)
--- a/source/render/windowview.h
+++ b/source/render/windowview.h
@@ -1,7 +1,6 @@
 #ifndef MSP_GL_WINDOWVIEW_H_
 #define MSP_GL_WINDOWVIEW_H_
 
-#include <sigc++/trackable.h>
 #include <msp/graphics/glcontext.h>
 #include <msp/graphics/window.h>
 #include "view.h"