sid
/
NazaraEditor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

speed up compilation

This commit is contained in:
SweetId 2023-11-24 16:40:28 +05:30
parent 2fdb95b6c4
commit f0b9a1bcd9
26 changed files with 87 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/NazaraEditor/Core.hpp
View File

@ -11,9 +11,4 @@
#include <NazaraEditor/Core/Application/Level.hpp> #include <NazaraEditor/Core/Application/Level.hpp>
#include <NazaraEditor/Core/Components/NameComponent.hpp> #include <NazaraEditor/Core/Components/NameComponent.hpp>
#include <NazaraEditor/Core/UI/PopupManager.hpp> #include <NazaraEditor/Core/UI/PopupManager.hpp>
#include <NazaraEditor/Core/UI/Window.hpp> #include <NazaraEditor/Core/UI/Window.hpp>
#include <NazaraEditor/Core/Reflection/Math.hpp>
#include <NazaraEditor/Core/Reflection/Core.hpp>
#include <NazaraEditor/Core/Reflection/Utility.hpp>
#include <NazaraEditor/Core/Reflection/Graphics.hpp>
#include <NazaraEditor/Core/Reflection/Editor.hpp>

6
include/NazaraEditor/Core/Application/Action.hpp
View File

@ -1,10 +1,8 @@
#pragma once #pragma once
#include <NazaraEditor/Core/Core.hpp> #include <NazaraEditor/Core/Config.hpp>
#include <NazaraEditor/Core/Application/Shortcut.hpp> #include <NazaraEditor/Core/Application/Shortcut.hpp>
#include <Nazara/Renderer.hpp>
#include <NazaraLocalization/LocalizedText.hpp> #include <NazaraLocalization/LocalizedText.hpp>
#include <memory> #include <memory>
@ -12,6 +10,8 @@
namespace Nz namespace Nz
{ {
class Texture;
class NAZARAEDITOR_CORE_API EditorAction class NAZARAEDITOR_CORE_API EditorAction
{ {
public: public:

15
include/NazaraEditor/Core/Application/BaseApplication.hpp
View File

@ -1,23 +1,22 @@
#pragma once #pragma once
#include <Nazara/Core.hpp> #include <NazaraEditor/Core/Config.hpp>
#include <Nazara/Graphics.hpp>
#include <Nazara/Platform.hpp>
#include <Nazara/Renderer.hpp>
#include <Nazara/Utility.hpp>
#include <NazaraEditor/Core/Core.hpp>
#include <NazaraEditor/Core/Application/Action.hpp> #include <NazaraEditor/Core/Application/Action.hpp>
#include <NazaraEditor/Core/Application/ActionStack.hpp> #include <NazaraEditor/Core/Application/ActionStack.hpp>
#include <NazaraEditor/Core/Application/EditorLogger.hpp> #include <NazaraEditor/Core/Application/EditorLogger.hpp>
#include <NazaraEditor/Core/Application/Level.hpp> #include <NazaraEditor/Core/Application/Level.hpp>
#include <NazaraEditor/Core/UI/PopupManager.hpp> #include <NazaraEditor/Core/UI/PopupManager.hpp>
#include <NazaraEditor/Core/UI/Window.hpp> #include <NazaraEditor/Core/UI/Window.hpp>
#include <NazaraImgui/NazaraImgui.hpp>
#include <NazaraLocalization/Localization.hpp> #include <NazaraLocalization/Localization.hpp>
#include <NazaraEditor/Core/Core.hpp>
#include <Nazara/Core/Application.hpp>
namespace Nz namespace Nz
{ {
class Camera;
class WindowSwapchain;
class NAZARAEDITOR_CORE_API EditorBaseApplication class NAZARAEDITOR_CORE_API EditorBaseApplication
: public Nz::Application<Nz::Graphics, Nz::Imgui, Nz::Localization, Nz::EditorCore> : public Nz::Application<Nz::Graphics, Nz::Imgui, Nz::Localization, Nz::EditorCore>
{ {

6
include/NazaraEditor/Core/Application/EditorLogger.hpp
View File

@ -1,7 +1,9 @@
#pragma once #pragma once
#include <NazaraEditor/Core/Core.hpp> #include <NazaraEditor/Core/Config.hpp>
#include <Nazara/Core.hpp>
#include <string>
#include <vector>
namespace Nz namespace Nz
{ {

6
include/NazaraEditor/Core/Application/Shortcut.hpp
View File

@ -1,8 +1,10 @@
#pragma once #pragma once
#include <NazaraEditor/Core/Core.hpp> #include <NazaraEditor/Core/Config.hpp>
#include <Nazara/Platform.hpp>
#include <Nazara/Platform/Keyboard.hpp>
#include <sstream>
#include <vector> #include <vector>
namespace Nz namespace Nz

2
include/NazaraEditor/Core/Components/CameraComponent.hpp
View File

@ -1,6 +1,6 @@
#pragma once #pragma once
#include <NazaraEditor/Core/Core.hpp> #include <NazaraEditor/Core/Config.hpp>
#include <Nazara/Core/Clock.hpp> #include <Nazara/Core/Clock.hpp>
#include <Nazara/Platform/WindowEventHandler.hpp> #include <Nazara/Platform/WindowEventHandler.hpp>

3
include/NazaraEditor/Core/Components/NameComponent.hpp
View File

@ -1,6 +1,6 @@
#pragma once #pragma once
#include <NazaraEditor/Core/Core.hpp> #include <NazaraEditor/Core/Config.hpp>
#include <string> #include <string>
@ -34,4 +34,5 @@ namespace Nz
std::string m_name; std::string m_name;
uint64_t m_flags; uint64_t m_flags;
}; };
} }

2
include/NazaraEditor/Core/Config.hpp
View File

@ -1,5 +1,7 @@
#pragma once #pragma once
#include <NazaraUtils/Prerequisites.hpp>
#ifndef NAZARAEDITOR_CORE_CONFIG_HPP #ifndef NAZARAEDITOR_CORE_CONFIG_HPP
#define NAZARAEDITOR_CORE_CONFIG_HPP #define NAZARAEDITOR_CORE_CONFIG_HPP

7
include/NazaraEditor/Core/Reflection.hpp Normal file
View File

@ -0,0 +1,7 @@
#pragma once
#include <NazaraEditor/Core/Reflection/Math.hpp>
#include <NazaraEditor/Core/Reflection/Core.hpp>
#include <NazaraEditor/Core/Reflection/Utility.hpp>
#include <NazaraEditor/Core/Reflection/Graphics.hpp>
#include <NazaraEditor/Core/Reflection/Editor.hpp>

2
include/NazaraEditor/Core/Reflection/Editor.hpp
View File

@ -1,5 +1,7 @@
#pragma once #pragma once
#include <NazaraEditor/Core/Components/NameComponent.hpp>
#include <functional> #include <functional>
#include <string> #include <string>

4
include/NazaraEditor/Core/Systems/CameraSystem.hpp
View File

@ -1,6 +1,8 @@
#pragma once #pragma once
#include <NazaraEditor/Core/Core.hpp> #include <NazaraEditor/Core/Config.hpp>
#include <Nazara/Core/Time.hpp>
#include <entt/entt.hpp> #include <entt/entt.hpp>
#include <unordered_set> #include <unordered_set>

5
include/NazaraEditor/Core/UI/PopupManager.hpp
View File

@ -1,8 +1,11 @@
#pragma once #pragma once
#include <NazaraEditor/Core/Core.hpp> #include <NazaraEditor/Core/Config.hpp>
#include <NazaraLocalization/LocalizedText.hpp> #include <NazaraLocalization/LocalizedText.hpp>
#include <NazaraImgui/ImguiHandler.hpp>
#include <functional>
#include <memory> #include <memory>
#include <vector> #include <vector>

8
include/NazaraEditor/Core/UI/Window.hpp
View File

@ -1,15 +1,17 @@
#pragma once #pragma once
#include <NazaraUtils/Prerequisites.hpp>
#include <NazaraEditor/Core/Config.hpp> #include <NazaraEditor/Core/Config.hpp>
#include <NazaraImgui/NazaraImgui.hpp> #include <NazaraImgui/ImguiHandler.hpp>
#include <NazaraLocalization/LocalizedText.hpp> #include <NazaraLocalization/LocalizedText.hpp>
#include <functional>
namespace Nz namespace Nz
{ {
using ActionCallback = std::function<void(void)>; using ActionCallback = std::function<void(void)>;
class EditorBaseApplication; class EditorBaseApplication;
class Texture;
class NAZARAEDITOR_CORE_API EditorWindow class NAZARAEDITOR_CORE_API EditorWindow
: private Nz::ImguiHandler : private Nz::ImguiHandler
@ -36,8 +38,6 @@ namespace Nz
virtual void OnEditorGUI() {}; virtual void OnEditorGUI() {};
virtual ImGuiWindowFlags GetCustomWindowFlags() const { return ImGuiWindowFlags_None; }
private: private:
EditorBaseApplication* m_application; EditorBaseApplication* m_application;

2
include/NazaraEditor/Editor/Application.hpp
View File

@ -1,6 +1,6 @@
#pragma once #pragma once
#include <NazaraEditor/Core.hpp> #include <NazaraEditor/Core/Application/BaseApplication.hpp>
namespace NzEditor namespace NzEditor
{ {

7
include/NazaraEditor/Editor/UI/LevelWindow.hpp
View File

@ -1,10 +1,13 @@
#include <NazaraEditor/Core.hpp> #include <NazaraEditor/Core.hpp>
#include <NazaraEditor/Core/UI/Window.hpp>
#include <Nazara/Core.hpp> #include <Nazara/Utility/Node.hpp>
#include <Nazara/Utility.hpp> #include <entt/entt.hpp>
namespace NzEditor namespace NzEditor
{ {
class Level;
class LevelWindow class LevelWindow
: public Nz::EditorWindow : public Nz::EditorWindow
{ {

2
src/NazaraEditor/Core/Application/Actions/EditorAction_Log.cpp
View File

@ -1,6 +1,8 @@
#include <NazaraEditor/Core/Application/Actions/EditorAction_Log.hpp> #include <NazaraEditor/Core/Application/Actions/EditorAction_Log.hpp>
#include <NazaraEditor/Core/Application/BaseApplication.hpp> #include <NazaraEditor/Core/Application/BaseApplication.hpp>
#include <Nazara/Platform/Clipboard.hpp>
namespace Nz namespace Nz
{ {
void RegisterLogActions(EditorBaseApplication& app) void RegisterLogActions(EditorBaseApplication& app)

9
src/NazaraEditor/Core/Application/BaseApplication.cpp
View File

@ -3,6 +3,15 @@
#include <NazaraEditor/Core/Components/NameComponent.hpp> #include <NazaraEditor/Core/Components/NameComponent.hpp>
#include <NazaraEditor/Core/Systems/CameraSystem.hpp> #include <NazaraEditor/Core/Systems/CameraSystem.hpp>
#include <Nazara/Core/AppEntitySystemComponent.hpp>
#include <Nazara/Graphics/Components/CameraComponent.hpp>
#include <Nazara/Graphics/FramePipeline.hpp>
#include <Nazara/Graphics/RenderTexture.hpp>
#include <Nazara/Graphics/RenderWindow.hpp>
#include <Nazara/Graphics/Systems/RenderSystem.hpp>
#include <Nazara/Platform/AppWindowingComponent.hpp>
#include <Nazara/Utility/Components/NodeComponent.hpp>
namespace Nz namespace Nz
{ {
EditorBaseApplication* EditorBaseApplication::s_instance = nullptr; EditorBaseApplication* EditorBaseApplication::s_instance = nullptr;

2
src/NazaraEditor/Core/Application/EditorLogger.cpp
View File

@ -1,5 +1,7 @@
#include <NazaraEditor/Core/Application/EditorLogger.hpp> #include <NazaraEditor/Core/Application/EditorLogger.hpp>
#include <Nazara/Core/Log.hpp>
namespace Nz namespace Nz
{ {
EditorLogger::EditorLogger() EditorLogger::EditorLogger()

5
src/NazaraEditor/Core/Application/Level.cpp
View File

@ -1,7 +1,10 @@
#include <NazaraEditor/Core/Application/Level.hpp> #include <NazaraEditor/Core/Application/Level.hpp>
#include <NazaraEditor/Core/Application/BaseApplication.hpp> #include <NazaraEditor/Core/Application/BaseApplication.hpp>
#include <Nazara/Core/AppEntitySystemComponent.hpp>
#include <Nazara/Graphics/Components/GraphicsComponent.hpp>
#include <Nazara/Utility/Components/NodeComponent.hpp>
namespace Nz namespace Nz
{ {
Level::Level(EditorBaseApplication* app) Level::Level(EditorBaseApplication* app)

3
src/NazaraEditor/Core/Components/CameraComponent.cpp
View File

@ -3,6 +3,9 @@
#include <Nazara/Graphics/Components/CameraComponent.hpp> #include <Nazara/Graphics/Components/CameraComponent.hpp>
#include <Nazara/Math/Ray.hpp> #include <Nazara/Math/Ray.hpp>
#include <Nazara/Platform/Window.hpp>
#include <Nazara/Renderer/DebugDrawer.hpp>
#include <Nazara/Utility/Components/NodeComponent.hpp>
namespace namespace
{ {

2
src/NazaraEditor/Core/UI/MainWindow.cpp
View File

@ -1,5 +1,7 @@
#include <NazaraEditor/Core/UI/MainWindow.hpp> #include <NazaraEditor/Core/UI/MainWindow.hpp>
#include <imgui.h>
namespace Nz namespace Nz
{ {
EditorMainWindow::EditorMainWindow(EditorBaseApplication* app, const Nz::LocalizedText& name, const std::vector<std::string>& categories) EditorMainWindow::EditorMainWindow(EditorBaseApplication* app, const Nz::LocalizedText& name, const std::vector<std::string>& categories)

6
src/NazaraEditor/Editor/Application.cpp
View File

@ -6,6 +6,12 @@
#include <NazaraEditor/Editor/UI/OutputWindow.hpp> #include <NazaraEditor/Editor/UI/OutputWindow.hpp>
#include <NazaraEditor/Core/Components/CameraComponent.hpp> #include <NazaraEditor/Core/Components/CameraComponent.hpp>
#include <Nazara/Graphics/Components/GraphicsComponent.hpp>
#include <Nazara/Graphics/Components/LightComponent.hpp>
#include <Nazara/Graphics/DirectionalLight.hpp>
#include <Nazara/Graphics/GraphicalMesh.hpp>
#include <Nazara/Graphics/Model.hpp>
#include <NazaraLocalization/Localization.hpp> #include <NazaraLocalization/Localization.hpp>
namespace NzEditor namespace NzEditor

3
src/NazaraEditor/Editor/UI/InspectorWindow.cpp
View File

@ -2,6 +2,9 @@
#include <NazaraEditor/Editor/Application.hpp> #include <NazaraEditor/Editor/Application.hpp>
#include <NazaraEditor/Core/Reflection.hpp>
#include <NazaraEditor/Core/Reflection/Editor.hpp>
namespace NzEditor namespace NzEditor
{ {
InspectorWindow::InspectorWindow(Nz::EditorBaseApplication* app) InspectorWindow::InspectorWindow(Nz::EditorBaseApplication* app)

2
src/NazaraEditor/Editor/UI/LevelWindow.cpp
View File

@ -1,7 +1,7 @@
#include <NazaraEditor/Editor/UI/LevelWindow.hpp> #include <NazaraEditor/Editor/UI/LevelWindow.hpp>
#include <NazaraEditor/Core/Reflection.hpp>
#include <NazaraEditor/Editor/Application.hpp> #include <NazaraEditor/Editor/Application.hpp>
#include <NazaraEditor/Core.hpp>
namespace NzEditor namespace NzEditor
{ {

4
src/NazaraEditor/Editor/UI/MainWindow.cpp
View File

@ -3,6 +3,10 @@
#include <NazaraEditor/Core/Components/CameraComponent.hpp> #include <NazaraEditor/Core/Components/CameraComponent.hpp>
#include <Nazara/Utility/Components/NodeComponent.hpp>
#include <NazaraImgui/ImguiWidgets.hpp>
namespace NzEditor namespace NzEditor
{ {
MainWindow::MainWindow(Nz::EditorBaseApplication* app) MainWindow::MainWindow(Nz::EditorBaseApplication* app)

1
src/NazaraEditor/Editor/main.cpp
View File

@ -7,6 +7,7 @@
#include <NazaraImgui/NazaraImgui.hpp> #include <NazaraImgui/NazaraImgui.hpp>
#include <NazaraEditor/Core.hpp> #include <NazaraEditor/Core.hpp>
#include <NazaraEditor/Core/Reflection.hpp>
#include <NazaraEditor/Editor/Application.hpp> #include <NazaraEditor/Editor/Application.hpp>