Clean-up include dependencies (scene namespace)

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@6527 dfc29bdd-3216-0410-991c-e03cc46cb475

source/Irrlicht/C3DSMeshFileLoader.cpp

@@ -8,7 +8,7 @@
 #include "C3DSMeshFileLoader.h"
 #include "CMeshTextureLoader.h"
 #include "os.h"
-#include "SMeshBuffer.h"
+#include "CMeshBuffer.h"
 #include "SAnimatedMesh.h"
 #include "IReadFile.h"
 #include "IVideoDriver.h"

source/Irrlicht/CAnimatedMeshHalfLife.cpp

@@ -10,7 +10,7 @@
 #include "CColorConverter.h"
 #include "CImage.h"
 #include "coreutil.h"
-#include "SMeshBuffer.h"
+#include "CMeshBuffer.h"
 #include "IVideoDriver.h"
 #include "IFileSystem.h"
 

source/Irrlicht/CAnimatedMeshMD2.cpp

@@ -6,7 +6,6 @@
 #ifdef _IRR_COMPILE_WITH_MD2_LOADER_
 
 #include "CAnimatedMeshMD2.h"
-#include "SColor.h"
 #include "irrMath.h"
 
 namespace irr

source/Irrlicht/CAnimatedMeshMD2.h

@@ -8,8 +8,6 @@
 #include "IAnimatedMeshMD2.h"
 #include "IMesh.h"
 #include "CMeshBuffer.h"
-#include "IReadFile.h"
-#include "S3DVertex.h"
 #include "irrArray.h"
 #include "irrString.h"
 

source/Irrlicht/CAnimatedMeshMD3.h

@@ -8,11 +8,8 @@
 #include "IAnimatedMeshMD3.h"
 #include "IReadFile.h"
 #include "IFileSystem.h"
-#include "irrArray.h"
-#include "irrString.h"
 #include "SMesh.h"
-#include "SMeshBuffer.h"
+#include "CMeshBuffer.h"
-#include "IQ3Shader.h"
 
 namespace irr
 {

source/Irrlicht/CB3DMeshFileLoader.cpp

@@ -14,7 +14,6 @@
 
 #include "IVideoDriver.h"
 #include "IAttributes.h"
-#include "IFileSystem.h"
 #include "os.h"
 
 #ifdef _DEBUG

source/Irrlicht/CB3DMeshWriter.cpp

@@ -2,13 +2,12 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-// TODO: replace printf's by logging messages
-
 #include "IrrCompileConfig.h"
 
 #ifdef _IRR_COMPILE_WITH_B3D_WRITER_
 
 #include "CB3DMeshWriter.h"
+#include "SB3DStructs.h"
 #include "os.h"
 #include "ISkinnedMesh.h"
 #include "IMeshBuffer.h"

source/Irrlicht/CB3DMeshWriter.h

@@ -9,11 +9,8 @@
 
 #include "IMeshWriter.h"
 #include "IWriteFile.h"
-#include "SB3DStructs.h"
 #include "ISkinnedMesh.h"
 
-
-
 namespace irr
 {
 namespace scene

source/Irrlicht/CBSPMeshFileLoader.h

@@ -7,7 +7,6 @@
 
 #include "IMeshLoader.h"
 #include "IFileSystem.h"
-#include "IVideoDriver.h"
 #include "ISceneManager.h"
 #include "IQ3Shader.h"
 

source/Irrlicht/CBillboardSceneNode.cpp

@@ -8,7 +8,6 @@
 #include "IVideoDriver.h"
 #include "ISceneManager.h"
 #include "ICameraSceneNode.h"
-#include "os.h"
 
 namespace irr
 {

source/Irrlicht/CBillboardSceneNode.h

@@ -6,7 +6,7 @@
 #define IRR_C_BILLBOARD_SCENE_NODE_H_INCLUDED
 
 #include "IBillboardSceneNode.h"
-#include "SMeshBuffer.h"
+#include "CMeshBuffer.h"
 
 namespace irr
 {

source/Irrlicht/CCSMLoader.cpp

@@ -18,7 +18,7 @@
 #include "SMesh.h"
 #include "IVideoDriver.h"
 #include "SAnimatedMesh.h"
-#include "SMeshBufferLightMap.h"
+#include "CMeshBuffer.h"
 
 #ifdef _DEBUG
 #define _IRR_DEBUG_CSM_LOADER_

source/Irrlicht/CCSMLoader.h

@@ -38,9 +38,7 @@
 #ifndef __CSM_LOADER_H_INCLUDED__
 #define __CSM_LOADER_H_INCLUDED__
 
-#include "irrArray.h"
 #include "IMesh.h"
-#include "irrString.h"
 #include "IFileSystem.h"
 #include "IMeshLoader.h"
 

source/Irrlicht/CColladaFileLoader.cpp

@@ -7,6 +7,7 @@
 
 #include "CColladaFileLoader.h"
 #include "CMeshTextureLoader.h"
+#include "CAttributes.h"
 #include "os.h"
 #include "IXMLReader.h"
 #include "IDummyTransformationSceneNode.h"
@@ -21,6 +22,7 @@
 #include "IMeshCache.h"
 #include "IMeshSceneNode.h"
 #include "CDynamicMeshBuffer.h"
+#include "IVideoDriver.h"
 #include "irrMap.h"
 
 #ifdef _DEBUG

source/Irrlicht/CColladaFileLoader.h

@@ -7,12 +7,11 @@
 
 #include "IMeshLoader.h"
 #include "IFileSystem.h"
-#include "IVideoDriver.h"
 #include "irrString.h"
 #include "SMesh.h"
 #include "ISceneManager.h"
 #include "irrMap.h"
-#include "CAttributes.h"
+#include "IAttributes.h"
 
 namespace irr
 {

source/Irrlicht/CColladaMeshWriter.cpp

@@ -14,7 +14,6 @@
 #include "IWriteFile.h"
 #include "IXMLWriter.h"
 #include "IMesh.h"
-#include "IAttributes.h"
 #include "IAnimatedMeshSceneNode.h"
 #include "IMeshSceneNode.h"
 #include "ITerrainSceneNode.h"

source/Irrlicht/CCubeSceneNode.cpp

@@ -7,9 +7,6 @@
 #include "CCubeSceneNode.h"
 #include "IVideoDriver.h"
 #include "ISceneManager.h"
-#include "S3DVertex.h"
-#include "SMeshBuffer.h"
-#include "os.h"
 #ifdef _IRR_COMPILE_WITH_SHADOW_VOLUME_SCENENODE_
 #include "CShadowVolumeSceneNode.h"
 #else

source/Irrlicht/CCubeSceneNode.h

@@ -6,7 +6,7 @@
 #define IRR_C_CUBE_SCENE_NODE_H_INCLUDED
 
 #include "IMeshSceneNode.h"
-#include "SMesh.h"
+#include "IMesh.h"
 #include "IGeometryCreator.h"
 
 namespace irr

source/Irrlicht/CDMFLoader.cpp

@@ -25,10 +25,11 @@
 #include "CMeshTextureLoader.h"
 #include "ISceneManager.h"
 #include "IAttributes.h"
+#include "IVideoDriver.h"
 #include "SAnimatedMesh.h"
 #include "SSkinMeshBuffer.h"
+#include "SMesh.h"
 #include "irrString.h"
-#include "irrMath.h"
 #include "dmfsupport.h"
 
 namespace irr

source/Irrlicht/CDMFLoader.h

@@ -33,10 +33,7 @@
 #include "IMeshLoader.h"
 #include "IReadFile.h"
 #include "IFileSystem.h"
-#include "SMesh.h"
-#include "IVideoDriver.h"
 #include "ISceneManager.h"
-#include "SAnimatedMesh.h"
 
 namespace irr
 {

source/Irrlicht/CGeometryCreator.cpp

@@ -3,8 +3,6 @@
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
 #include "CGeometryCreator.h"
-#include "SAnimatedMesh.h"
-#include "SMeshBuffer.h"
 #include "SMesh.h"
 #include "IMesh.h"
 #include "IVideoDriver.h"

source/Irrlicht/CGeometryCreator.h

@@ -6,7 +6,7 @@
 #define IRR_C_GEOMETRY_CREATOR_H_INCLUDED
 
 #include "IGeometryCreator.h"
-#include "SMeshBuffer.h"
+#include "CMeshBuffer.h"
 
 namespace irr
 {

source/Irrlicht/CIrrMeshFileLoader.cpp

@@ -9,12 +9,12 @@
 #include "os.h"
 #include "IXMLReader.h"
 #include "SAnimatedMesh.h"
+#include "SMesh.h"
 #include "fast_atof.h"
 #include "IReadFile.h"
 #include "IAttributes.h"
-#include "IMeshSceneNode.h"
+#include "IVideoDriver.h"
 #include "CDynamicMeshBuffer.h"
-#include "SMeshBufferLightMap.h"
 
 namespace irr
 {

source/Irrlicht/CIrrMeshFileLoader.h

@@ -7,10 +7,6 @@
 
 #include "IMeshLoader.h"
 #include "IFileSystem.h"
-#include "IVideoDriver.h"
-#include "irrString.h"
-#include "SMesh.h"
-#include "SMeshBuffer.h"
 #include "CDynamicMeshBuffer.h"
 #include "ISceneManager.h"
 

source/Irrlicht/CLMTSMeshFileLoader.cpp

@@ -70,13 +70,12 @@ Version 1.0 - 29 July 2004
 
 #include "CLMTSMeshFileLoader.h"
 #include "CMeshTextureLoader.h"
-#include "SMeshBufferLightMap.h"
+#include "CMeshBuffer.h"
 #include "SAnimatedMesh.h"
-#include "SMeshBuffer.h"
+#include "SceneParameters.h"
 #include "irrString.h"
 #include "IReadFile.h"
 #include "IAttributes.h"
-#include "ISceneManager.h"
 #include "os.h"
 
 namespace irr

source/Irrlicht/CLWOMeshFileLoader.h

@@ -6,7 +6,7 @@
 #define IRR_C_LWO_MESH_FILE_LOADER_H_INCLUDED
 
 #include "IMeshLoader.h"
-#include "SMeshBuffer.h"
+#include "CMeshBuffer.h"
 #include "irrString.h"
 
 namespace irr

source/Irrlicht/CMD2MeshFileLoader.cpp

@@ -7,6 +7,8 @@
 
 #include "CMD2MeshFileLoader.h"
 #include "CAnimatedMeshMD2.h"
+#include "coreutil.h"
+#include "IReadFile.h"
 #include "os.h"
 
 namespace irr

source/Irrlicht/CMD3MeshFileLoader.cpp

@@ -7,7 +7,7 @@
 
 #include "CMD3MeshFileLoader.h"
 #include "CAnimatedMeshMD3.h"
-#include "irrString.h"
+#include "IVideoDriver.h"
 
 namespace irr
 {

source/Irrlicht/CMD3MeshFileLoader.h

@@ -6,10 +6,7 @@
 #define IRR_C_MD3_MESH_FILE_LOADER_H_INCLUDED
 
 #include "IMeshLoader.h"
-#include "IFileSystem.h"
-#include "IVideoDriver.h"
 #include "ISceneManager.h"
-#include "IQ3Shader.h"
 
 namespace irr
 {

source/Irrlicht/CMY3DMeshFileLoader.cpp

@@ -15,7 +15,7 @@
 #include "CMeshTextureLoader.h"
 
 #include "SAnimatedMesh.h"
-#include "SMeshBuffer.h"
+#include "SMesh.h"
 #include "IReadFile.h"
 #include "IAttributes.h"
 

source/Irrlicht/CMY3DMeshFileLoader.h

@@ -29,8 +29,7 @@
 
 
 #include "IMeshLoader.h"
-#include "SMesh.h"
+#include "CMeshBuffer.h"
-#include "SMeshBufferLightMap.h"
 #include "IFileSystem.h"
 #include "IVideoDriver.h"
 #include "irrString.h"

source/Irrlicht/CMeshSceneNode.cpp

@@ -6,11 +6,8 @@
 #include "CBufferRenderNode.h"
 #include "IVideoDriver.h"
 #include "ISceneManager.h"
-#include "S3DVertex.h"
-#include "ICameraSceneNode.h"
 #include "IMeshCache.h"
 #include "IAnimatedMesh.h"
-#include "IMaterialRenderer.h"
 #include "IFileSystem.h"
 #ifdef _IRR_COMPILE_WITH_SHADOW_VOLUME_SCENENODE_
 #include "CShadowVolumeSceneNode.h"

source/Irrlicht/COBJMeshFileLoader.cpp

@@ -10,7 +10,6 @@
 #include "IMeshManipulator.h"
 #include "IVideoDriver.h"
 #include "SMesh.h"
-#include "SMeshBuffer.h"
 #include "SAnimatedMesh.h"
 #include "IReadFile.h"
 #include "IAttributes.h"

source/Irrlicht/COBJMeshWriter.cpp

@@ -10,9 +10,7 @@
 #include "os.h"
 #include "IMesh.h"
 #include "IMeshBuffer.h"
-#include "IAttributes.h"
 #include "ISceneManager.h"
-#include "IMeshCache.h"
 #include "IWriteFile.h"
 #include "IFileSystem.h"
 #include "ITexture.h"

source/Irrlicht/COCTLoader.cpp

@@ -17,8 +17,9 @@
 #include "IVideoDriver.h"
 #include "IFileSystem.h"
 #include "os.h"
+#include "SMesh.h"
 #include "SAnimatedMesh.h"
-#include "SMeshBufferLightMap.h"
+#include "CMeshBuffer.h"
 #include "irrString.h"
 #include "ISceneManager.h"
 

source/Irrlicht/COCTLoader.h

@@ -45,8 +45,6 @@
 
 #include "IMeshLoader.h"
 #include "IReadFile.h"
-#include "SMesh.h"
-#include "irrString.h"
 
 namespace irr
 {

source/Irrlicht/COgreMeshFileLoader.cpp

@@ -9,7 +9,8 @@
 #include "COgreMeshFileLoader.h"
 #include "CMeshTextureLoader.h"
 #include "os.h"
-#include "SMeshBuffer.h"
+#include "CMeshBuffer.h"
+#include "SMesh.h"
 #include "SAnimatedMesh.h"
 #include "IReadFile.h"
 #include "fast_atof.h"

source/Irrlicht/COgreMeshFileLoader.h

@@ -10,12 +10,8 @@
 #include "IFileSystem.h"
 #include "IVideoDriver.h"
 #include "irrString.h"
-#include "SMesh.h"
-#include "SMeshBuffer.h"
-#include "SMeshBufferLightMap.h"
-#include "IMeshManipulator.h"
-#include "matrix4.h"
 #include "quaternion.h"
+#include "CMeshBuffer.h"
 #include "CSkinnedMesh.h"
 
 namespace irr

source/Irrlicht/CParticleGravityAffector.cpp

@@ -6,7 +6,6 @@
 
 #ifdef _IRR_COMPILE_WITH_PARTICLES_
 
-#include "os.h"
 #include "IAttributes.h"
 
 namespace irr

source/Irrlicht/CParticleGravityAffector.h

@@ -9,7 +9,6 @@
 #ifdef _IRR_COMPILE_WITH_PARTICLES_
 
 #include "IParticleGravityAffector.h"
-#include "SColor.h"
 
 namespace irr
 {

source/Irrlicht/CParticleMeshEmitter.cpp

@@ -8,6 +8,7 @@
 #ifdef _IRR_COMPILE_WITH_PARTICLES_
 
 #include "os.h"
+#include "IMeshBuffer.h"
 
 namespace irr
 {

source/Irrlicht/CParticleMeshEmitter.h

@@ -9,9 +9,8 @@
 #ifdef _IRR_COMPILE_WITH_PARTICLES_
 
 #include "IParticleMeshEmitter.h"
+#include "IMesh.h"
 #include "irrArray.h"
-#include "aabbox3d.h"
-#include "IMeshBuffer.h"
 
 namespace irr
 {

source/Irrlicht/CParticlePointEmitter.h

@@ -9,7 +9,6 @@
 #ifdef _IRR_COMPILE_WITH_PARTICLES_
 
 #include "IParticleEmitter.h"
-#include "irrArray.h"
 
 namespace irr
 {

source/Irrlicht/CParticleSphereEmitter.h

@@ -10,7 +10,6 @@
 
 #include "IParticleSphereEmitter.h"
 #include "irrArray.h"
-#include "aabbox3d.h"
 
 namespace irr
 {

source/Irrlicht/CParticleSystemSceneNode.h

@@ -11,7 +11,7 @@
 #include "IParticleSystemSceneNode.h"
 #include "irrArray.h"
 #include "irrList.h"
-#include "SMeshBuffer.h"
+#include "CMeshBuffer.h"
 
 namespace irr
 {

source/Irrlicht/CQ3LevelMesh.cpp

@@ -8,9 +8,7 @@
 #include "CQ3LevelMesh.h"
 #include "ISceneManager.h"
 #include "os.h"
-#include "SMeshBufferLightMap.h"
 #include "irrString.h"
-#include "ILightSceneNode.h"
 #include "IQ3Shader.h"
 #include "IFileList.h"
 

source/Irrlicht/CQ3LevelMesh.h

@@ -9,11 +9,10 @@
 #include "IReadFile.h"
 #include "IFileSystem.h"
 #include "SMesh.h"
-#include "SMeshBufferLightMap.h"
+#include "CMeshBuffer.h"
 #include "IVideoDriver.h"
 #include "irrString.h"
 #include "ISceneManager.h"
-#include "os.h"
 
 namespace irr
 {

source/Irrlicht/CQuake3ShaderSceneNode.cpp

@@ -13,7 +13,6 @@
 #include "SViewFrustum.h"
 #include "IMeshManipulator.h"
 #include "SMesh.h"
-#include "IMaterialRenderer.h"
 #ifdef _IRR_COMPILE_WITH_SHADOW_VOLUME_SCENENODE_
 #include "CShadowVolumeSceneNode.h"
 #else

source/Irrlicht/CQuake3ShaderSceneNode.h

@@ -8,8 +8,7 @@
 #include "IMeshSceneNode.h"
 #include "IQ3Shader.h"
 #include "IFileSystem.h"
-#include "SMeshBuffer.h"
+#include "CMeshBuffer.h"
-#include "SMeshBufferLightMap.h"
 #include "SMesh.h"
 #include "ISceneManager.h"
 

source/Irrlicht/CSMFMeshFileLoader.cpp

@@ -9,7 +9,7 @@
 #include "CSMFMeshFileLoader.h"
 #include "CMeshTextureLoader.h"
 #include "SAnimatedMesh.h"
-#include "SMeshBuffer.h"
+#include "CMeshBuffer.h"
 #include "IReadFile.h"
 #include "coreutil.h"
 #include "os.h"

source/Irrlicht/CSTLMeshWriter.h

@@ -6,7 +6,7 @@
 #define IRR_STL_MESH_WRITER_H_INCLUDED
 
 #include "IMeshWriter.h"
-#include "S3DVertex.h"
+#include "vector3d.h"
 #include "irrString.h"
 
 namespace irr

source/Irrlicht/CSceneCollisionManager.cpp

@@ -8,7 +8,6 @@
 #include "ITriangleSelector.h"
 #include "SViewFrustum.h"
 
-#include "os.h"
 #include "irrMath.h"
 
 namespace irr

source/Irrlicht/CSceneLoaderIrr.cpp

@@ -3,7 +3,6 @@
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
 #include "CSceneLoaderIrr.h"
-#include "ISceneNodeAnimatorFactory.h"
 #include "ISceneUserDataSerializer.h"
 #include "ISceneManager.h"
 #include "ISceneNode.h"

source/Irrlicht/CSceneManager.cpp

@@ -12,7 +12,6 @@
 #include "IXMLWriter.h"
 #include "ISceneUserDataSerializer.h"
 #include "IGUIEnvironment.h"
-#include "IMaterialRenderer.h"
 #include "IReadFile.h"
 #include "IWriteFile.h"
 #include "ISceneLoader.h"

source/Irrlicht/CSceneNodeAnimatorCameraFPS.h

@@ -6,7 +6,6 @@
 #define IRR_C_SCENE_NODE_ANIMATOR_CAMERA_FPS_H_INCLUDED
 
 #include "ISceneNodeAnimatorCameraFPS.h"
-#include "vector2d.h"
 #include "position2d.h"
 #include "SKeyMap.h"
 #include "irrArray.h"

source/Irrlicht/CSceneNodeAnimatorCameraMaya.h

@@ -7,7 +7,7 @@
 
 #include "ISceneNodeAnimatorCameraMaya.h"
 #include "ICameraSceneNode.h"
-#include "vector2d.h"
+#include "position2d.h"
 
 namespace irr
 {

source/Irrlicht/CSkinnedMesh.h

@@ -8,10 +8,6 @@
 #define IRR_C_SKINNED_MESH_H_INCLUDED
 
 #include "ISkinnedMesh.h"
-#include "SMeshBuffer.h"
-#include "S3DVertex.h"
-#include "irrString.h"
-#include "matrix4.h"
 #include "quaternion.h"
 
 namespace irr

source/Irrlicht/CSkyBoxSceneNode.cpp

@@ -7,7 +7,6 @@
 #include "ISceneManager.h"
 #include "ICameraSceneNode.h"
 #include "S3DVertex.h"
-#include "os.h"
 
 namespace irr
 {

source/Irrlicht/CSkyDomeSceneNode.cpp

@@ -9,8 +9,6 @@
 #include "IVideoDriver.h"
 #include "ISceneManager.h"
 #include "ICameraSceneNode.h"
-#include "IAnimatedMesh.h"
-#include "os.h"
 
 namespace irr
 {

source/Irrlicht/CSkyDomeSceneNode.h

@@ -7,7 +7,7 @@
 #define IRR_C_SKY_DOME_SCENE_NODE_H_INCLUDED
 
 #include "ISceneNode.h"
-#include "SMeshBuffer.h"
+#include "CMeshBuffer.h"
 
 namespace irr
 {

source/Irrlicht/CSphereSceneNode.cpp

@@ -7,8 +7,6 @@
 #include "CSphereSceneNode.h"
 #include "IVideoDriver.h"
 #include "ISceneManager.h"
-#include "S3DVertex.h"
-#include "os.h"
 #ifdef _IRR_COMPILE_WITH_SHADOW_VOLUME_SCENENODE_
 #include "CShadowVolumeSceneNode.h"
 #else

source/Irrlicht/CTerrainSceneNode.cpp

@@ -19,11 +19,8 @@
 #include "SViewFrustum.h"
 #include "irrMath.h"
 #include "os.h"
-#include "IGUIFont.h"
 #include "IFileSystem.h"
 #include "IReadFile.h"
-#include "ITextSceneNode.h"
-#include "IAnimatedMesh.h"
 #include "SMesh.h"
 #include "CDynamicMeshBuffer.h"
 

source/Irrlicht/CTextSceneNode.cpp

@@ -7,7 +7,7 @@
 #include "IVideoDriver.h"
 #include "ICameraSceneNode.h"
 #include "IGUISpriteBank.h"
-#include "SMeshBuffer.h"
+#include "CMeshBuffer.h"
 #include "os.h"
 
 

source/Irrlicht/CVolumeLightSceneNode.cpp

@@ -5,8 +5,6 @@
 #include "CVolumeLightSceneNode.h"
 #include "IVideoDriver.h"
 #include "ISceneManager.h"
-#include "S3DVertex.h"
-#include "os.h"
 
 namespace irr
 {