Created Core subdirectory in src and made relevant changes to includes

2024-11-22 18:28:52 -05:00 · 2022-03-31 15:43:49 -04:00 · 2022-03-31 15:43:49 -04:00 · e27d29e919
parent b46df04c00
commit e27d29e919
51 changed files with 51 additions and 55 deletions
--- a/Navigator/src/Navigator.h
+++ b/Navigator/src/Navigator.h
@ -24,13 +24,13 @@

 #include <cstdint>

-#include "Navigator/Logger.h"
-#include "Navigator/Application.h"
+#include "Navigator/Core/Logger.h"
+#include "Navigator/Core/Application.h"
 #include "Navigator/Physics/PhysicsLayer.h"
 #include "Navigator/Physics/AnalysisStage.h"
-#include "Navigator/Parameter.h"
-#include "Navigator/SpectrumManager.h"
-#include "Navigator/Layer.h"
+#include "Navigator/Core/Parameter.h"
+#include "Navigator/Core/SpectrumManager.h"
+#include "Navigator/Core/Layer.h"
 #include "Navigator/Events/Event.h"

 #endif
--- a/Navigator/src/Navigator/Core/Application.cpp
+++ b/Navigator/src/Navigator/Core/Application.cpp
@ -9,8 +9,8 @@
 	GWM -- Feb 2022
 */
 #include "Application.h"
-#include "Renderer/RenderCommand.h"
-#include "Editor/EditorLayer.h"
+#include "Navigator/Renderer/RenderCommand.h"
+#include "Navigator/Editor/EditorLayer.h"

 namespace Navigator {

--- a/Navigator/src/Navigator/Core/Application.h
+++ b/Navigator/src/Navigator/Core/Application.h
@ -11,13 +11,13 @@
 #ifndef APPLICATION_H
 #define APPLICATION_H

-#include "Navigator/NavCore.h"
-#include "Events/Event.h"
+#include "Navigator/Core/NavCore.h"
+#include "Navigator/Events/Event.h"
 #include "Navigator/Events/AppEvent.h"
 #include "Navigator/Events/PhysicsEvent.h"
-#include "Navigator/LayerStack.h"
-#include "Navigator/Layer.h"
-#include "Navigator/Window.h"
+#include "Navigator/Core/LayerStack.h"
+#include "Navigator/Core/Layer.h"
+#include "Navigator/Core/Window.h"
 #include "Navigator/ImGui/ImGuiLayer.h"
 #include "Navigator/Physics/PhysicsLayer.h"
 #include "glm/vec4.hpp"
--- a/Navigator/src/Navigator/Core/Cut.cpp
+++ b/Navigator/src/Navigator/Core/Cut.cpp
--- a/Navigator/src/Navigator/Core/Cut.h
+++ b/Navigator/src/Navigator/Core/Cut.h
--- a/Navigator/src/Navigator/Core/Histogram.cpp
+++ b/Navigator/src/Navigator/Core/Histogram.cpp
--- a/Navigator/src/Navigator/Core/Histogram.h
+++ b/Navigator/src/Navigator/Core/Histogram.h
--- a/Navigator/src/Navigator/Core/Layer.cpp
+++ b/Navigator/src/Navigator/Core/Layer.cpp
--- a/Navigator/src/Navigator/Core/Layer.h
+++ b/Navigator/src/Navigator/Core/Layer.h
@ -8,7 +8,7 @@
 #define LAYER_H

 #include "NavCore.h"
-#include "Events/Event.h"
+#include "Navigator/Events/Event.h"

 namespace Navigator {

--- a/Navigator/src/Navigator/Core/LayerStack.cpp
+++ b/Navigator/src/Navigator/Core/LayerStack.cpp
--- a/Navigator/src/Navigator/Core/LayerStack.h
+++ b/Navigator/src/Navigator/Core/LayerStack.h
--- a/Navigator/src/Navigator/Core/Logger.cpp
+++ b/Navigator/src/Navigator/Core/Logger.cpp
--- a/Navigator/src/Navigator/Core/Logger.h
+++ b/Navigator/src/Navigator/Core/Logger.h
--- a/Navigator/src/Navigator/Core/NavCore.h
+++ b/Navigator/src/Navigator/Core/NavCore.h
--- a/Navigator/src/Navigator/Core/Parameter.cpp
+++ b/Navigator/src/Navigator/Core/Parameter.cpp
--- a/Navigator/src/Navigator/Core/Parameter.h
+++ b/Navigator/src/Navigator/Core/Parameter.h
--- a/Navigator/src/Navigator/Core/SpectrumManager.cpp
+++ b/Navigator/src/Navigator/Core/SpectrumManager.cpp
--- a/Navigator/src/Navigator/Core/SpectrumManager.h
+++ b/Navigator/src/Navigator/Core/SpectrumManager.h
--- a/Navigator/src/Navigator/Core/SpectrumSerializer.cpp
+++ b/Navigator/src/Navigator/Core/SpectrumSerializer.cpp
--- a/Navigator/src/Navigator/Core/SpectrumSerializer.h
+++ b/Navigator/src/Navigator/Core/SpectrumSerializer.h
--- a/Navigator/src/Navigator/Core/Window.h
+++ b/Navigator/src/Navigator/Core/Window.h
@ -10,7 +10,7 @@
 #define WINDOW_H

 #include "NavCore.h"
-#include "Events/Event.h"
+#include "Navigator/Events/Event.h"

 namespace Navigator {

--- a/Navigator/src/Navigator/Editor/EditorLayer.cpp
+++ b/Navigator/src/Navigator/Editor/EditorLayer.cpp
@ -10,9 +10,9 @@
 #include "misc/cpp/imgui_stdlib.h"
 #include "implot.h"
 #include "FileDialog.h"
-#include "Navigator/Application.h"
-#include "Navigator/SpectrumSerializer.h"
-#include "Navigator/SpectrumManager.h"
+#include "Navigator/Core/Application.h"
+#include "Navigator/Core/SpectrumSerializer.h"
+#include "Navigator/Core/SpectrumManager.h"

 #include "IconsFontAwesome5.h"

--- a/Navigator/src/Navigator/Editor/EditorLayer.h
+++ b/Navigator/src/Navigator/Editor/EditorLayer.h
@ -8,11 +8,11 @@
 #ifndef EDITOR_LAYER_H
 #define EDITOR_LAYER_H

-#include "Navigator/Layer.h"
+#include "Navigator/Core/Layer.h"
 #include "Navigator/Events/Event.h"
 #include "Navigator/Events/PhysicsEvent.h"
-#include "Navigator/Histogram.h"
-#include "Navigator/Cut.h"
+#include "Navigator/Core/Histogram.h"
+#include "Navigator/Core/Cut.h"
 #include "SpectrumPanel.h"
 #include "FileDialog.h"
 #include "SpectrumDialog.h"
--- a/Navigator/src/Navigator/Editor/SourceDialog.cpp
+++ b/Navigator/src/Navigator/Editor/SourceDialog.cpp
@ -8,7 +8,7 @@
 #include "SourceDialog.h"
 #include "Navigator/Events/PhysicsEvent.h"
 #include "Navigator/Events/Event.h"
-#include "Navigator/Application.h"
+#include "Navigator/Core/Application.h"

 #include "imgui.h"
 #include "misc/cpp/imgui_stdlib.h"
--- a/Navigator/src/Navigator/Editor/SpectrumDialog.cpp
+++ b/Navigator/src/Navigator/Editor/SpectrumDialog.cpp
@ -5,7 +5,7 @@
 	GWM -- Feb 2022
 */
 #include "SpectrumDialog.h"
-#include "Navigator/SpectrumManager.h"
+#include "Navigator/Core/SpectrumManager.h"

 #include "misc/cpp/imgui_stdlib.h"

--- a/Navigator/src/Navigator/Editor/SpectrumDialog.h
+++ b/Navigator/src/Navigator/Editor/SpectrumDialog.h
@ -7,8 +7,8 @@
 #ifndef SPECTRUM_DIALOG_H
 #define SPECTRUM_DIALOG_H

-#include "Navigator/Histogram.h"
-#include "Navigator/Cut.h"
+#include "Navigator/Core/Histogram.h"
+#include "Navigator/Core/Cut.h"

 #include "imgui.h"

--- a/Navigator/src/Navigator/Editor/SpectrumPanel.cpp
+++ b/Navigator/src/Navigator/Editor/SpectrumPanel.cpp
@ -6,7 +6,7 @@
    GWM -- Feb 2022
 */
 #include "SpectrumPanel.h"
-#include "Navigator/SpectrumManager.h"
+#include "Navigator/Core/SpectrumManager.h"
 #include "misc/cpp/imgui_stdlib.h"
 #include "IconsFontAwesome5.h"

--- a/Navigator/src/Navigator/Editor/SpectrumPanel.h
+++ b/Navigator/src/Navigator/Editor/SpectrumPanel.h
@ -8,8 +8,8 @@
 #ifndef SPECTRUM_PANEL_H
 #define SPECTRUM_PANEL_H

-#include "Navigator/Histogram.h"
-#include "Navigator/Cut.h"
+#include "Navigator/Core/Histogram.h"
+#include "Navigator/Core/Cut.h"
 #include "imgui.h"
 #include "implot.h"

--- a/Navigator/src/Navigator/Events/AppEvent.h
+++ b/Navigator/src/Navigator/Events/AppEvent.h
@ -7,7 +7,6 @@
 #ifndef APP_EVENT_H
 #define APP_EVENT_H

-#include "Navigator/NavCore.h"
 #include "Event.h"

 namespace Navigator {
--- a/Navigator/src/Navigator/Events/Event.h
+++ b/Navigator/src/Navigator/Events/Event.h
@ -9,7 +9,7 @@
 #ifndef EVENT_H
 #define EVENT_H

-#include "Navigator/NavCore.h"
+#include "Navigator/Core/NavCore.h"

 namespace Navigator {

--- a/Navigator/src/Navigator/Events/KeyEvent.h
+++ b/Navigator/src/Navigator/Events/KeyEvent.h
@ -7,7 +7,6 @@
 #ifndef KEY_EVENT_H
 #define KEY_EVENT_H

-#include "Navigator/NavCore.h"
 #include "Event.h"

 namespace Navigator {
--- a/Navigator/src/Navigator/Events/MouseEvent.h
+++ b/Navigator/src/Navigator/Events/MouseEvent.h
@ -7,7 +7,6 @@
 #ifndef MOUSE_EVENT_H
 #define MOUSE_EVENT_H

-#include "Navigator/NavCore.h"
 #include "Event.h"

 namespace Navigator {
--- a/Navigator/src/Navigator/Events/PhysicsEvent.h
+++ b/Navigator/src/Navigator/Events/PhysicsEvent.h
@ -7,7 +7,6 @@
 #ifndef PHYSICS_EVENT_H
 #define PHYSICS_EVENT_H

-#include "Navigator/NavCore.h"
 #include "Event.h"
 #include "Navigator/Physics/DataSource.h"

--- a/Navigator/src/Navigator/ImGui/ImGuiLayer.cpp
+++ b/Navigator/src/Navigator/ImGui/ImGuiLayer.cpp
@ -7,8 +7,8 @@
 	GWM -- Feb 2022
 */
 #include "ImGuiLayer.h"
-#include "Navigator/Application.h"
-#include "Navigator/NavCore.h"
+#include "Navigator/Core/Application.h"
+#include "Navigator/Core/NavCore.h"

 #include "imgui.h"
 #include "implot.h"
--- a/Navigator/src/Navigator/ImGui/ImGuiLayer.h
+++ b/Navigator/src/Navigator/ImGui/ImGuiLayer.h
@ -9,8 +9,8 @@
 #ifndef IMGUI_LAYER_H
 #define IMGUI_LAYER_H

-#include "Navigator/NavCore.h"
-#include "Navigator/Layer.h"
+#include "Navigator/Core/NavCore.h"
+#include "Navigator/Core/Layer.h"

 namespace Navigator {

--- a/Navigator/src/Navigator/Physics/AnalysisStack.h
+++ b/Navigator/src/Navigator/Physics/AnalysisStack.h
@ -9,7 +9,7 @@
 #define ANALYSIS_STACK_H

 #include "AnalysisStage.h"
-#include "Navigator/NavCore.h"
+#include "Navigator/Core/NavCore.h"

 namespace Navigator {

--- a/Navigator/src/Navigator/Physics/AnalysisStage.h
+++ b/Navigator/src/Navigator/Physics/AnalysisStage.h
@ -8,8 +8,8 @@
 #ifndef ANALYSIS_STAGE_H
 #define ANALYSIS_STAGE_H

-#include "Navigator/NavCore.h"
-#include "Navigator/Parameter.h"
+#include "Navigator/Core/NavCore.h"
+#include "Navigator/Core/Parameter.h"
 #include "NavData.h"

 namespace Navigator {
--- a/Navigator/src/Navigator/Physics/Caen/CompassFile.h
+++ b/Navigator/src/Navigator/Physics/Caen/CompassFile.h
@ -15,7 +15,7 @@
 #ifndef COMPASSFILE_H
 #define COMPASSFILE_H

-#include "Navigator/NavCore.h"
+#include "Navigator/Core/NavCore.h"
 #include "CompassHit.h"
 #include "Navigator/Physics/ShiftMap.h"

--- a/Navigator/src/Navigator/Physics/Caen/CompassHit.h
+++ b/Navigator/src/Navigator/Physics/Caen/CompassHit.h
@ -7,7 +7,7 @@
 #ifndef COMPASS_HIT_H
 #define COMPASS_HIT_H

-#include "Navigator/NavCore.h"
+#include "Navigator/Core/NavCore.h"

 namespace Navigator {

--- a/Navigator/src/Navigator/Physics/Caen/CompassRun.h
+++ b/Navigator/src/Navigator/Physics/Caen/CompassRun.h
@ -19,7 +19,7 @@
 #ifndef COMPASSRUN_H
 #define COMPASSRUN_H

-#include "Navigator/NavCore.h"
+#include "Navigator/Core/NavCore.h"
 #include "Navigator/Physics/DataSource.h"
 #include "CompassFile.h"
 #include "Navigator/Physics/ShiftMap.h"
--- a/Navigator/src/Navigator/Physics/DataSource.h
+++ b/Navigator/src/Navigator/Physics/DataSource.h
@ -9,7 +9,7 @@
 #ifndef DATA_SOURCE_H
 #define DATA_SOURCE_H

-#include "Navigator/NavCore.h"
+#include "Navigator/Core/NavCore.h"
 #include "NavData.h"

 namespace Navigator {
--- a/Navigator/src/Navigator/Physics/PhysicsLayer.cpp
+++ b/Navigator/src/Navigator/Physics/PhysicsLayer.cpp
@ -8,7 +8,7 @@
 	GWM -- Feb 2022
 */
 #include "PhysicsLayer.h"
-#include "Navigator/SpectrumManager.h"
+#include "Navigator/Core/SpectrumManager.h"
 #include "NavData.h"

 namespace Navigator {
--- a/Navigator/src/Navigator/Physics/PhysicsLayer.h
+++ b/Navigator/src/Navigator/Physics/PhysicsLayer.h
@ -10,8 +10,8 @@
 #ifndef PHYSICS_LAYER_H
 #define PHYSICS_LAYER_H

-#include "Navigator/NavCore.h"
-#include "Navigator/Layer.h"
+#include "Navigator/Core/NavCore.h"
+#include "Navigator/Core/Layer.h"
 #include "Navigator/Events/PhysicsEvent.h"
 #include "AnalysisStack.h"
 #include "AnalysisStage.h"
--- a/Navigator/src/Navigator/Physics/ShiftMap.h
+++ b/Navigator/src/Navigator/Physics/ShiftMap.h
@ -13,7 +13,7 @@
 #ifndef SHIFTMAP_H
 #define SHIFTMAP_H

-#include "Navigator/NavCore.h"
+#include "Navigator/Core/NavCore.h"

 namespace Navigator {

--- a/Navigator/src/Navigator/Renderer/RenderCommand.h
+++ b/Navigator/src/Navigator/Renderer/RenderCommand.h
@ -8,7 +8,7 @@
 #ifndef RENDER_COMMAND_H
 #define RENDER_COMMAND_H

-#include "Navigator/NavCore.h"
+#include "Navigator/Core/NavCore.h"
 #include "RendererAPI.h"

 namespace Navigator {
--- a/Navigator/src/Navigator/Renderer/RendererAPI.h
+++ b/Navigator/src/Navigator/Renderer/RendererAPI.h
@ -8,7 +8,7 @@
 #ifndef RENDERER_API_H
 #define RENDERER_API_H

-#include "Navigator/NavCore.h"
+#include "Navigator/Core/NavCore.h"
 #include "glm/vec4.hpp"

 namespace Navigator {
--- a/Navigator/src/Platform/OpenGL/OpenGLContext.h
+++ b/Navigator/src/Platform/OpenGL/OpenGLContext.h
@ -7,7 +7,7 @@
 #ifndef OPEGL_CONTEXT_H
 #define OPEGL_CONTEXT_H

-#include "Navigator/NavCore.h"
+#include "Navigator/Core/NavCore.h"
 #include "Navigator/Renderer/GraphicsContext.h"

 struct GLFWwindow;
--- a/Navigator/src/Platform/OpenGL/OpenGLRendererAPI.h
+++ b/Navigator/src/Platform/OpenGL/OpenGLRendererAPI.h
@ -8,7 +8,7 @@
 #ifndef OPENGL_RENDERER_API_H
 #define OPENGL_RENDERER_API_H

-#include "Navigator/NavCore.h"
+#include "Navigator/Core/NavCore.h"
 #include "Navigator/Renderer/RendererAPI.h"

 namespace Navigator {
--- a/Navigator/src/Platform/OpenGL/OpenGLWindow.cpp
+++ b/Navigator/src/Platform/OpenGL/OpenGLWindow.cpp
@ -8,7 +8,7 @@
 */
 #include "OpenGLWindow.h"
 #include "OpenGLContext.h"
-#include "Navigator/NavCore.h"
+#include "Navigator/Core/NavCore.h"
 #include "Navigator/Events/AppEvent.h"
 #include "Navigator/Events/KeyEvent.h"
 #include "Navigator/Events/MouseEvent.h"
--- a/Navigator/src/Platform/OpenGL/OpenGLWindow.h
+++ b/Navigator/src/Platform/OpenGL/OpenGLWindow.h
@ -9,8 +9,8 @@
 #ifndef OPENGL_WINDOW_H
 #define OPENGL_WINDOW_H

-#include "Navigator/NavCore.h"
-#include "Navigator/Window.h"
+#include "Navigator/Core/NavCore.h"
+#include "Navigator/Core/Window.h"
 #include "Navigator/Renderer/GraphicsContext.h"
 #include "GLFW/glfw3.h"

--- a/Navigator/src/navpch.h
+++ b/Navigator/src/navpch.h
@ -17,6 +17,6 @@
 #include <cstdint>


-#include "Navigator/Logger.h"
+#include "Navigator/Core/Logger.h"

 #endif