diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2023-06-13 16:56:21 +0200 |
---|---|---|
committer | Rémi Verschelde <rverschelde@gmail.com> | 2023-06-15 14:35:45 +0200 |
commit | 25b2f1780a9c7d7ae5579cc87c89b0c7e2baa14d (patch) | |
tree | 40d2d50d34c175da3b7c5123e8918cc5816bd32b /modules/lightmapper_rd | |
parent | 773414606079fa745d1c37fce49324ab6a09e972 (diff) | |
download | redot-engine-25b2f1780a9c7d7ae5579cc87c89b0c7e2baa14d.tar.gz |
Style: Harmonize header includes in modules
This applies our existing style guide, and adds a new rule to that style
guide for modular components such as platform ports and modules:
Includes from the platform port or module ("local" includes) should be listed
first in their own block using relative paths, before Godot's "core" includes
which use "absolute" (project folder relative) paths, and finally thirdparty
includes.
Includes in `#ifdef`s come after their relevant section, i.e. the overall
structure is:
- Local includes
* Conditional local includes
- Core includes
* Conditional core includes
- Thirdparty includes
* Conditional thirdparty includes
Diffstat (limited to 'modules/lightmapper_rd')
-rw-r--r-- | modules/lightmapper_rd/lightmapper_rd.cpp | 5 | ||||
-rw-r--r-- | modules/lightmapper_rd/register_types.cpp | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/modules/lightmapper_rd/lightmapper_rd.cpp b/modules/lightmapper_rd/lightmapper_rd.cpp index bcb32d77c3..748e8ae50c 100644 --- a/modules/lightmapper_rd/lightmapper_rd.cpp +++ b/modules/lightmapper_rd/lightmapper_rd.cpp @@ -30,11 +30,12 @@ #include "lightmapper_rd.h" -#include "core/config/project_settings.h" -#include "core/math/geometry_2d.h" #include "lm_blendseams.glsl.gen.h" #include "lm_compute.glsl.gen.h" #include "lm_raster.glsl.gen.h" + +#include "core/config/project_settings.h" +#include "core/math/geometry_2d.h" #include "servers/rendering/rendering_device_binds.h" //uncomment this if you want to see textures from all the process saved diff --git a/modules/lightmapper_rd/register_types.cpp b/modules/lightmapper_rd/register_types.cpp index af89aa167c..7ec4a40766 100644 --- a/modules/lightmapper_rd/register_types.cpp +++ b/modules/lightmapper_rd/register_types.cpp @@ -30,8 +30,9 @@ #include "register_types.h" -#include "core/config/project_settings.h" #include "lightmapper_rd.h" + +#include "core/config/project_settings.h" #include "scene/3d/lightmapper.h" #ifndef _3D_DISABLED |