From f0b9a1bcd9119cc0913d05f9e75723a9676705d0 Mon Sep 17 00:00:00 2001 From: SweetId <2630750+SweetId@users.noreply.github.com> Date: Fri, 24 Nov 2023 16:40:28 +0530 Subject: [PATCH] speed up compilation --- include/NazaraEditor/Core.hpp | 7 +------ include/NazaraEditor/Core/Application/Action.hpp | 6 +++--- .../Core/Application/BaseApplication.hpp | 15 +++++++-------- .../Core/Application/EditorLogger.hpp | 6 ++++-- .../NazaraEditor/Core/Application/Shortcut.hpp | 6 ++++-- .../Core/Components/CameraComponent.hpp | 2 +- .../Core/Components/NameComponent.hpp | 3 ++- include/NazaraEditor/Core/Config.hpp | 2 ++ include/NazaraEditor/Core/Reflection.hpp | 7 +++++++ include/NazaraEditor/Core/Reflection/Editor.hpp | 2 ++ .../NazaraEditor/Core/Systems/CameraSystem.hpp | 4 +++- include/NazaraEditor/Core/UI/PopupManager.hpp | 5 ++++- include/NazaraEditor/Core/UI/Window.hpp | 8 ++++---- include/NazaraEditor/Editor/Application.hpp | 2 +- include/NazaraEditor/Editor/UI/LevelWindow.hpp | 7 +++++-- .../Core/Application/Actions/EditorAction_Log.cpp | 2 ++ .../Core/Application/BaseApplication.cpp | 9 +++++++++ .../Core/Application/EditorLogger.cpp | 2 ++ src/NazaraEditor/Core/Application/Level.cpp | 5 ++++- .../Core/Components/CameraComponent.cpp | 3 +++ src/NazaraEditor/Core/UI/MainWindow.cpp | 2 ++ src/NazaraEditor/Editor/Application.cpp | 6 ++++++ src/NazaraEditor/Editor/UI/InspectorWindow.cpp | 3 +++ src/NazaraEditor/Editor/UI/LevelWindow.cpp | 2 +- src/NazaraEditor/Editor/UI/MainWindow.cpp | 4 ++++ src/NazaraEditor/Editor/main.cpp | 1 + 26 files changed, 87 insertions(+), 34 deletions(-) create mode 100644 include/NazaraEditor/Core/Reflection.hpp diff --git a/include/NazaraEditor/Core.hpp b/include/NazaraEditor/Core.hpp index 66dacca..51bcdc7 100644 --- a/include/NazaraEditor/Core.hpp +++ b/include/NazaraEditor/Core.hpp @@ -11,9 +11,4 @@ #include #include #include -#include -#include -#include -#include -#include -#include \ No newline at end of file +#include \ No newline at end of file diff --git a/include/NazaraEditor/Core/Application/Action.hpp b/include/NazaraEditor/Core/Application/Action.hpp index a164268..fa1d8fb 100644 --- a/include/NazaraEditor/Core/Application/Action.hpp +++ b/include/NazaraEditor/Core/Application/Action.hpp @@ -1,10 +1,8 @@ #pragma once -#include - +#include #include -#include #include #include @@ -12,6 +10,8 @@ namespace Nz { + class Texture; + class NAZARAEDITOR_CORE_API EditorAction { public: diff --git a/include/NazaraEditor/Core/Application/BaseApplication.hpp b/include/NazaraEditor/Core/Application/BaseApplication.hpp index ca5f82d..e2bd8c0 100644 --- a/include/NazaraEditor/Core/Application/BaseApplication.hpp +++ b/include/NazaraEditor/Core/Application/BaseApplication.hpp @@ -1,23 +1,22 @@ #pragma once -#include -#include -#include -#include -#include - -#include +#include #include #include #include #include #include #include -#include #include +#include +#include + namespace Nz { + class Camera; + class WindowSwapchain; + class NAZARAEDITOR_CORE_API EditorBaseApplication : public Nz::Application { diff --git a/include/NazaraEditor/Core/Application/EditorLogger.hpp b/include/NazaraEditor/Core/Application/EditorLogger.hpp index 310d0f7..66fbda9 100644 --- a/include/NazaraEditor/Core/Application/EditorLogger.hpp +++ b/include/NazaraEditor/Core/Application/EditorLogger.hpp @@ -1,7 +1,9 @@ #pragma once -#include -#include +#include + +#include +#include namespace Nz { diff --git a/include/NazaraEditor/Core/Application/Shortcut.hpp b/include/NazaraEditor/Core/Application/Shortcut.hpp index eaf24e5..c5f72d9 100644 --- a/include/NazaraEditor/Core/Application/Shortcut.hpp +++ b/include/NazaraEditor/Core/Application/Shortcut.hpp @@ -1,8 +1,10 @@ #pragma once -#include -#include +#include +#include + +#include #include namespace Nz diff --git a/include/NazaraEditor/Core/Components/CameraComponent.hpp b/include/NazaraEditor/Core/Components/CameraComponent.hpp index 7bd9c47..3318ba0 100644 --- a/include/NazaraEditor/Core/Components/CameraComponent.hpp +++ b/include/NazaraEditor/Core/Components/CameraComponent.hpp @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include diff --git a/include/NazaraEditor/Core/Components/NameComponent.hpp b/include/NazaraEditor/Core/Components/NameComponent.hpp index b272513..db20883 100644 --- a/include/NazaraEditor/Core/Components/NameComponent.hpp +++ b/include/NazaraEditor/Core/Components/NameComponent.hpp @@ -1,6 +1,6 @@ #pragma once -#include +#include #include @@ -34,4 +34,5 @@ namespace Nz std::string m_name; uint64_t m_flags; }; + } \ No newline at end of file diff --git a/include/NazaraEditor/Core/Config.hpp b/include/NazaraEditor/Core/Config.hpp index d38bff1..19199c9 100644 --- a/include/NazaraEditor/Core/Config.hpp +++ b/include/NazaraEditor/Core/Config.hpp @@ -1,5 +1,7 @@ #pragma once +#include + #ifndef NAZARAEDITOR_CORE_CONFIG_HPP #define NAZARAEDITOR_CORE_CONFIG_HPP diff --git a/include/NazaraEditor/Core/Reflection.hpp b/include/NazaraEditor/Core/Reflection.hpp new file mode 100644 index 0000000..5ab707b --- /dev/null +++ b/include/NazaraEditor/Core/Reflection.hpp @@ -0,0 +1,7 @@ +#pragma once + +#include +#include +#include +#include +#include \ No newline at end of file diff --git a/include/NazaraEditor/Core/Reflection/Editor.hpp b/include/NazaraEditor/Core/Reflection/Editor.hpp index 0cddaeb..d57c9eb 100644 --- a/include/NazaraEditor/Core/Reflection/Editor.hpp +++ b/include/NazaraEditor/Core/Reflection/Editor.hpp @@ -1,5 +1,7 @@ #pragma once +#include + #include #include diff --git a/include/NazaraEditor/Core/Systems/CameraSystem.hpp b/include/NazaraEditor/Core/Systems/CameraSystem.hpp index 92b844a..6678483 100644 --- a/include/NazaraEditor/Core/Systems/CameraSystem.hpp +++ b/include/NazaraEditor/Core/Systems/CameraSystem.hpp @@ -1,6 +1,8 @@ #pragma once -#include +#include + +#include #include #include diff --git a/include/NazaraEditor/Core/UI/PopupManager.hpp b/include/NazaraEditor/Core/UI/PopupManager.hpp index 208551d..3136880 100644 --- a/include/NazaraEditor/Core/UI/PopupManager.hpp +++ b/include/NazaraEditor/Core/UI/PopupManager.hpp @@ -1,8 +1,11 @@ #pragma once -#include +#include #include +#include + +#include #include #include diff --git a/include/NazaraEditor/Core/UI/Window.hpp b/include/NazaraEditor/Core/UI/Window.hpp index 3dc7148..06dc33e 100644 --- a/include/NazaraEditor/Core/UI/Window.hpp +++ b/include/NazaraEditor/Core/UI/Window.hpp @@ -1,15 +1,17 @@ #pragma once -#include #include -#include +#include #include +#include + namespace Nz { using ActionCallback = std::function; class EditorBaseApplication; + class Texture; class NAZARAEDITOR_CORE_API EditorWindow : private Nz::ImguiHandler @@ -36,8 +38,6 @@ namespace Nz virtual void OnEditorGUI() {}; - virtual ImGuiWindowFlags GetCustomWindowFlags() const { return ImGuiWindowFlags_None; } - private: EditorBaseApplication* m_application; diff --git a/include/NazaraEditor/Editor/Application.hpp b/include/NazaraEditor/Editor/Application.hpp index 48e43f4..bd0adf5 100644 --- a/include/NazaraEditor/Editor/Application.hpp +++ b/include/NazaraEditor/Editor/Application.hpp @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace NzEditor { diff --git a/include/NazaraEditor/Editor/UI/LevelWindow.hpp b/include/NazaraEditor/Editor/UI/LevelWindow.hpp index 698c93f..9ce0767 100644 --- a/include/NazaraEditor/Editor/UI/LevelWindow.hpp +++ b/include/NazaraEditor/Editor/UI/LevelWindow.hpp @@ -1,10 +1,13 @@ #include +#include -#include -#include +#include +#include namespace NzEditor { + class Level; + class LevelWindow : public Nz::EditorWindow { diff --git a/src/NazaraEditor/Core/Application/Actions/EditorAction_Log.cpp b/src/NazaraEditor/Core/Application/Actions/EditorAction_Log.cpp index 38e8f7b..98af68f 100644 --- a/src/NazaraEditor/Core/Application/Actions/EditorAction_Log.cpp +++ b/src/NazaraEditor/Core/Application/Actions/EditorAction_Log.cpp @@ -1,6 +1,8 @@ #include #include +#include + namespace Nz { void RegisterLogActions(EditorBaseApplication& app) diff --git a/src/NazaraEditor/Core/Application/BaseApplication.cpp b/src/NazaraEditor/Core/Application/BaseApplication.cpp index b4131df..0213261 100644 --- a/src/NazaraEditor/Core/Application/BaseApplication.cpp +++ b/src/NazaraEditor/Core/Application/BaseApplication.cpp @@ -3,6 +3,15 @@ #include #include +#include +#include +#include +#include +#include +#include +#include +#include + namespace Nz { EditorBaseApplication* EditorBaseApplication::s_instance = nullptr; diff --git a/src/NazaraEditor/Core/Application/EditorLogger.cpp b/src/NazaraEditor/Core/Application/EditorLogger.cpp index ed60a20..27f5646 100644 --- a/src/NazaraEditor/Core/Application/EditorLogger.cpp +++ b/src/NazaraEditor/Core/Application/EditorLogger.cpp @@ -1,5 +1,7 @@ #include +#include + namespace Nz { EditorLogger::EditorLogger() diff --git a/src/NazaraEditor/Core/Application/Level.cpp b/src/NazaraEditor/Core/Application/Level.cpp index 383f324..7936a3c 100644 --- a/src/NazaraEditor/Core/Application/Level.cpp +++ b/src/NazaraEditor/Core/Application/Level.cpp @@ -1,7 +1,10 @@ #include - #include +#include +#include +#include + namespace Nz { Level::Level(EditorBaseApplication* app) diff --git a/src/NazaraEditor/Core/Components/CameraComponent.cpp b/src/NazaraEditor/Core/Components/CameraComponent.cpp index df6045c..29922de 100644 --- a/src/NazaraEditor/Core/Components/CameraComponent.cpp +++ b/src/NazaraEditor/Core/Components/CameraComponent.cpp @@ -3,6 +3,9 @@ #include #include +#include +#include +#include namespace { diff --git a/src/NazaraEditor/Core/UI/MainWindow.cpp b/src/NazaraEditor/Core/UI/MainWindow.cpp index e8e9947..f23b75f 100644 --- a/src/NazaraEditor/Core/UI/MainWindow.cpp +++ b/src/NazaraEditor/Core/UI/MainWindow.cpp @@ -1,5 +1,7 @@ #include +#include + namespace Nz { EditorMainWindow::EditorMainWindow(EditorBaseApplication* app, const Nz::LocalizedText& name, const std::vector& categories) diff --git a/src/NazaraEditor/Editor/Application.cpp b/src/NazaraEditor/Editor/Application.cpp index e0607e8..3c3d4d4 100644 --- a/src/NazaraEditor/Editor/Application.cpp +++ b/src/NazaraEditor/Editor/Application.cpp @@ -6,6 +6,12 @@ #include #include +#include +#include +#include +#include +#include + #include namespace NzEditor diff --git a/src/NazaraEditor/Editor/UI/InspectorWindow.cpp b/src/NazaraEditor/Editor/UI/InspectorWindow.cpp index d07864f..761176e 100644 --- a/src/NazaraEditor/Editor/UI/InspectorWindow.cpp +++ b/src/NazaraEditor/Editor/UI/InspectorWindow.cpp @@ -2,6 +2,9 @@ #include +#include +#include + namespace NzEditor { InspectorWindow::InspectorWindow(Nz::EditorBaseApplication* app) diff --git a/src/NazaraEditor/Editor/UI/LevelWindow.cpp b/src/NazaraEditor/Editor/UI/LevelWindow.cpp index 37dbb9d..50ce9a7 100644 --- a/src/NazaraEditor/Editor/UI/LevelWindow.cpp +++ b/src/NazaraEditor/Editor/UI/LevelWindow.cpp @@ -1,7 +1,7 @@ #include +#include #include -#include namespace NzEditor { diff --git a/src/NazaraEditor/Editor/UI/MainWindow.cpp b/src/NazaraEditor/Editor/UI/MainWindow.cpp index d67b27c..a6ec956 100644 --- a/src/NazaraEditor/Editor/UI/MainWindow.cpp +++ b/src/NazaraEditor/Editor/UI/MainWindow.cpp @@ -3,6 +3,10 @@ #include +#include + +#include + namespace NzEditor { MainWindow::MainWindow(Nz::EditorBaseApplication* app) diff --git a/src/NazaraEditor/Editor/main.cpp b/src/NazaraEditor/Editor/main.cpp index a094109..a2faede 100644 --- a/src/NazaraEditor/Editor/main.cpp +++ b/src/NazaraEditor/Editor/main.cpp @@ -7,6 +7,7 @@ #include #include +#include #include