From 1ac0337863d537fd484354184d40a582d846cbf3 Mon Sep 17 00:00:00 2001 From: Antoine Pilote Date: Tue, 3 Sep 2024 18:47:45 -0400 Subject: [PATCH] Refactor pass #1 --- Editor/Editor.cpp | 5 +--- Editor/src/Misc/GizmoDrawer.cpp | 1 + Editor/src/Misc/ThumbnailManager.cpp | 4 +++ Editor/src/Windows/EditorInterface.cpp | 5 +--- Editor/src/Windows/EditorSelectionPanel.cpp | 2 +- Editor/src/Windows/EditorSelectionPanel.h | 3 ++ Nuake/src/Rendering/Renderer.h | 29 ++++++++++++------- Nuake/src/Rendering/SceneRenderer.cpp | 4 ++- Nuake/src/Rendering/SceneRenderer.h | 3 ++ Nuake/src/Scene/Components.h | 25 ++++++++++++++++ Nuake/src/Scene/Components/Components.h | 28 ------------------ Nuake/src/Scene/Scene.cpp | 3 +- Nuake/src/Serialization/ComponentSerializer.h | 13 +++++++++ 13 files changed, 75 insertions(+), 50 deletions(-) create mode 100644 Nuake/src/Scene/Components.h delete mode 100644 Nuake/src/Scene/Components/Components.h create mode 100644 Nuake/src/Serialization/ComponentSerializer.h diff --git a/Editor/Editor.cpp b/Editor/Editor.cpp index b691f6a7..a20d6605 100644 --- a/Editor/Editor.cpp +++ b/Editor/Editor.cpp @@ -5,15 +5,13 @@ #include #include #include -#include +#include #include "src/Windows/EditorInterface.h" -#include #include #include #include -#include "src/Scene/Components/BoxCollider.h" #include #include @@ -21,7 +19,6 @@ #include #include #include -#include #include "src/Actions/EditorSelection.h" #include "src/Misc/GizmoDrawer.h" diff --git a/Editor/src/Misc/GizmoDrawer.cpp b/Editor/src/Misc/GizmoDrawer.cpp index 1be96d94..df9ce0e7 100644 --- a/Editor/src/Misc/GizmoDrawer.cpp +++ b/Editor/src/Misc/GizmoDrawer.cpp @@ -22,6 +22,7 @@ #include #include #include +#include #include #include diff --git a/Editor/src/Misc/ThumbnailManager.cpp b/Editor/src/Misc/ThumbnailManager.cpp index 46f2eb92..6c34834e 100644 --- a/Editor/src/Misc/ThumbnailManager.cpp +++ b/Editor/src/Misc/ThumbnailManager.cpp @@ -2,6 +2,10 @@ #include #include + +#include +#include + #include #include #include diff --git a/Editor/src/Windows/EditorInterface.cpp b/Editor/src/Windows/EditorInterface.cpp index 19268b9d..5cc1d8ec 100644 --- a/Editor/src/Windows/EditorInterface.cpp +++ b/Editor/src/Windows/EditorInterface.cpp @@ -23,13 +23,10 @@ #include #include "src/Scene/Scene.h" -#include "src/Scene/Components/Components.h" -#include "src/Scene/Components/BoxCollider.h" +#include "src/Scene/Components.h" #include "src/Scene/Systems/QuakeMapBuilder.h" -#include "src/Scene/Components/LightComponent.h" #include "../UIComponents/Viewport.h" #include -#include #include #include "src/Rendering/Renderer.h" #include "src/Core/Input.h" diff --git a/Editor/src/Windows/EditorSelectionPanel.cpp b/Editor/src/Windows/EditorSelectionPanel.cpp index 1e1961a6..40dd4e90 100644 --- a/Editor/src/Windows/EditorSelectionPanel.cpp +++ b/Editor/src/Windows/EditorSelectionPanel.cpp @@ -2,7 +2,7 @@ #include "EditorSelectionPanel.h" #include "../Misc/ImGuiTextHelper.h" -#include +#include #include #include diff --git a/Editor/src/Windows/EditorSelectionPanel.h b/Editor/src/Windows/EditorSelectionPanel.h index 57499b47..57d108d8 100644 --- a/Editor/src/Windows/EditorSelectionPanel.h +++ b/Editor/src/Windows/EditorSelectionPanel.h @@ -26,6 +26,9 @@ #include "../ComponentsPanel/NetScriptPanel.h" #include "../ComponentsPanel/NavMeshVolumePanel.h" +#include + + class EditorSelectionPanel { private: diff --git a/Nuake/src/Rendering/Renderer.h b/Nuake/src/Rendering/Renderer.h index 4e46be72..4c2fb838 100644 --- a/Nuake/src/Rendering/Renderer.h +++ b/Nuake/src/Rendering/Renderer.h @@ -1,27 +1,34 @@ #pragma once -#include "src/Core/Maths.h" -#include "Shaders/Shader.h" -#include "src/Scene/Components/Components.h" -#include "src/Core/Core.h" -#include "Buffers/VertexArray.h" #include "RenderList.h" + +#include "src/Core/Core.h" +#include "src/Core/Maths.h" + +#include "src/Rendering/Camera.h" +#include "src/Scene/Components/LightComponent.h" +#include "src/Scene/Components/TransformComponent.h" + +#include "Shaders/Shader.h" #include "Buffers/UniformBuffer.h" +#include "Buffers/VertexArray.h" + namespace Nuake { - struct Light + struct TransformComponent; + struct LightComponent; + + struct Light { TransformComponent transform; LightComponent light; }; - const int MAX_LIGHT = 64; - struct LightData { - int ShadowMapsIDs[CSM_AMOUNT]; - float CascadeDepth[CSM_AMOUNT]; - Matrix4 LightTransforms[CSM_AMOUNT]; + int ShadowMapsIDs[4]; + float CascadeDepth[4]; + Matrix4 LightTransforms[4]; int Type; Vector3 Position; Vector3 Direction; diff --git a/Nuake/src/Rendering/SceneRenderer.cpp b/Nuake/src/Rendering/SceneRenderer.cpp index 33f63e46..d487eebb 100644 --- a/Nuake/src/Rendering/SceneRenderer.cpp +++ b/Nuake/src/Rendering/SceneRenderer.cpp @@ -2,8 +2,10 @@ #include "src/Rendering/Shaders/ShaderManager.h" #include "src/Scene/Components/BSPBrushComponent.h" -#include "src/Scene/Components/SpriteComponent.h" +#include "src/Scene/Components/ModelComponent.h" +#include "src/Scene/Components/ParentComponent.h" #include "src/Scene/Components/ParticleEmitterComponent.h" +#include "src/Scene/Components/SpriteComponent.h" #include #include diff --git a/Nuake/src/Rendering/SceneRenderer.h b/Nuake/src/Rendering/SceneRenderer.h index 2cfe89eb..8170d058 100644 --- a/Nuake/src/Rendering/SceneRenderer.h +++ b/Nuake/src/Rendering/SceneRenderer.h @@ -7,10 +7,13 @@ #include "src/Rendering/PostFX/Bloom.h" #include "src/Rendering/PostFX/Volumetric.h" #include "src/Rendering/PostFX/SSR.h" + +#include "src/Physics/PhysicsShapes.h" #include "Shapes/BoxGizmo.h" #include "Shapes/SphereGizmo.h" #include "Shapes/CapsuleGizmo.h" #include "Shapes/CylinderGizmo.h" +#include #include namespace Nuake diff --git a/Nuake/src/Scene/Components.h b/Nuake/src/Scene/Components.h new file mode 100644 index 00000000..fd9f3195 --- /dev/null +++ b/Nuake/src/Scene/Components.h @@ -0,0 +1,25 @@ +#pragma once +#include "Components/AudioEmitterComponent.h" +#include "Components/BaseComponent.h" +#include "Components/BoneComponent.h" +#include "Components/BoxCollider.h" +#include "Components/BSPBrushComponent.h" +#include "Components/CameraComponent.h" +#include "Components/CapsuleColliderComponent.h" +#include "Components/CharacterControllerComponent.h" +#include "Components/CylinderColliderComponent.h" +#include "Components/LightComponent.h" +#include "Components/MeshCollider.h" +#include "Components/ModelComponent.h" +#include "Components/NameComponent.h" +#include "Components/NavMeshVolumeComponent.h" +#include "Components/NetScriptComponent.h" +#include "Components/ParentComponent.h" +#include "Components/ParticleEmitterComponent.h" +#include "Components/PrefabComponent.h" +#include "Components/QuakeMap.h" +#include "Components/RigidbodyComponent.h" +#include "Components/SkinnedModelComponent.h" +#include "Components/SpriteComponent.h" +#include "Components/TransformComponent.h" + diff --git a/Nuake/src/Scene/Components/Components.h b/Nuake/src/Scene/Components/Components.h deleted file mode 100644 index ba90407c..00000000 --- a/Nuake/src/Scene/Components/Components.h +++ /dev/null @@ -1,28 +0,0 @@ -#pragma once -#include -#include - -#include "BaseComponent.h" -#include "TransformComponent.h" -#include "LightComponent.h" -#include "CameraComponent.h" -#include "ModelComponent.h" -#include "QuakeMap.h" - -#include "RigidbodyComponent.h" -#include "CharacterControllerComponent.h" - -#include "SphereCollider.h" -#include "MeshCollider.h" -#include "CylinderColliderComponent.h" -#include "NativeScriptComponent.h" - -#include "ParticleEmitterComponent.h" - -#include "ParentComponent.h" -#include "NameComponent.h" -#include "BoxCollider.h" -#include "AudioEmitterComponent.h" -#include "WrenScriptComponent.h" -#include "NetScriptComponent.h" -#include "../Entities/Entity.h" diff --git a/Nuake/src/Scene/Scene.cpp b/Nuake/src/Scene/Scene.cpp index f4bd4b69..ff6cccb9 100644 --- a/Nuake/src/Scene/Scene.cpp +++ b/Nuake/src/Scene/Scene.cpp @@ -23,7 +23,8 @@ #include "Engine.h" #include "src/Core/Maths.h" #include "src/Core/FileSystem.h" -#include "src/Scene/Components/Components.h" + +#include "src/Scene/Components.h" #include "src/Scene/Components/BoxCollider.h" #include "src/Scene/Components/WrenScriptComponent.h" #include "src/Scene/Components/BSPBrushComponent.h" diff --git a/Nuake/src/Serialization/ComponentSerializer.h b/Nuake/src/Serialization/ComponentSerializer.h new file mode 100644 index 00000000..eca4f041 --- /dev/null +++ b/Nuake/src/Serialization/ComponentSerializer.h @@ -0,0 +1,13 @@ +#pragma once + +namespace Nuake +{ + class ComponentSerializer + { + private: + + public: + virtual void VisitNameComponent(const NameComponent& name) + + }; +} \ No newline at end of file