From ce1cdd2543b1a9b5b86c82fb0fba2965a441c13b Mon Sep 17 00:00:00 2001 From: cutealien Date: Mon, 14 Aug 2023 22:01:22 +0000 Subject: [PATCH] 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 | 2 +- source/Irrlicht/CAnimatedMeshHalfLife.cpp | 2 +- source/Irrlicht/CAnimatedMeshMD2.cpp | 1 - source/Irrlicht/CAnimatedMeshMD2.h | 2 -- source/Irrlicht/CAnimatedMeshMD3.h | 5 +---- source/Irrlicht/CB3DMeshFileLoader.cpp | 1 - source/Irrlicht/CB3DMeshWriter.cpp | 3 +-- source/Irrlicht/CB3DMeshWriter.h | 3 --- source/Irrlicht/CBSPMeshFileLoader.h | 1 - source/Irrlicht/CBillboardSceneNode.cpp | 1 - source/Irrlicht/CBillboardSceneNode.h | 2 +- source/Irrlicht/CCSMLoader.cpp | 2 +- source/Irrlicht/CCSMLoader.h | 2 -- source/Irrlicht/CColladaFileLoader.cpp | 2 ++ source/Irrlicht/CColladaFileLoader.h | 3 +-- source/Irrlicht/CColladaMeshWriter.cpp | 1 - source/Irrlicht/CCubeSceneNode.cpp | 3 --- source/Irrlicht/CCubeSceneNode.h | 2 +- source/Irrlicht/CDMFLoader.cpp | 3 ++- source/Irrlicht/CDMFLoader.h | 3 --- source/Irrlicht/CGeometryCreator.cpp | 2 -- source/Irrlicht/CGeometryCreator.h | 2 +- source/Irrlicht/CIrrMeshFileLoader.cpp | 4 ++-- source/Irrlicht/CIrrMeshFileLoader.h | 4 ---- source/Irrlicht/CLMTSMeshFileLoader.cpp | 5 ++--- source/Irrlicht/CLWOMeshFileLoader.h | 2 +- source/Irrlicht/CMD2MeshFileLoader.cpp | 2 ++ source/Irrlicht/CMD3MeshFileLoader.cpp | 2 +- source/Irrlicht/CMD3MeshFileLoader.h | 3 --- source/Irrlicht/CMY3DMeshFileLoader.cpp | 2 +- source/Irrlicht/CMY3DMeshFileLoader.h | 3 +-- source/Irrlicht/CMeshSceneNode.cpp | 3 --- source/Irrlicht/COBJMeshFileLoader.cpp | 1 - source/Irrlicht/COBJMeshWriter.cpp | 2 -- source/Irrlicht/COCTLoader.cpp | 3 ++- source/Irrlicht/COCTLoader.h | 2 -- source/Irrlicht/COgreMeshFileLoader.cpp | 3 ++- source/Irrlicht/COgreMeshFileLoader.h | 6 +----- source/Irrlicht/CParticleGravityAffector.cpp | 1 - source/Irrlicht/CParticleGravityAffector.h | 1 - source/Irrlicht/CParticleMeshEmitter.cpp | 1 + source/Irrlicht/CParticleMeshEmitter.h | 3 +-- source/Irrlicht/CParticlePointEmitter.h | 1 - source/Irrlicht/CParticleSphereEmitter.h | 1 - source/Irrlicht/CParticleSystemSceneNode.h | 2 +- source/Irrlicht/CQ3LevelMesh.cpp | 2 -- source/Irrlicht/CQ3LevelMesh.h | 3 +-- source/Irrlicht/CQuake3ShaderSceneNode.cpp | 1 - source/Irrlicht/CQuake3ShaderSceneNode.h | 3 +-- source/Irrlicht/CSMFMeshFileLoader.cpp | 2 +- source/Irrlicht/CSTLMeshWriter.h | 2 +- source/Irrlicht/CSceneCollisionManager.cpp | 1 - source/Irrlicht/CSceneLoaderIrr.cpp | 1 - source/Irrlicht/CSceneManager.cpp | 1 - source/Irrlicht/CSceneNodeAnimatorCameraFPS.h | 1 - source/Irrlicht/CSceneNodeAnimatorCameraMaya.h | 2 +- source/Irrlicht/CSkinnedMesh.h | 4 ---- source/Irrlicht/CSkyBoxSceneNode.cpp | 1 - source/Irrlicht/CSkyDomeSceneNode.cpp | 2 -- source/Irrlicht/CSkyDomeSceneNode.h | 2 +- source/Irrlicht/CSphereSceneNode.cpp | 2 -- source/Irrlicht/CTerrainSceneNode.cpp | 3 --- source/Irrlicht/CTextSceneNode.cpp | 2 +- source/Irrlicht/CVolumeLightSceneNode.cpp | 2 -- 64 files changed, 38 insertions(+), 104 deletions(-) diff --git a/source/Irrlicht/C3DSMeshFileLoader.cpp b/source/Irrlicht/C3DSMeshFileLoader.cpp index f73bbf1c..046c7de1 100644 --- a/source/Irrlicht/C3DSMeshFileLoader.cpp +++ b/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" diff --git a/source/Irrlicht/CAnimatedMeshHalfLife.cpp b/source/Irrlicht/CAnimatedMeshHalfLife.cpp index 4d03677c..f9d9a925 100644 --- a/source/Irrlicht/CAnimatedMeshHalfLife.cpp +++ b/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" diff --git a/source/Irrlicht/CAnimatedMeshMD2.cpp b/source/Irrlicht/CAnimatedMeshMD2.cpp index b97417ae..3764d372 100644 --- a/source/Irrlicht/CAnimatedMeshMD2.cpp +++ b/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 diff --git a/source/Irrlicht/CAnimatedMeshMD2.h b/source/Irrlicht/CAnimatedMeshMD2.h index 04e0fa5d..6bcf9fa1 100644 --- a/source/Irrlicht/CAnimatedMeshMD2.h +++ b/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" diff --git a/source/Irrlicht/CAnimatedMeshMD3.h b/source/Irrlicht/CAnimatedMeshMD3.h index bea2ea98..bf59b448 100644 --- a/source/Irrlicht/CAnimatedMeshMD3.h +++ b/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 "IQ3Shader.h" +#include "CMeshBuffer.h" namespace irr { diff --git a/source/Irrlicht/CB3DMeshFileLoader.cpp b/source/Irrlicht/CB3DMeshFileLoader.cpp index 4323af3f..3e4a0c11 100644 --- a/source/Irrlicht/CB3DMeshFileLoader.cpp +++ b/source/Irrlicht/CB3DMeshFileLoader.cpp @@ -14,7 +14,6 @@ #include "IVideoDriver.h" #include "IAttributes.h" -#include "IFileSystem.h" #include "os.h" #ifdef _DEBUG diff --git a/source/Irrlicht/CB3DMeshWriter.cpp b/source/Irrlicht/CB3DMeshWriter.cpp index 92c297aa..68c0b9f8 100644 --- a/source/Irrlicht/CB3DMeshWriter.cpp +++ b/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" diff --git a/source/Irrlicht/CB3DMeshWriter.h b/source/Irrlicht/CB3DMeshWriter.h index 48fe5395..e856d06b 100644 --- a/source/Irrlicht/CB3DMeshWriter.h +++ b/source/Irrlicht/CB3DMeshWriter.h @@ -9,11 +9,8 @@ #include "IMeshWriter.h" #include "IWriteFile.h" -#include "SB3DStructs.h" #include "ISkinnedMesh.h" - - namespace irr { namespace scene diff --git a/source/Irrlicht/CBSPMeshFileLoader.h b/source/Irrlicht/CBSPMeshFileLoader.h index f9adab72..aa8febff 100644 --- a/source/Irrlicht/CBSPMeshFileLoader.h +++ b/source/Irrlicht/CBSPMeshFileLoader.h @@ -7,7 +7,6 @@ #include "IMeshLoader.h" #include "IFileSystem.h" -#include "IVideoDriver.h" #include "ISceneManager.h" #include "IQ3Shader.h" diff --git a/source/Irrlicht/CBillboardSceneNode.cpp b/source/Irrlicht/CBillboardSceneNode.cpp index ed5cf97a..1edb3e80 100644 --- a/source/Irrlicht/CBillboardSceneNode.cpp +++ b/source/Irrlicht/CBillboardSceneNode.cpp @@ -8,7 +8,6 @@ #include "IVideoDriver.h" #include "ISceneManager.h" #include "ICameraSceneNode.h" -#include "os.h" namespace irr { diff --git a/source/Irrlicht/CBillboardSceneNode.h b/source/Irrlicht/CBillboardSceneNode.h index 2e7379ee..48c39f69 100644 --- a/source/Irrlicht/CBillboardSceneNode.h +++ b/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 { diff --git a/source/Irrlicht/CCSMLoader.cpp b/source/Irrlicht/CCSMLoader.cpp index d560311c..036be4de 100644 --- a/source/Irrlicht/CCSMLoader.cpp +++ b/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_ diff --git a/source/Irrlicht/CCSMLoader.h b/source/Irrlicht/CCSMLoader.h index 50ee9748..f113e18f 100644 --- a/source/Irrlicht/CCSMLoader.h +++ b/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" diff --git a/source/Irrlicht/CColladaFileLoader.cpp b/source/Irrlicht/CColladaFileLoader.cpp index cec931f8..3b92ab18 100644 --- a/source/Irrlicht/CColladaFileLoader.cpp +++ b/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 diff --git a/source/Irrlicht/CColladaFileLoader.h b/source/Irrlicht/CColladaFileLoader.h index e3cd69e4..6bf909b1 100644 --- a/source/Irrlicht/CColladaFileLoader.h +++ b/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 { diff --git a/source/Irrlicht/CColladaMeshWriter.cpp b/source/Irrlicht/CColladaMeshWriter.cpp index 91a0a235..a7db080d 100644 --- a/source/Irrlicht/CColladaMeshWriter.cpp +++ b/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" diff --git a/source/Irrlicht/CCubeSceneNode.cpp b/source/Irrlicht/CCubeSceneNode.cpp index a72d3be5..5bf33c96 100644 --- a/source/Irrlicht/CCubeSceneNode.cpp +++ b/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 diff --git a/source/Irrlicht/CCubeSceneNode.h b/source/Irrlicht/CCubeSceneNode.h index fc276c2e..adaa888e 100644 --- a/source/Irrlicht/CCubeSceneNode.h +++ b/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 diff --git a/source/Irrlicht/CDMFLoader.cpp b/source/Irrlicht/CDMFLoader.cpp index 0e42363a..1113cdc7 100644 --- a/source/Irrlicht/CDMFLoader.cpp +++ b/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 diff --git a/source/Irrlicht/CDMFLoader.h b/source/Irrlicht/CDMFLoader.h index bf82b392..101f4244 100644 --- a/source/Irrlicht/CDMFLoader.h +++ b/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 { diff --git a/source/Irrlicht/CGeometryCreator.cpp b/source/Irrlicht/CGeometryCreator.cpp index 4d8da4f0..4c793b60 100644 --- a/source/Irrlicht/CGeometryCreator.cpp +++ b/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" diff --git a/source/Irrlicht/CGeometryCreator.h b/source/Irrlicht/CGeometryCreator.h index 79ba6ee2..25d4f041 100644 --- a/source/Irrlicht/CGeometryCreator.h +++ b/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 { diff --git a/source/Irrlicht/CIrrMeshFileLoader.cpp b/source/Irrlicht/CIrrMeshFileLoader.cpp index 84754eae..10fad47a 100644 --- a/source/Irrlicht/CIrrMeshFileLoader.cpp +++ b/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 { diff --git a/source/Irrlicht/CIrrMeshFileLoader.h b/source/Irrlicht/CIrrMeshFileLoader.h index 90ace996..921266c7 100644 --- a/source/Irrlicht/CIrrMeshFileLoader.h +++ b/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" diff --git a/source/Irrlicht/CLMTSMeshFileLoader.cpp b/source/Irrlicht/CLMTSMeshFileLoader.cpp index b972ec51..dd33450b 100644 --- a/source/Irrlicht/CLMTSMeshFileLoader.cpp +++ b/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 diff --git a/source/Irrlicht/CLWOMeshFileLoader.h b/source/Irrlicht/CLWOMeshFileLoader.h index edcd7e88..a3fca8a5 100644 --- a/source/Irrlicht/CLWOMeshFileLoader.h +++ b/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 diff --git a/source/Irrlicht/CMD2MeshFileLoader.cpp b/source/Irrlicht/CMD2MeshFileLoader.cpp index 78136e75..326a60c8 100644 --- a/source/Irrlicht/CMD2MeshFileLoader.cpp +++ b/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 diff --git a/source/Irrlicht/CMD3MeshFileLoader.cpp b/source/Irrlicht/CMD3MeshFileLoader.cpp index 68f8d80d..5fe4abda 100644 --- a/source/Irrlicht/CMD3MeshFileLoader.cpp +++ b/source/Irrlicht/CMD3MeshFileLoader.cpp @@ -7,7 +7,7 @@ #include "CMD3MeshFileLoader.h" #include "CAnimatedMeshMD3.h" -#include "irrString.h" +#include "IVideoDriver.h" namespace irr { diff --git a/source/Irrlicht/CMD3MeshFileLoader.h b/source/Irrlicht/CMD3MeshFileLoader.h index d6778577..05cf0951 100644 --- a/source/Irrlicht/CMD3MeshFileLoader.h +++ b/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 { diff --git a/source/Irrlicht/CMY3DMeshFileLoader.cpp b/source/Irrlicht/CMY3DMeshFileLoader.cpp index 91a01248..b4d55f72 100644 --- a/source/Irrlicht/CMY3DMeshFileLoader.cpp +++ b/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" diff --git a/source/Irrlicht/CMY3DMeshFileLoader.h b/source/Irrlicht/CMY3DMeshFileLoader.h index b2160e83..ae119e3c 100644 --- a/source/Irrlicht/CMY3DMeshFileLoader.h +++ b/source/Irrlicht/CMY3DMeshFileLoader.h @@ -29,8 +29,7 @@ #include "IMeshLoader.h" -#include "SMesh.h" -#include "SMeshBufferLightMap.h" +#include "CMeshBuffer.h" #include "IFileSystem.h" #include "IVideoDriver.h" #include "irrString.h" diff --git a/source/Irrlicht/CMeshSceneNode.cpp b/source/Irrlicht/CMeshSceneNode.cpp index c3176048..cd7bbe82 100644 --- a/source/Irrlicht/CMeshSceneNode.cpp +++ b/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" diff --git a/source/Irrlicht/COBJMeshFileLoader.cpp b/source/Irrlicht/COBJMeshFileLoader.cpp index 369f6f2d..70a46aef 100644 --- a/source/Irrlicht/COBJMeshFileLoader.cpp +++ b/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" diff --git a/source/Irrlicht/COBJMeshWriter.cpp b/source/Irrlicht/COBJMeshWriter.cpp index 7c1232ec..b9a60e46 100644 --- a/source/Irrlicht/COBJMeshWriter.cpp +++ b/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" diff --git a/source/Irrlicht/COCTLoader.cpp b/source/Irrlicht/COCTLoader.cpp index c09120e4..34102297 100644 --- a/source/Irrlicht/COCTLoader.cpp +++ b/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" diff --git a/source/Irrlicht/COCTLoader.h b/source/Irrlicht/COCTLoader.h index 98acdcbf..2e4e9721 100644 --- a/source/Irrlicht/COCTLoader.h +++ b/source/Irrlicht/COCTLoader.h @@ -45,8 +45,6 @@ #include "IMeshLoader.h" #include "IReadFile.h" -#include "SMesh.h" -#include "irrString.h" namespace irr { diff --git a/source/Irrlicht/COgreMeshFileLoader.cpp b/source/Irrlicht/COgreMeshFileLoader.cpp index 9df20871..8246062d 100644 --- a/source/Irrlicht/COgreMeshFileLoader.cpp +++ b/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" diff --git a/source/Irrlicht/COgreMeshFileLoader.h b/source/Irrlicht/COgreMeshFileLoader.h index facab78d..7f8275eb 100644 --- a/source/Irrlicht/COgreMeshFileLoader.h +++ b/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 diff --git a/source/Irrlicht/CParticleGravityAffector.cpp b/source/Irrlicht/CParticleGravityAffector.cpp index 1938a542..d4a6918f 100644 --- a/source/Irrlicht/CParticleGravityAffector.cpp +++ b/source/Irrlicht/CParticleGravityAffector.cpp @@ -6,7 +6,6 @@ #ifdef _IRR_COMPILE_WITH_PARTICLES_ -#include "os.h" #include "IAttributes.h" namespace irr diff --git a/source/Irrlicht/CParticleGravityAffector.h b/source/Irrlicht/CParticleGravityAffector.h index d3bd6196..0d31cddf 100644 --- a/source/Irrlicht/CParticleGravityAffector.h +++ b/source/Irrlicht/CParticleGravityAffector.h @@ -9,7 +9,6 @@ #ifdef _IRR_COMPILE_WITH_PARTICLES_ #include "IParticleGravityAffector.h" -#include "SColor.h" namespace irr { diff --git a/source/Irrlicht/CParticleMeshEmitter.cpp b/source/Irrlicht/CParticleMeshEmitter.cpp index ef667c52..5fa0463d 100644 --- a/source/Irrlicht/CParticleMeshEmitter.cpp +++ b/source/Irrlicht/CParticleMeshEmitter.cpp @@ -8,6 +8,7 @@ #ifdef _IRR_COMPILE_WITH_PARTICLES_ #include "os.h" +#include "IMeshBuffer.h" namespace irr { diff --git a/source/Irrlicht/CParticleMeshEmitter.h b/source/Irrlicht/CParticleMeshEmitter.h index 2863c939..90ddb52f 100644 --- a/source/Irrlicht/CParticleMeshEmitter.h +++ b/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 { diff --git a/source/Irrlicht/CParticlePointEmitter.h b/source/Irrlicht/CParticlePointEmitter.h index c88645d2..c4bddb66 100644 --- a/source/Irrlicht/CParticlePointEmitter.h +++ b/source/Irrlicht/CParticlePointEmitter.h @@ -9,7 +9,6 @@ #ifdef _IRR_COMPILE_WITH_PARTICLES_ #include "IParticleEmitter.h" -#include "irrArray.h" namespace irr { diff --git a/source/Irrlicht/CParticleSphereEmitter.h b/source/Irrlicht/CParticleSphereEmitter.h index 96060fcd..25a25569 100644 --- a/source/Irrlicht/CParticleSphereEmitter.h +++ b/source/Irrlicht/CParticleSphereEmitter.h @@ -10,7 +10,6 @@ #include "IParticleSphereEmitter.h" #include "irrArray.h" -#include "aabbox3d.h" namespace irr { diff --git a/source/Irrlicht/CParticleSystemSceneNode.h b/source/Irrlicht/CParticleSystemSceneNode.h index 1510549d..d3d84884 100644 --- a/source/Irrlicht/CParticleSystemSceneNode.h +++ b/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 { diff --git a/source/Irrlicht/CQ3LevelMesh.cpp b/source/Irrlicht/CQ3LevelMesh.cpp index ca7d96ec..1e720c4c 100644 --- a/source/Irrlicht/CQ3LevelMesh.cpp +++ b/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" diff --git a/source/Irrlicht/CQ3LevelMesh.h b/source/Irrlicht/CQ3LevelMesh.h index a6045d9a..a9feaeb8 100644 --- a/source/Irrlicht/CQ3LevelMesh.h +++ b/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 { diff --git a/source/Irrlicht/CQuake3ShaderSceneNode.cpp b/source/Irrlicht/CQuake3ShaderSceneNode.cpp index 972f131d..7efeab9f 100644 --- a/source/Irrlicht/CQuake3ShaderSceneNode.cpp +++ b/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 diff --git a/source/Irrlicht/CQuake3ShaderSceneNode.h b/source/Irrlicht/CQuake3ShaderSceneNode.h index 6b9948e7..9afba59f 100644 --- a/source/Irrlicht/CQuake3ShaderSceneNode.h +++ b/source/Irrlicht/CQuake3ShaderSceneNode.h @@ -8,8 +8,7 @@ #include "IMeshSceneNode.h" #include "IQ3Shader.h" #include "IFileSystem.h" -#include "SMeshBuffer.h" -#include "SMeshBufferLightMap.h" +#include "CMeshBuffer.h" #include "SMesh.h" #include "ISceneManager.h" diff --git a/source/Irrlicht/CSMFMeshFileLoader.cpp b/source/Irrlicht/CSMFMeshFileLoader.cpp index d6ddb133..b0830319 100644 --- a/source/Irrlicht/CSMFMeshFileLoader.cpp +++ b/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" diff --git a/source/Irrlicht/CSTLMeshWriter.h b/source/Irrlicht/CSTLMeshWriter.h index 58974f30..463cfbd3 100644 --- a/source/Irrlicht/CSTLMeshWriter.h +++ b/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 diff --git a/source/Irrlicht/CSceneCollisionManager.cpp b/source/Irrlicht/CSceneCollisionManager.cpp index 78ba1318..cdbd7ebc 100644 --- a/source/Irrlicht/CSceneCollisionManager.cpp +++ b/source/Irrlicht/CSceneCollisionManager.cpp @@ -8,7 +8,6 @@ #include "ITriangleSelector.h" #include "SViewFrustum.h" -#include "os.h" #include "irrMath.h" namespace irr diff --git a/source/Irrlicht/CSceneLoaderIrr.cpp b/source/Irrlicht/CSceneLoaderIrr.cpp index 8e97581a..4d1f111e 100644 --- a/source/Irrlicht/CSceneLoaderIrr.cpp +++ b/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" diff --git a/source/Irrlicht/CSceneManager.cpp b/source/Irrlicht/CSceneManager.cpp index 6255cfe1..93dd9199 100644 --- a/source/Irrlicht/CSceneManager.cpp +++ b/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" diff --git a/source/Irrlicht/CSceneNodeAnimatorCameraFPS.h b/source/Irrlicht/CSceneNodeAnimatorCameraFPS.h index c85dd4b9..a4cede49 100644 --- a/source/Irrlicht/CSceneNodeAnimatorCameraFPS.h +++ b/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" diff --git a/source/Irrlicht/CSceneNodeAnimatorCameraMaya.h b/source/Irrlicht/CSceneNodeAnimatorCameraMaya.h index 9b3993d3..07a6d5f0 100644 --- a/source/Irrlicht/CSceneNodeAnimatorCameraMaya.h +++ b/source/Irrlicht/CSceneNodeAnimatorCameraMaya.h @@ -7,7 +7,7 @@ #include "ISceneNodeAnimatorCameraMaya.h" #include "ICameraSceneNode.h" -#include "vector2d.h" +#include "position2d.h" namespace irr { diff --git a/source/Irrlicht/CSkinnedMesh.h b/source/Irrlicht/CSkinnedMesh.h index 9dbb60c6..7e246b1c 100644 --- a/source/Irrlicht/CSkinnedMesh.h +++ b/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 diff --git a/source/Irrlicht/CSkyBoxSceneNode.cpp b/source/Irrlicht/CSkyBoxSceneNode.cpp index 2ad3fe6e..c28bc37a 100644 --- a/source/Irrlicht/CSkyBoxSceneNode.cpp +++ b/source/Irrlicht/CSkyBoxSceneNode.cpp @@ -7,7 +7,6 @@ #include "ISceneManager.h" #include "ICameraSceneNode.h" #include "S3DVertex.h" -#include "os.h" namespace irr { diff --git a/source/Irrlicht/CSkyDomeSceneNode.cpp b/source/Irrlicht/CSkyDomeSceneNode.cpp index 7cf81f39..f4ca022a 100644 --- a/source/Irrlicht/CSkyDomeSceneNode.cpp +++ b/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 { diff --git a/source/Irrlicht/CSkyDomeSceneNode.h b/source/Irrlicht/CSkyDomeSceneNode.h index 68d8c081..d17925d9 100644 --- a/source/Irrlicht/CSkyDomeSceneNode.h +++ b/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 { diff --git a/source/Irrlicht/CSphereSceneNode.cpp b/source/Irrlicht/CSphereSceneNode.cpp index 1693f5e2..0592588f 100644 --- a/source/Irrlicht/CSphereSceneNode.cpp +++ b/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 diff --git a/source/Irrlicht/CTerrainSceneNode.cpp b/source/Irrlicht/CTerrainSceneNode.cpp index 0dbb96a9..08cd0779 100644 --- a/source/Irrlicht/CTerrainSceneNode.cpp +++ b/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" diff --git a/source/Irrlicht/CTextSceneNode.cpp b/source/Irrlicht/CTextSceneNode.cpp index e97dc913..a4f83fb8 100644 --- a/source/Irrlicht/CTextSceneNode.cpp +++ b/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" diff --git a/source/Irrlicht/CVolumeLightSceneNode.cpp b/source/Irrlicht/CVolumeLightSceneNode.cpp index 720c3607..47df2931 100644 --- a/source/Irrlicht/CVolumeLightSceneNode.cpp +++ b/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 {