From 27db3a6a0c7bf73d51eb6eedd7e2cdb5d7aff3b1 Mon Sep 17 00:00:00 2001 From: cutealien Date: Thu, 29 Jul 2021 18:50:03 +0000 Subject: [PATCH] Make sure all headers in include can be compiled independently Also adding some to VS2010 project file (for better project search) Some empty line removal. git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@6228 dfc29bdd-3216-0410-991c-e03cc46cb475 --- include/EGUIAlignment.h | 3 ++- include/IIndexBuffer.h | 2 +- include/ILightManager.h | 3 ++- include/IVertexBuffer.h | 1 + include/SLight.h | 2 +- include/SVertexManipulator.h | 1 + include/SceneParameters.h | 2 ++ source/Irrlicht/Irrlicht10.0.vcxproj | 2 ++ source/Irrlicht/Irrlicht10.0.vcxproj.filters | 6 ++++++ 9 files changed, 18 insertions(+), 4 deletions(-) diff --git a/include/EGUIAlignment.h b/include/EGUIAlignment.h index 85f81b46..4876503b 100644 --- a/include/EGUIAlignment.h +++ b/include/EGUIAlignment.h @@ -5,6 +5,8 @@ #ifndef __E_GUI_ALIGNMENT_H_INCLUDED__ #define __E_GUI_ALIGNMENT_H_INCLUDED__ +#include "irrTypes.h" + namespace irr { namespace gui @@ -35,4 +37,3 @@ const c8* const GUIAlignmentNames[] = } // namespace irr #endif // __E_GUI_ALIGNMENT_H_INCLUDED__ - diff --git a/include/IIndexBuffer.h b/include/IIndexBuffer.h index 5599b0fb..6aee1a1d 100644 --- a/include/IIndexBuffer.h +++ b/include/IIndexBuffer.h @@ -7,7 +7,7 @@ #include "IReferenceCounted.h" #include "irrArray.h" - +#include "EHardwareBufferFlags.h" #include "SVertexIndex.h" namespace irr diff --git a/include/ILightManager.h b/include/ILightManager.h index ff667983..297e981b 100644 --- a/include/ILightManager.h +++ b/include/ILightManager.h @@ -8,12 +8,13 @@ #include "IReferenceCounted.h" #include "irrArray.h" +#include "ISceneManager.h" // for E_SCENE_NODE_RENDER_PASS, could probably move that to own header? namespace irr { namespace scene { - class ILightSceneNode; + class ISceneNode; //! ILightManager provides an interface for user applications to manipulate the list of lights in the scene. /** The light list can be trimmed or re-ordered before device/ hardware diff --git a/include/IVertexBuffer.h b/include/IVertexBuffer.h index 87603dea..8467d7c7 100644 --- a/include/IVertexBuffer.h +++ b/include/IVertexBuffer.h @@ -7,6 +7,7 @@ #include "IReferenceCounted.h" #include "irrArray.h" +#include "EHardwareBufferFlags.h" #include "S3DVertex.h" namespace irr diff --git a/include/SLight.h b/include/SLight.h index 60df5f6b..8f725945 100644 --- a/include/SLight.h +++ b/include/SLight.h @@ -6,6 +6,7 @@ #define __S_LIGHT_H_INCLUDED__ #include "SColor.h" +#include "vector3d.h" namespace irr { @@ -98,4 +99,3 @@ struct SLight } // end namespace irr #endif - diff --git a/include/SVertexManipulator.h b/include/SVertexManipulator.h index 3fda59de..3cb1477c 100644 --- a/include/SVertexManipulator.h +++ b/include/SVertexManipulator.h @@ -5,6 +5,7 @@ #ifndef __S_VERTEX_MANIPULATOR_H_INCLUDED__ #define __S_VERTEX_MANIPULATOR_H_INCLUDED__ +#include "matrix4.h" #include "S3DVertex.h" #include "SColor.h" diff --git a/include/SceneParameters.h b/include/SceneParameters.h index 4e246902..6e2aaced 100644 --- a/include/SceneParameters.h +++ b/include/SceneParameters.h @@ -5,6 +5,8 @@ #ifndef __I_SCENE_PARAMETERS_H_INCLUDED__ #define __I_SCENE_PARAMETERS_H_INCLUDED__ +#include "irrTypes.h" + /*! \file SceneParameters.h \brief Header file containing all scene parameters for modifying mesh loading etc. diff --git a/source/Irrlicht/Irrlicht10.0.vcxproj b/source/Irrlicht/Irrlicht10.0.vcxproj index 9426f97a..7da2e07f 100644 --- a/source/Irrlicht/Irrlicht10.0.vcxproj +++ b/source/Irrlicht/Irrlicht10.0.vcxproj @@ -844,6 +844,7 @@ + @@ -896,6 +897,7 @@ + diff --git a/source/Irrlicht/Irrlicht10.0.vcxproj.filters b/source/Irrlicht/Irrlicht10.0.vcxproj.filters index 81224687..af995b0e 100644 --- a/source/Irrlicht/Irrlicht10.0.vcxproj.filters +++ b/source/Irrlicht/Irrlicht10.0.vcxproj.filters @@ -1369,6 +1369,12 @@ include\core + + include\scene + + + include\scene +